Marshall Bowers
2cfbcb3db7
ui2: Remove dependency on theme crate
2023-10-26 16:50:04 +02:00
Marshall Bowers
2db19e3d6e
ui2: Remove dependency on settings crate
2023-10-26 16:50:04 +02:00
Joseph T. Lyons
456c659c2a
Add activity_indicator2
2023-10-26 16:49:39 +02:00
Max Brunsfeld and Conrad
8ba6c2a488
Get most of the language2 tests passing
...
Co-authored-by: Conrad <conrad@zed.dev >
2023-10-26 15:57:12 +02:00
Julia
738e6d242b
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
60f62f030f
Capture language server stderr during startup/init and log if failure
...
zed2 electric boogaloo
2023-10-26 13:50:24 +02:00
Max Brunsfeld
e49b849e27
Merge branch 'zed2-hangs' into zed2
2023-10-26 12:48:35 +02:00
41d2ad8205
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
15afa23430
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
cef3c660b9
Merge branch 'zed2-room' into zed2
2023-10-26 11:57:11 +02:00
917bce77e8
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
ff365a21c8
Fix fs2 import on zed
2023-10-26 11:41:15 +02:00
Conrad Irwin
5a339b9864
Fix settings2 tests
2023-10-26 11:39:32 +02:00
Conrad Irwin
155ee01c0a
Revert "Fix settings2 crate tests"
...
This reverts commit 979132da04
2023-10-26 11:33:58 +02:00
Conrad Irwin
979132da04
Fix settings2 crate tests
2023-10-26 11:27:23 +02:00
Kirill Bulatov
11aade66f8
Start fixing room2
2023-10-26 11:27:12 +02:00
9547714720
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
a3a72b77cc
Merge branch 'zed2' of github.com:zed-industries/zed into zed2
2023-10-25 20:38:03 +02:00
Marshall Bowers
b219cfad15
Load themes from settings and rework Settings trait
2023-10-25 20:37:55 +02:00
18c036f7ae
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
de8fde7026
Stop depending on gpui in client2 and settings2
2023-10-25 18:47:03 +02:00
Marshall Bowers
e4603292eb
Start work on theme converter
2023-10-25 16:54:26 +02:00
Marshall Bowers
98c2331f3a
Load Theme from theme2 into the storybook
2023-10-25 15:50:50 +02:00
Marshall Bowers
25b37522c7
Update Cargo.lock
2023-10-24 18:25:48 +02:00
Marshall Bowers
29e72d4d10
Rename cx.global_default_mut to cx.global_default
2023-10-24 17:58:14 +02:00
Marshall Bowers
f6589a14be
Merge branch 'zed2' into theme2
2023-10-24 17:29:25 +02:00
Marshall Bowers
4efbbfd134
WIP
2023-10-24 16:59:24 +02:00
Antonio Scandurra
a184c6aa02
Checkpoint
2023-10-24 16:15:20 +02:00
Antonio Scandurra
0ea159d17c
Checkpoint
2023-10-24 15:18:51 +02:00
Kirill Bulatov
f54f14fed2
Fix the branch compilation
2023-10-24 14:04:45 +02:00
Antonio Scandurra
24aba3eb3b
WIP
2023-10-24 10:31:35 +02:00
Antonio Scandurra
87cd9c794c
WIP
2023-10-24 10:01:19 +02:00
Antonio Scandurra
79128dbcb3
WIP
2023-10-23 17:36:49 +02:00
Antonio Scandurra
6d86c3f821
WIP
2023-10-23 16:38:34 +02:00
Antonio Scandurra
5034a5bf7f
WIP
2023-10-23 12:16:33 +02:00
Antonio Scandurra
83413aad6f
WIP
2023-10-23 11:43:08 +02:00
Antonio Scandurra
72103622e7
Checkpoint
2023-10-23 10:59:29 +02:00
Antonio Scandurra
2a0c083d00
WIP
2023-10-22 19:56:25 +02:00
Antonio Scandurra
35d9105e48
Checkpoint
2023-10-22 18:34:45 +02:00
Antonio Scandurra
8b9a00e097
WIP
2023-10-22 16:53:59 +02:00
Antonio Scandurra
b18b19a846
WIP
2023-10-22 12:21:28 +02:00
Nathan Sobo
dc2b48010a
Checkpoint
2023-10-21 19:07:59 +02:00
Antonio Scandurra
79474bc2de
WIP
2023-10-21 17:52:47 +02:00
Antonio Scandurra
0659132f36
Checkpoint
2023-10-21 16:01:47 +02:00
Antonio Scandurra
c1ff052c42
Checkpoint
2023-10-21 15:59:52 +02:00
Marshall Bowers
65db5f3d09
Merge branch 'main' into gpui2
2023-10-12 17:43:05 -04:00
Marshall Bowers
2270279119
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
0e2dea8e9a
Merge branch 'gpui2' into gpui2-ui
2023-10-12 10:27:43 -04:00
Kirill Bulatov
2c9ee7814d
Add prettier support ( #3122 )
2023-10-12 17:13:10 +03:00
Antonio Scandurra
36ad020380
Merge branch 'main' into gpui2
2023-10-12 10:55:17 +02:00
Marshall Bowers