Commit Graph
1417 Commits
Author SHA1 Message Date
Conrad Irwin b6ff6ac017 Merge branch 'main' into file_finder 2023-11-14 13:34:25 -07:00
Mikayla e34d1ac975 Merge branch 'main' into core-actions 2023-11-14 10:11:39 -08:00
Conrad Irwin 344f78a171 TEMP 2023-11-14 11:03:55 -07:00
Max Brunsfeld 8a5d22df92 Start work on creating gpui2 version of project panel (#3299)
I'm gonna land what I have, even though some features aren't ported yet,
since we're working on all of this code so actively.

* [x] get the basic structure compiling
* [x] get the panel laying out correctly
* [ ] rename / new file editor
* [ ] enable the tests
* [ ] drag and drop
* [ ] context menu
2023-11-14 09:56:46 -08:00
Max Brunsfeld 9722d725c8 Merge branch 'main' into project-panel2 2023-11-14 09:33:48 -08:00
Conrad Irwin 4a6e208d26 Not working yet file-finder2 2023-11-14 09:28:18 -07:00
Joseph T. Lyons 5a99281019 Bump tiktoken-rs to official release 2023-11-14 09:12:25 -05:00
Joseph T. Lyons 03558fe551 Update tiktoken-rs dependency
The PR to add the `gpt-4-1106-preview` model was merged:

https://github.com/zurawiki/tiktoken-rs/pull/49
2023-11-14 09:00:04 -05:00
Joseph T. Lyons e90f157320 Add gpt-4-1106-preview model 2023-11-14 08:28:57 -05:00
Mikayla f966568f8c Implement most core actions 2023-11-14 00:06:33 -08:00
Mikaylaandconrad a0ef21d91d WIP
co-authored-by: conrad <conrad.irwin@zed.dev>
2023-11-13 15:53:04 -08:00
Max Brunsfeld ebc66872d2 Merge branch 'main' into project-panel2 2023-11-13 11:26:51 -08:00
Piotr Osiewicz dadb37be50 chore: Bump cc to 1.0.84 (#3304)
This resolves a minor issue where build scripts could've acquired more
job server tokens from Cargo than allowed by `-j` parameter. I've filled
a PR at https://github.com/rust-lang/cc-rs/pull/878 and we've iterated
on the design over there since.

TL;DR: some build scripts may complete a tad bit quicker, potentially
shaving off a few seconds off of debug/release builds. Full description
of the issue is available in
https://github.com/rust-lang/cc-rs/issues/858

Release Notes:

- N/A
2023-11-13 13:14:22 +01:00
Piotr Osiewicz c01ef1bdad chore: Bump cc to 1.0.84
This resolves a minor issue where build scripts could've acquired more job server tokens from Cargo than allowed by `-j` parameter. I've filled a PR at https://github.com/rust-lang/cc-rs/pull/878 and we've iterated on the design over there since.

TL;DR: some build scripts may complete a tad bit quicker, potentially shaving off a few seconds off of debug/release builds.
2023-11-12 21:28:02 +01:00
Antonio Scandurra 03050a8dc1 Merge remote-tracking branch 'origin/main' into code-actions-2 2023-11-10 11:01:23 +01:00
Conrad Irwin c25c4ce46c Merge branch 'main' into command_palette2 2023-11-09 20:58:54 -07:00
Max Brunsfeld 7e9d99edff Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08:00
Marshall Bowers 756d1dfe10 theme_importer: Support importing themes containing comments (#3298)
This PR updates the `theme_importer` with support for parsing theme
files containing comments.

Up until now we've been manually removing comments from the VS Code
theme files.

Release Notes:

- N/A
2023-11-09 19:22:15 -05:00
Conrad Irwin f02f75bc86 Make command dispatching work 2023-11-09 15:14:23 -07:00
Marshall Bowers 26c4abcc19 Refine theme styles (#3291)
This PR refines a number of styles in the default theme, as well as
updates the theme importer to support importing syntax styles from VS
Code themes.

Release Notes:

- N/A
2023-11-09 15:32:10 -05:00
Nate ButlerandMarshall Bowers c392e567a0 Finish passing Syntax from VSCode themes to Zed Themes
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-09 14:41:26 -05:00
Marshall Bowers 70651e3fc1 Use IndexMap for a deterministic order when importing syntax colors 2023-11-09 13:12:36 -05:00
Antonio ScandurraandNathan 9d6d2c59e3 Render code actions indicator
Co-Authored-By: Nathan <nathan@zed.dev>
2023-11-09 18:43:26 +01:00
Piotr Osiewicz 9228845242 Start working on command_palette2 2023-11-09 17:54:05 +01:00
Mikayla 94ae2091ff Add notifications2 2023-11-08 21:23:31 -08:00
Mikayla Maki f836ecd436 port rope2 to zed2 (#3224)
port rope2 to zed2

Release Notes:

- NA
2023-11-08 20:19:05 -08:00
Mikayla 22a19cd8ff Merge branch 'main' into event-emitter 2023-11-08 20:10:38 -08:00
Mikayla 9fd7066ac1 Get workspace compiling with new event emitters 2023-11-08 19:29:00 -08:00
Conrad Irwin e486dff146 Merge branch 'main' into go-to-line2 2023-11-08 14:46:52 -07:00
Mikayla b37f5c083e WIP 2023-11-08 12:49:09 -08:00
Marshall Bowers 1047c1d378 Use a fork of ctor to silence warnings generated by macro (#3275)
This PR switches us over to a fork of `ctor` that contains the fixes
from https://github.com/mmastrac/rust-ctor/pull/295, backported to our
current version of `ctor` (v0.1.20).

Once 1) the `ctor` maintainer publishes a new version with that change
and 2) we're ready to upgrade to the latest version of `ctor` we can
switch back to the mainline version.

Release Notes:

- N/A
2023-11-08 15:05:19 -05:00
Conrad Irwin 185d8f7a15 Merge branch 'main' into add-collab-tests 2023-11-08 12:33:15 -07:00
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