Marshall Bowers
31cfb83723
Merge branch 'main' into import-theme
2023-11-06 12:08:46 -05:00
Piotr Osiewicz
cfa516caee
chore: Update vue.js parser (fixes wonky HTML parsing)
...
Vue.js defined a bunch of symbols in it's scanner that collided with those defined in HTML Tree-sitter grammar. I simply removed them as they were meant for consumption by the external parties interested in HTML parser with Vue support - since we handle that ourselves this is not really necessary to preserve anymore. cc was firing up a bunch of warnings about unused symbols, so yeah.
2023-11-05 22:56:35 +01:00
Marshall Bowers
f9701564ce
Merge branch 'main' into import-theme
2023-11-03 15:41:12 -04:00
Max Brunsfeld and Marshall
eeaa7c7685
Add channel2 crate
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-03 10:41:41 -07:00
Nate Butler
7d5e80d90a
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler and Marshall Bowers
538664e784
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
Mikayla
9be2b21c0e
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Julia
51997f65e8
Port multi_buffer to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04:00
Marshall Bowers
59b536af38
Remove old Theme definition ( #3195 )
...
This PR removes the old `Theme` definition in favor of the new
`ThemeVariant`s.
The new `SyntaxStyles` have been reverted to the old `SyntaxTheme` that
operates by storing the syntax styles as a vector of
`gpui2::HighlightStyle`s.
This is necessary for the intended usage by `language2`, where we find
the longest key in the theme's syntax styles that matches the capture
name:
https://github.com/zed-industries/zed/blob/766d5959beffcbb82352d5c64d704141aa24f21d/crates/language2/src/highlight_map.rs#L15-L41
2023-10-31 23:05:50 -04:00
Julia
6db30335b1
Port multi_buffer to gpui2
2023-10-31 18:34:36 -04:00
Mikayla
0244be8819
Merge branch 'zed2' into zed2-workspace
2023-10-30 16:53:21 -07:00
Marshall Bowers
03dfee7a52
Add menu2 crate
2023-10-30 12:56:23 -04:00
Antonio Scandurra
4ec2b9a12c
Merge branch 'zed2' into zed2-workspace
2023-10-30 12:16:34 +01:00
Joseph T. Lyons
02a7548566
Port journal to GPUI2
2023-10-28 11:37:25 -04:00
Conrad Irwin
a1fb3523d3
Merge branch 'main' into zed2
2023-10-27 10:55:15 +02:00
Joseph T. Lyons
315c1e6022
Revert "Add activity_indicator2"
...
This reverts commit 456c659c2a
2023-10-26 17:13:40 +02:00
Joseph T. Lyons
456c659c2a
Add activity_indicator2
2023-10-26 16:49:39 +02:00
Antonio Scandurra
c5fb0e6c1f
Merge branch 'zed2' into zed2-workspace
2023-10-26 15:34:55 +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
Antonio Scandurra
7e8f0bb328
WIP
2023-10-26 12:27:20 +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
Kirill Bulatov
11aade66f8
Start fixing room2
2023-10-26 11:27:12 +02:00
Piotr Osiewicz
d1c8772592
Extract multi_buffer module out of editor ( #3170 )
...
Release Notes:
- N/A
2023-10-25 19:31:47 +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
Marshall Bowers
e4603292eb
Start work on theme converter
2023-10-25 16:54:26 +02:00
Kirill Bulatov
ba8bd2f703
Make audio2
2023-10-24 17:15:59 +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
87cd9c794c
WIP
2023-10-24 10:01:19 +02:00
Piotr Osiewicz
2558a75754
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
Antonio Scandurra
79128dbcb3
WIP
2023-10-23 17:36:49 +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
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
Max Brunsfeld
b7207c5533
Merge branch 'main' into notifications
2023-10-13 11:31:53 -07:00
Piotr Osiewicz
5c749a5db2
Piotr/z 651 vue support ( #3123 )
...
Release Notes:
- Added Vue language support.
2023-10-13 18:58:59 +02:00
Max Brunsfeld
7d663b7290
Start work on notification panel
2023-10-12 17:41:09 -07:00
Max Brunsfeld
3fd65b596a
Start work on storing notifications in the database
2023-10-12 17:41:07 -07: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
Julia and Antonio Scandurra
5033682ba9
Get started with a prettier server package
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2023-10-11 12:56:28 +03:00
Marshall Bowers
fd7bc8cfe0
Add ui2 crate
2023-10-06 16:52:05 -04:00
Marshall Bowers