Antonio Scandurra
efa27cf9b8
Uncomment more editor code
2023-11-03 10:09:00 +01:00
Kirill Bulatov
09346fb9f1
Port changes to zed2
2023-11-03 11:02:50 +02:00
Kirill Bulatov
24dd1c5812
Properly order default prettier installations and startups
2023-11-03 11:02:50 +02:00
Kirill Bulatov
244c693968
Reuse already running default prettiers
2023-11-03 11:02:50 +02:00
Kirill Bulatov
cf95f9b082
Make it more clear that missing prettier is to blame
2023-11-03 11:02:50 +02:00
Kirill Bulatov
369b5140fb
Restore LSP names for prettier servers
2023-11-03 11:02:50 +02:00
Kirill Bulatov
b75d8a60a8
Simplify
2023-11-03 11:02:50 +02:00
Kirill Bulatov
ff144def63
Fix the bugs
2023-11-03 11:02:50 +02:00
Kirill Bulatov
6bbb79a9f5
Rework prettier installation and start
2023-11-03 11:02:50 +02:00
Kirill Bulatov
d673efebd2
Add prettier workspace resolution test
2023-11-03 11:02:50 +02:00
Antonio Scandurra
cdc82d01f7
Call editor::init
2023-11-03 09:06:25 +01:00
Antonio Scandurra
800c2685ea
Remove dependency from gpui from editor2
2023-11-03 09:05:58 +01:00
Nathan Sobo
fbee6b5352
Get editor2 compiling with a ton of code commented out
2023-11-02 23:35:20 -06:00
Nathan Sobo
f3b8a9d8c2
WIP
2023-11-02 22:56:04 -06:00
Nathan Sobo
a731f8fb1e
WIP
2023-11-02 21:28:56 -06:00
Nathan Sobo
dfc7c81500
WIP
2023-11-02 21:03:29 -06:00
Nathan Sobo
72b9dc8216
Merge remote-tracking branch 'origin/main' into editor2
2023-11-02 20:47:09 -06:00
Nathan Sobo
6a89f7ce4f
rich text2 ( #3220 )
...
- git -> git3
- Add rich_text2
[[PR Description]]
Release Notes:
N/A
2023-11-02 20:46:45 -06:00
Nathan Sobo
2a12e8f307
Merge remote-tracking branch 'origin/rich_text2' into editor2
2023-11-02 20:34:52 -06:00
Nate Butler
383d9129f4
[Not compiling] Continue working on VSCode import
2023-11-02 21:49:26 -04:00
Conrad Irwin
0b3932f38c
Convert rich_text2
2023-11-02 19:30:33 -06:00
Conrad Irwin
6ecb4805f7
Add rich_text2
2023-11-02 19:19:18 -06:00
Conrad Irwin
cbd902658c
git -> git3
...
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Conrad Irwin
0aabb19a45
Into the woods
2023-11-02 18:52:08 -06:00
Nate Butler
b4e2368943
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler
0d0b6db24f
Update theme importer
2023-11-02 20:15:51 -04:00
Nate Butler
2b0c959137
Add terminal colors to ThemeColors, add _background to some color names.
2023-11-02 19:53:52 -04:00
Nathan Sobo
9052b48949
Use correct color values in quad fragment shader ( #3217 )
...
Previously, when using rounded corners, the borders would get wider.
Looks like we weren't using the input color values consistently in the
fragment shader. The quad values are raw HSLA and are converted in the
vertex shader.
Release Notes:
- N/A
2023-11-02 17:49:56 -06:00
Marshall Bowers
95a0827517
Clean up unused code
2023-11-02 19:20:21 -04:00
Marshall Bowers
152ac6927f
Add themes2/src/themes directory
2023-11-02 19:17:39 -04:00
Marshall Bowers
d1636bf16b
Finish up theme printer
2023-11-02 19:14:51 -04:00
Marshall Bowers
fc376287e0
Start work on theme printer
2023-11-02 18:57:13 -04:00
Nathan Sobo
7b712ac68f
WIP
2023-11-02 16:47:14 -06:00
Marshall Bowers
0bc51382b2
Add basic VsCodeThemeConverter
2023-11-02 18:24:38 -04:00
Marshall Bowers
e48332c81f
Parse VSCode theme files
2023-11-02 18:00:55 -04:00
Conrad Irwin
583c36e24b
WIP
2023-11-02 15:27:49 -06:00
Nate Butler
058981350c
Scaffold out new theme-importer crate
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-02 17:21:11 -04:00
Conrad Irwin
09efa017d4
Editor2
2023-11-02 14:36:42 -06:00
Conrad Irwin
9e5275cc18
Fix error handling of open_path
...
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-02 14:34:43 -06:00
Nate Butler
972f076b4d
Deserialize theme metadata
2023-11-02 16:31:22 -04:00
Nate Butler
58ac7f2926
[Broken] Load a src theme in test
2023-11-02 16:26:27 -04:00
Marshall Bowers
54969877a4
Make the Zed2 window movable ( #3218 )
...
This PR makes the Zed2 window movable and fixes a crash related to a
`todo!()` that wasn't necessary.
Release Notes:
- N/A
2023-11-02 16:17:31 -04:00
Conrad Irwin
8283909dfd
Disable selective warnings to make cargo check happy
2023-11-02 13:28:58 -06:00
Nathan Sobo
91f3e9707a
Use correct color values in quad fragment shader
...
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-11-02 13:18:20 -06:00
Conrad Irwin
269a72464d
Merge remote-tracking branch 'origin/main' into zed2-workspace
2023-11-02 13:16:24 -06:00
Mikayla Maki
85f0959548
Remove the 2s from source code ( #3216 )
...
Release Notes:
- N/A
2023-11-02 12:11:16 -07:00
Marshall Bowers
9c8220d04e
Remove commented-out label code
2023-11-02 15:04:52 -04:00
Nate Butler
809d8786f1
WIP
2023-11-02 14:54:53 -04:00
Marshall Bowers
3605afc163
Render active item in pane
2023-11-02 14:40:34 -04:00
Marshall Bowers
8b1b7a2f80
Checkpoint: Basic tab bar structure
2023-11-02 14:34:48 -04:00
