Commit Graph
1268 Commits
Author SHA1 Message Date
Conrad Irwin adc426b668 v1 2023-10-26 18:19:57 +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 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
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
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
Marshall Bowers 6b5947a1fa Start work on theme converter 2023-10-25 16:54:26 +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
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
Antonio Scandurra 05cbceec24 WIP 2023-10-23 17:36:49 +02:00
Antonio Scandurra efbf0c828d WIP 2023-10-23 16:38:34 +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
Antonio Scandurra a0b667a2ca WIP 2023-10-22 19:56:25 +02:00
Antonio Scandurra 72435af170 Checkpoint 2023-10-22 18:34:45 +02:00
Antonio Scandurra 50bbdd5cab WIP 2023-10-22 16:53:59 +02:00
Antonio Scandurra f4135e6bcf WIP 2023-10-22 12:21:28 +02:00
Nathan Sobo 909fbb9538 Checkpoint 2023-10-21 19:07:59 +02:00
Antonio Scandurra b7d30fca2b WIP 2023-10-21 17:52:47 +02:00
Antonio Scandurra e4fe9538d7 Checkpoint 2023-10-21 16:01:47 +02:00
Antonio Scandurra f3979a9f28 Checkpoint 2023-10-21 15:59:52 +02:00
Marshall Bowers ef18aaa66f Merge branch 'main' into gpui2 2023-10-12 17:43:05 -04:00
Marshall Bowers 45f3a98359 Remove old ui and storybook crates (#3125)
This PR deletes the old `ui` and `storybook` crates in favor of their
newer variants that we'll be landing to `main` in the near future.

### Motivation

These crates are based off the old version of GPUI 2 (the `gpui2`
crate).

At this point we have since transitioned to the new version of GPUI 2
(the `gpui3` crate, currently still on the `gpui2` branch).

Having both copies around is confusing, so the old ones are going the
way of the dinosaurs.

Release Notes:

- N/A
2023-10-12 17:40:20 -04:00
Marshall Bowers 002458f4c8 Merge branch 'gpui2' into gpui2-ui 2023-10-12 10:27:43 -04:00
Kirill Bulatov a50977e0fd Add prettier support (#3122) 2023-10-12 17:13:10 +03:00
Antonio Scandurra 23f11fcd5e Merge branch 'main' into gpui2 2023-10-12 10:55:17 +02:00
Joseph T. Lyons d6fa06b3be collab 0.24.0 2023-10-11 13:51:01 -04:00
Joseph T. Lyons bdf1731db3 v0.109.x dev 2023-10-11 12:40:57 -04:00