Commit Graph
1881 Commits
Author SHA1 Message Date
Marshall Bowers fe28d8faea Merge branch 'main' into picker 2023-11-08 11:18:54 -05:00
Joseph T. Lyons 9e5a4ea6c4 v0.113.x dev 2023-11-08 10:53:37 -05:00
Nate Butler 79b4f78cb3 Extend the theme crate to enable stories, add players story 2023-11-07 21:08:33 -05:00
Max Brunsfeld 06960df287 Implement basic fuzzy filtering in picker 2023-11-07 17:24:04 -08:00
b9d051eae7 Start work on adding a filter editor to the picker
Implement picker as a view instead of as a component

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-07 13:37:10 -08:00
Max Brunsfeld d690fb038d Merge branch 'main' into picker 2023-11-07 11:27:14 -08:00
Conrad Irwin c89d6eb292 modals2 (#3247)
New Modal implementation for gpui2

Release Notes:

N/A
2023-11-07 10:56:46 -07:00
Max Brunsfeld 69eb49a2ed Merge branch 'main' into picker 2023-11-07 09:34:57 -08:00
Marshall Bowers 0d95410634 Rework third-party themes (#3254)
This PR reworks the way we define our third-party themes to make them
work as overlays on top of a base theme.

We introduce the concept of a `UserThemeFamily` that contains
`UserTheme`s. Rather than being an entire theme definition on their own,
a `UserTheme` just contains optional overrides for the values in a
`Theme`.

When resolving a `UserTheme`, we apply it on top of the base theme. Any
values not overridden in the `UserTheme` will fall back to the `Theme`
defaults.

Right now we are just using `UserTheme` to model third-party themes that
we distribute with the Zed binary. However, this same structure can also
be used to import arbitrary user themes (such as from a theme registry,
or even a theme blob from the settings file).

Release Notes:

- N/A
2023-11-07 11:40:07 -05:00
a2a28af052 Add Modals
P.S. this is all completely different now

Co-Authored-By: Marshall <marshall@zed.dev>
Co-Authored-By: Julia <julia@zed.dev>
2023-11-07 09:18:34 -07:00
Antonio Scandurra bdf6e8bcc7 Merge remote-tracking branch 'origin/main' into editor2-paint 2023-11-07 13:09:48 +01:00
85000eba81 wip: picker
co-authored-by: nathan <nathan@zed.dev>
co-authored-by: max <max@zed.dev>
2023-11-06 17:09:38 -08:00
Mikayla ea6755b1ca Checkpoint 2023-11-06 14:26:10 -08:00
Mikayla 3f7dc59512 Snapshot for kirill 2023-11-06 12:33:20 -08:00
Marshall Bowers f8504c349c Merge branch 'main' into import-theme 2023-11-06 12:08:46 -05:00
Piotr Osiewicz 9509153f99 chore: Update vue.js parser (fixes wonky HTML parsing) (#3238)
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 when I've marked those functions as
`static`, so yeah.
Release Notes:

- Fixed HTML highlighting breaking in presence of <!-- --> comments
(fixes zed-industries/community#2166).
2023-11-06 16:16:46 +01:00
Piotr Osiewicz 7374ca999b 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
Kirill Bulatov fdcb907644 Parallelize diagnostics filling, add more logs 2023-11-05 15:06:39 +02:00
Mikayla Maki 123439adc2 Merge branch 'main' into add-collab-tests 2023-11-03 18:06:08 -07:00
Mikayla e1525e2b47 Get collab2 green 2023-11-03 18:01:06 -07:00
Max Brunsfeld 436dc93441 WIP2000 2023-11-03 16:40:37 -07:00
Kirill Bulatov 9cb8ce172d Refresh diagnostics inside the tab 2023-11-03 21:51:12 +02:00
Marshall Bowers 12500364b4 Merge branch 'main' into import-theme 2023-11-03 15:41:12 -04:00
Max BrunsfeldandMarshall b085569b46 Add channel2 crate
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
KCaverly a65c1776d8 port rope2 to zed2 2023-11-03 12:15:23 -04:00
Marshall Bowers a7edd380e3 Merge branch 'main' into import-theme 2023-11-03 10:11:35 -04:00
Antonio Scandurra de3d37e070 Don't depend on gpui2 in text 2023-11-03 14:53:08 +01:00
Antonio Scandurra 097171b9b8 Merge remote-tracking branch 'origin/main' into editor2 2023-11-03 14:47:49 +01:00
Kirill Bulatov f1fc07de94 Move journal2 to workspace2 2023-11-03 12:55:06 +02:00
Antonio Scandurra 97d1d9bd9b Uncomment Editor::report_editor_event 2023-11-03 10:53:55 +01:00
Kirill Bulatov d673efebd2 Add prettier workspace resolution test 2023-11-03 11:02:50 +02:00
Antonio Scandurra 800c2685ea Remove dependency from gpui from editor2 2023-11-03 09:05:58 +01:00
Nathan Sobo f3b8a9d8c2 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo dfc7c81500 WIP 2023-11-02 21:03:29 -06:00
Nathan Sobo 2a12e8f307 Merge remote-tracking branch 'origin/rich_text2' into editor2 2023-11-02 20:34:52 -06: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
Nate Butler b4e2368943 Merge branch 'main' into import-theme 2023-11-02 20:16:09 -04:00
Nathan Sobo 7b712ac68f WIP 2023-11-02 16:47:14 -06:00
Conrad Irwin 583c36e24b WIP 2023-11-02 15:27:49 -06:00
Nate ButlerandMarshall Bowers 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 269a72464d Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 13:16:24 -06:00
Mikayla d11ff14b57 Remove the 2s from source code 2023-11-02 10:55:02 -07:00
Conrad Irwin 5a41eed120 WIP 2023-11-02 11:34:31 -06:00
Conrad Irwin 0bab1a92df Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 09:44:38 -06:00
Joseph T. Lyons 5412f20e35 Fix missing commit (collab version bump) 2023-11-02 09:22:12 -04:00
Nathan Sobo 3e7df82977 WIP: Merge branch 'main' into zed2-workspace 2023-11-01 22:35:02 -06:00
KCaverly 77dbb15aa3 port text2 to zed2 2023-11-01 16:13:53 -04:00
Joseph T. Lyons 51ecf8e6b4 collab 0.28.0 2023-11-01 14:50:29 -04:00