Commit Graph
262 Commits
Author SHA1 Message Date
Marshall Bowers d910bd55d4 Port recent_projects to Zed2 (#3525)
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).

Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.

Release Notes:

- N/A
2023-12-06 18:41:50 -05:00
Max Brunsfeld 1be1e3b5b5 Upgrade async-compression dep 2023-12-06 14:29:09 -08:00
Antonio Scandurra c9300e2384 Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Marshall Bowers 106c479785 Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Piotr OsiewiczandNate 508dd48a80 Port quick_action_bar to zed2
Co-authored-by: Nate <nate@zed.dev>
2023-12-05 17:33:35 +01:00
Antonio Scandurra 6688546075 WIP 2023-12-05 16:49:36 +01:00
Antonio ScandurraandJulia Risley e2f77c34f9 Port semantic_index to gpui2
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-12-05 15:38:36 +01:00
Julia adeb5a8f9f zed2: Port outline view 2023-12-04 11:44:32 -05:00
Conrad Irwin 89bbc801d0 +language_selector2 2023-12-01 21:23:20 -07:00
Julia 46e8e35f4d Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Max Brunsfeld 2cb5a395e2 Bump Tree-sitter for a crash fix 2023-11-30 11:36:36 -08:00
Julia e320627bd9 Merge branch 'main' into zed2-breadcrumbs 2023-11-30 11:38:29 -05:00
Max Brunsfeld 189fe50f89 Implement activity indicator in zed2 2023-11-29 17:18:21 -08:00
Mikayla d6a5f8a3aa Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Mikayla a614cc433c Merge branch 'main' into welcome 2023-11-27 18:55:23 -08:00
Mikayla 8436b634b3 Add uiua and nu languages 2023-11-27 18:46:56 -08:00
Max Brunsfeld 4dbfdfdf02 Upgrade Tree-sitter for stack-overflow bugfix 2023-11-27 13:16:50 -08:00
JuliaandMax Brunsfeld 54a1ef9697 zed2: Mostly port breadcrumbs & improve StyledText api
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-11-27 16:09:31 -05:00
Piotr Osiewicz 7253a5373d chore: Use "limited" debug info
This one does not contain variable-level debug info; since we mostly rely on backtraces though, this should be fine. It also improves compile times a bunch for both incremental and clean scenarios.
2023-11-23 17:54:43 +01:00
Mikayla a11500cd55 WIP 2023-11-21 12:40:00 -08:00
Marshall Bowers 53a2bca4c9 Fix storybook (#3379)
This PR fixes storybook and gets it back into a compiling and running
state.

Release Notes:

- N/A
2023-11-21 14:28:00 -05:00
Marshall BowersandNate Butler df13ae0875 Extract Story into separate story crate (#3378)
This PR extracts the `Story` component into a separate `story` crate so
that it can be shared among various crates that define stories.

Release Notes:

- N/A

---------

Co-authored-by: Nate Butler <iamnbutler@gmail.com>
2023-11-21 13:42:00 -05:00
Piotr Osiewicz b05280f8cb Merge remote-tracking branch 'origin/callback-handles' into search2 2023-11-21 00:40:20 +01:00
42dfefd738 WIP
co-authored-by: conrad <conrad@zed.dev>
co-authored-by: Nathan <nathan@zed.dev>
2023-11-20 14:46:01 -08:00
Piotr Osiewicz 9fc3540a43 Merge branch 'main' into search2 2023-11-20 18:37:41 +01:00
Mikayla Maki 6108fe2c2e Add nightly release channel for zed2 (#3355)
Release Notes:

- N/A
2023-11-17 22:12:18 -08:00
Mikayla e2b3c50530 Add autoupdate2
co-authoredby: max@zed.dev
2023-11-17 15:48:32 -08:00
Julia 9a986fc6ab Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
JuliaandNathan Sobo 77947a8b50 Get diagnostics view almost building in the zed2 world
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-11-17 16:32:35 -05:00
Piotr Osiewicz 9cd550e2b7 Merge branch 'main' into search2 2023-11-17 13:22:30 +01:00
Conrad Irwin b27cc75fae Add storybook3 2023-11-16 19:42:25 -07:00
Piotr Osiewicz 7315c187bf Merge branch 'main' into search2 2023-11-16 17:16:15 +01:00
Kirill BulatovandMikayla Maki 0b207edede Start porting terminal_view to gpui2
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-11-16 10:04:03 +02:00
Mikayla 37e6d07ba7 Merge branch 'main' into tabs-n-splits 2023-11-15 23:41:25 -08:00
Mikayla abf3915283 Compile taffy in release mode 2023-11-15 23:15:36 -08:00
Conrad Irwin 71bc5c962a Move placeholder titlebar render to collab_ui 2023-11-15 16:09:21 -07:00
Piotr Osiewicz 07d6ce8db4 Merge branch 'main' into search2 2023-11-15 12:54:26 +01: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
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
Piotr Osiewicz e722fa2ddf WIP: start search2 2023-11-13 20:38:37 +01:00
Max Brunsfeld ebc66872d2 Merge branch 'main' into project-panel2 2023-11-13 11:26:51 -08:00
Max Brunsfeld 7e9d99edff Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08: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
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
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 2a38753bb8 Merge branch 'main' into picker 2023-11-07 11:27:14 -08:00