Mikayla
e1525e2b47
Get collab2 green
2023-11-03 18:01:06 -07:00
Max Brunsfeld
b085569b46
Add channel2 crate
...
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
Mikayla
e82d8eb5b8
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Julia
b7625d81e8
Port multi_buffer
to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04:00
Marshall Bowers
36a73d657a
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:
18431051d9/crates/language2/src/highlight_map.rs (L15-L41)
2023-10-31 23:05:50 -04:00
Julia
795369a1e3
Port multi_buffer
to gpui2
2023-10-31 18:34:36 -04:00
Mikayla
3dadfb8ba8
Merge branch 'zed2' into zed2-workspace
2023-10-30 16:53:21 -07:00
Marshall Bowers
b31a004def
Add menu2
crate
2023-10-30 12:56:23 -04:00
Antonio Scandurra
bd750fbbe2
Merge branch 'zed2' into zed2-workspace
2023-10-30 12:16:34 +01:00
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
Joseph T. Lyons
88a3a57789
Add activity_indicator2
2023-10-26 16:49:39 +02:00
Antonio Scandurra
821fe0f5b5
Merge branch 'zed2' into zed2-workspace
2023-10-26 15:34:55 +02:00
Max Brunsfeld
a4b7e3c9f6
Merge branch 'zed2-hangs' into zed2
2023-10-26 12:48:35 +02:00
Conrad Irwin
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
Antonio Scandurra
c8b5b085f4
WIP
2023-10-26 12:27:20 +02:00
Antonio Scandurra
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
Kirill Bulatov
483ac9491a
Start fixing room2
2023-10-26 11:27:12 +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
Antonio Scandurra
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
Marshall Bowers
6b5947a1fa
Start work on theme converter
2023-10-25 16:54:26 +02:00
Kirill Bulatov
18930c33fe
Make audio2
2023-10-24 17:15:59 +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
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
Antonio Scandurra
05cbceec24
WIP
2023-10-23 17:36:49 +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
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
Max Brunsfeld
e590b43545
Merge branch 'main' into notifications
2023-10-13 11:31:53 -07:00
Piotr Osiewicz
bfbe4ae4b4
Piotr/z 651 vue support ( #3123 )
...
Release Notes:
- Added Vue language support.
2023-10-13 18:58:59 +02:00
Max Brunsfeld
d1756b621f
Start work on notification panel
2023-10-12 17:41:09 -07:00
Max Brunsfeld
cf6ce0dbad
Start work on storing notifications in the database
2023-10-12 17:41:07 -07: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
Julia
eced842dfc
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
1cf5cdbeca
Add ui2
crate
2023-10-06 16:52:05 -04:00
Marshall Bowers
ad8187b151
Merge branch 'main' into marshall/gpui2-playground
2023-10-06 13:33:04 -04:00
Mikayla
c4870e1b6b
re-unify markdown parsing between hover_popover and chat
2023-10-05 14:22:41 -07:00
Mikayla
d298afba01
Create markdown text element and add to channel chat
2023-10-04 17:47:30 -07:00
Max Brunsfeld
95342c8c33
Merge branch 'main' into channel-changes
2023-10-03 17:52:28 -07:00