Commit Graph
4885 Commits
Author SHA1 Message Date
Mikayla 2bda91180c Merge branch 'main' into add-collab-tests 2023-11-08 09:57:08 -08:00
Mikayla 34a01d2565 Merge branch 'main' into add-collab-tests 2023-11-08 09:41:57 -08:00
Max Brunsfeld 8feec8108e Register menu2 actions using actions macro 2023-11-08 09:35:19 -08:00
Marshall Bowers 9f7bef63b3 Port the picker and uniform list (#3248)
This adds a `UniformList` element and partially implements `Picker` as a
component, using `UniformList`. Because editor2 isn't fully implemented
yet, the picker doesn't have filtering logic yet. We want to merge this
for now though, to make the UniformList element available for other
crates.

Release Notes:

- N/A
2023-11-08 17:45:23 +01:00
Marshall Bowers 443543c4a8 Merge branch 'main' into picker 2023-11-08 11:18:54 -05:00
Joseph T. Lyons 3ffe1f8323 v0.113.x dev 2023-11-08 10:53:37 -05:00
Nate Butler 0817153b76 Extend the theme crate to enable stories, add players story 2023-11-07 21:08:33 -05:00
Max Brunsfeld 69c61fb1f4 Implement basic fuzzy filtering in picker 2023-11-07 17:24:04 -08:00
b66074ae98 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 2a38753bb8 Merge branch 'main' into picker 2023-11-07 11:27:14 -08:00
Conrad Irwin 7caf684353 modals2 (#3247)
New Modal implementation for gpui2

Release Notes:

N/A
2023-11-07 10:56:46 -07:00
Max Brunsfeld 30580b8abb Merge branch 'main' into picker 2023-11-07 09:34:57 -08:00
Marshall Bowers fc9a860c79 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
6f2ddc9abe 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 ccdb5b2857 Merge remote-tracking branch 'origin/main' into editor2-paint 2023-11-07 13:09:48 +01:00
490c08a10a 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 97ee77c3f8 Checkpoint 2023-11-06 14:26:10 -08:00
Mikayla b83856e669 Snapshot for kirill 2023-11-06 12:33:20 -08:00
Marshall Bowers 31cfb83723 Merge branch 'main' into import-theme 2023-11-06 12:08:46 -05:00
Piotr Osiewicz 3560f8a7bc 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 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
Kirill Bulatov 321872095c Parallelize diagnostics filling, add more logs 2023-11-05 15:06:39 +02:00
Mikayla Maki 5ace4b8f06 Merge branch 'main' into add-collab-tests 2023-11-03 18:06:08 -07:00
Mikayla c163c12bca Get collab2 green 2023-11-03 18:01:06 -07:00
Max Brunsfeld 7b7ba5236d WIP2000 2023-11-03 16:40:37 -07:00
Kirill Bulatov 3592b98e8f Refresh diagnostics inside the tab 2023-11-03 21:51:12 +02:00
Marshall Bowers f9701564ce Merge branch 'main' into import-theme 2023-11-03 15:41:12 -04:00
Max BrunsfeldandMarshall eeaa7c7685 Add channel2 crate
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
KCaverly 29315fe06f port rope2 to zed2 2023-11-03 12:15:23 -04:00
Marshall Bowers ca64641b26 Merge branch 'main' into import-theme 2023-11-03 10:11:35 -04:00
Antonio Scandurra 327a700c80 Don't depend on gpui2 in text 2023-11-03 14:53:08 +01:00
Antonio Scandurra 305c7b29a2 Merge remote-tracking branch 'origin/main' into editor2 2023-11-03 14:47:49 +01:00
Kirill Bulatov 5b401b32e9 Move journal2 to workspace2 2023-11-03 12:55:06 +02:00
Antonio Scandurra a5b53ca825 Uncomment Editor::report_editor_event 2023-11-03 10:53:55 +01:00
Kirill Bulatov f104a3a48a Add prettier workspace resolution test 2023-11-03 11:02:50 +02:00
Antonio Scandurra 595ccad409 Remove dependency from gpui from editor2 2023-11-03 09:05:58 +01:00
Nathan Sobo b7dfb4eeb4 WIP 2023-11-02 22:56:04 -06:00
Nathan Sobo 7c2b802283 WIP 2023-11-02 21:03:29 -06:00
Nathan Sobo 63d08003aa Merge remote-tracking branch 'origin/rich_text2' into editor2 2023-11-02 20:34:52 -06:00
Conrad Irwin f9cee6b4cf Convert rich_text2 2023-11-02 19:30:33 -06:00
Conrad Irwin bd8b5d2318 Add rich_text2 2023-11-02 19:19:18 -06:00
Conrad Irwin 5e2813d913 git -> git3
This is needed for the editor.
2023-11-02 19:18:01 -06:00
Nate Butler 7d5e80d90a Merge branch 'main' into import-theme 2023-11-02 20:16:09 -04:00
Nathan Sobo 7ebf696940 WIP 2023-11-02 16:47:14 -06:00
Conrad Irwin 0fca49be33 WIP 2023-11-02 15:27:49 -06:00
Nate ButlerandMarshall 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
Conrad Irwin fdeff77625 Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 13:16:24 -06:00
Mikayla d8b8390702 Remove the 2s from source code 2023-11-02 10:55:02 -07:00
Conrad Irwin d8f6dd8d39 WIP 2023-11-02 11:34:31 -06:00
Conrad Irwin 6da8bb337f Merge remote-tracking branch 'origin/main' into zed2-workspace 2023-11-02 09:44:38 -06:00