Commit Graph
1312 Commits
Author SHA1 Message Date
Joseph T. Lyons 6b65d76014 Port journal to GPUI2 2023-10-28 11:37:25 -04:00
Conrad Irwin 4a6a17d866 Merge branch 'main' into zed2 2023-10-27 10:55:15 +02:00
Joseph T. Lyons 98d03f6e7a Revert "Add activity_indicator2"
This reverts commit 88a3a57789.
2023-10-26 17:13:40 +02:00
Marshall Bowers 973ca8d4f0 ui2: Remove dependency on theme crate 2023-10-26 16:50:04 +02:00
Marshall Bowers 692aeff263 ui2: Remove dependency on settings crate 2023-10-26 16:50:04 +02:00
Joseph T. Lyons 88a3a57789 Add activity_indicator2 2023-10-26 16:49:39 +02:00
Max BrunsfeldandConrad b3ad8c1c3e Get most of the language2 tests passing
Co-authored-by: Conrad <conrad@zed.dev>
2023-10-26 15:57:12 +02:00
Julia 4539cef6d7 Capture language server stderr during startup/init and log if failure (#3175)
Gives us some more debugging information

Release Notes:
 - N/A
2023-10-26 14:17:29 +02:00
Julia 0eafb8886d zed2: Capture language server stderr during startup/init and log if failure (#3176)
zed2 electric boogaloo

Release Notes:

- N/A
2023-10-26 13:59:04 +02:00
Julia 8a0fb668f7 Capture language server stderr during startup/init and log if failure
zed2 electric boogaloo
2023-10-26 13:50:24 +02:00
Max Brunsfeld a4b7e3c9f6 Merge branch 'zed2-hangs' into zed2 2023-10-26 12:48:35 +02:00
065d26f5b2 Get RPC2 tests passing
Co-authored-by: Conrad <conrad@zed.dev>
Co-authored-by: Kyle <kyle@zed.dev>
2023-10-26 12:47:37 +02:00
Julia 170ebd8221 Capture language server stderr during startup/init and log if failure 2023-10-26 12:29:22 +02:00
06c22206af Add install_cli2
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-Authored-By: Kirill <kirill@zed.dev>
2023-10-26 12:09:54 +02:00
Antonio Scandurra 6172cd9015 Merge branch 'zed2-room' into zed2 2023-10-26 11:57:11 +02:00
3bcae6d7de Add call2
Co-Authored-By: Kirill Bulatov <kirill@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-10-26 11:56:34 +02:00
Conrad Irwin 693246ba26 Fix fs2 import on zed 2023-10-26 11:41:15 +02:00
Conrad Irwin b875be9689 Fix settings2 tests 2023-10-26 11:39:32 +02:00
Conrad Irwin 07b9ec29e6 Revert "Fix settings2 crate tests"
This reverts commit 6e9c779c51.
2023-10-26 11:33:58 +02:00
Conrad Irwin 6e9c779c51 Fix settings2 crate tests 2023-10-26 11:27:23 +02:00
Kirill Bulatov 483ac9491a Start fixing room2 2023-10-26 11:27:12 +02:00
43d230cb2d Introduce a gpui2::test macro
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Kyle <kyle@zed.dev>
2023-10-25 21:08:00 +02:00
Marshall Bowers b5eae86b67 Merge branch 'zed2' of github.com:zed-industries/zed into zed2 2023-10-25 20:38:03 +02:00
Marshall Bowers e67048ee7b Load themes from settings and rework Settings trait 2023-10-25 20:37:55 +02:00
Piotr Osiewicz 7f6bb3d1eb Extract multi_buffer module out of editor (#3170)
Release Notes:

- N/A
2023-10-25 19:31:47 +02:00
412c0ff7dc Add fs2
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Conrad <conrad.irwin@gmail.com>
Co-Authored-By: Kyle <kyle@zed.dev>
2023-10-25 19:17:50 +02:00
Antonio Scandurra 9986e526e5 Stop depending on gpui in client2 and settings2 2023-10-25 18:47:03 +02:00
Max Brunsfeld 841a5ef7b8 collab 0.27.0 2023-10-25 17:38:09 +02:00
Marshall Bowers 6b5947a1fa Start work on theme converter 2023-10-25 16:54:26 +02:00
Joseph T. Lyons c44d1cda9a collab 0.26.0 2023-10-25 16:24:53 +02:00
Joseph T. Lyons 71c72d8e08 v0.111.x dev 2023-10-25 16:07:54 +02:00
Marshall Bowers dd34bb273e Load Theme from theme2 into the storybook 2023-10-25 15:50:50 +02:00
Marshall Bowers 5b04f965fa Update Cargo.lock 2023-10-24 18:25:48 +02:00
Marshall Bowers d6bd000aa8 Rename cx.global_default_mut to cx.global_default 2023-10-24 17:58:14 +02:00
Marshall Bowers 51c66f508b Merge branch 'zed2' into theme2 2023-10-24 17:29:25 +02:00
Max Brunsfeld cc9e92857b Guest roles (#3140)
Release Notes:

- Added a "guest" role to channels, and made that the default when a new
user joins a public channel.
2023-10-24 17:29:14 +02:00
Marshall Bowers 09866ec3e9 WIP 2023-10-24 16:59:24 +02:00
Antonio Scandurra 11953e613b Checkpoint 2023-10-24 16:15:20 +02:00
Antonio Scandurra 191285a8f1 Checkpoint 2023-10-24 15:18:51 +02:00
Kirill Bulatov 4d5ca37edb Fix the branch compilation 2023-10-24 14:04:45 +02:00
Antonio Scandurra 953857f8e3 WIP 2023-10-24 10:31:35 +02:00
Antonio Scandurra 18eb4a7292 WIP 2023-10-24 10:01:19 +02:00
Piotr Osiewicz 97a0864134 grammars: Update Bash grammar (#3155)
Fixes zed-industries/community#2168

Release Notes:
- Updated Bash (Shell script) Tree-sitter grammar (fixes
zed-industries/community#2168)
2023-10-24 09:16:06 +02:00
Conrad Irwin ea4e67fb76 Merge branch 'main' into guest-exp 2023-10-23 17:47:21 +02:00
Antonio Scandurra 05cbceec24 WIP 2023-10-23 17:36:49 +02:00
Antonio Scandurra efbf0c828d WIP 2023-10-23 16:38:34 +02:00
Piotr OsiewiczandMax 812ff9a97d Account for markdown styling in mentions offset calculation.
This also means that we can support smart punctuation.

Co-authored-by: Max <max@zed.dev>
2023-10-23 12:50:57 +02:00
Antonio Scandurra a72434f67b WIP 2023-10-23 12:16:33 +02:00
Antonio Scandurra 0de4a93ec7 WIP 2023-10-23 11:43:08 +02:00
Antonio Scandurra 56462ef793 Checkpoint 2023-10-23 10:59:29 +02:00