zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 06:33:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
15,999 Commits 709 Branches 773 Tags 217 MiB
79653d2175
Commit Graph

265 Commits

Author SHA1 Message Date
Piotr Osiewicz
9bce30687e
Vcs menu2 (#3648) 
Header and footer are gonna be added in a separate PR as they require
changes to Picker trait that I feel are separate from the contents of
this PR.

Release Notes:

- N/A
 2023-12-14 12:36:53 +01:00
Conrad Irwin
9ff73d3a0a Port project_symbols 2023-12-13 13:43:39 -07:00
Max Brunsfeld
726d761646 Bump tree-sitter-vue to remove dangling submodule 2023-12-08 10:12:18 -08:00
Marshall Bowers
a4b271e063
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
2d18b949ad Upgrade async-compression dep 2023-12-06 14:29:09 -08:00
Antonio Scandurra
9eb98122ec Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Marshall Bowers
e0ca7f844a Merge branch 'main' into pane-toolbar-tabbar-ui 2023-12-05 14:15:18 -05:00
Piotr Osiewicz
412c6157b1 Port quick_action_bar to zed2 
Co-authored-by: Nate <nate@zed.dev>
 2023-12-05 17:33:35 +01:00
Antonio Scandurra
ede86d9187 WIP 2023-12-05 16:49:36 +01:00
Antonio Scandurra
09db455db2 Port semantic_index to gpui2 
Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-12-05 15:38:36 +01:00
Julia
5ab6874ae9 zed2: Port outline view 2023-12-04 11:44:32 -05:00
Conrad Irwin
2de6758443 +language_selector2 2023-12-01 21:23:20 -07:00
Julia
13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Max Brunsfeld
16dc978bb4 Bump Tree-sitter for a crash fix 2023-11-30 11:36:36 -08:00
Julia
428c517693 Merge branch 'main' into zed2-breadcrumbs 2023-11-30 11:38:29 -05:00
Max Brunsfeld
e49325080c Implement activity indicator in zed2 2023-11-29 17:18:21 -08:00
Mikayla
a41c857855
Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Mikayla
8faa1f6e58
Merge branch 'main' into welcome 2023-11-27 18:55:23 -08:00
Mikayla
a760508080
Add uiua and nu languages 2023-11-27 18:46:56 -08:00
Max Brunsfeld
1c62abbf79 Upgrade Tree-sitter for stack-overflow bugfix 2023-11-27 13:16:50 -08:00
Julia
d551b41aae 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
41b7acc1de 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
663bbb06d9
WIP 2023-11-21 12:40:00 -08:00
Marshall Bowers
a94cf54aab
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 Bowers
1b05aad30c
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
54a3b56935 Merge remote-tracking branch 'origin/callback-handles' into search2 2023-11-21 00:40:20 +01:00
Mikayla
2c4d83c9af
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
07cc5904f8 Merge branch 'main' into search2 2023-11-20 18:37:41 +01:00
Mikayla Maki
e1285b9780
Add nightly release channel for zed2 (#3355) 
Release Notes:

- N/A
 2023-11-17 22:12:18 -08:00
Mikayla
dd283b471a
Add autoupdate2 
co-authoredby: max@zed.dev
 2023-11-17 15:48:32 -08:00
Julia
3655a96e54 Merge branch 'main' into unborked-git-zed2-diagnostics-view 2023-11-17 16:32:35 -05:00
Julia
f4eb219c75 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
dca2dc7b6b Merge branch 'main' into search2 2023-11-17 13:22:30 +01:00
Conrad Irwin
547888942f Add storybook3 2023-11-16 19:42:25 -07:00
Piotr Osiewicz
6b6a30c3da Merge branch 'main' into search2 2023-11-16 17:16:15 +01:00
Kirill Bulatov
d89c51135a Start porting terminal_view to gpui2 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2023-11-16 10:04:03 +02:00
Mikayla
9da0b78ead
Merge branch 'main' into tabs-n-splits 2023-11-15 23:41:25 -08:00
Mikayla
e9e1170976
Compile taffy in release mode 2023-11-15 23:15:36 -08:00
Conrad Irwin
793fa6e3a4 Move placeholder titlebar render to collab_ui 2023-11-15 16:09:21 -07:00
Piotr Osiewicz
b11bfa8821 Merge branch 'main' into search2 2023-11-15 12:54:26 +01:00
Max Brunsfeld
c7d80c7aac
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
a5fc5819f1 Bump tiktoken-rs to official release 2023-11-14 09:12:25 -05:00
Joseph T. Lyons
946a696d3d 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
516a8790b9 Add gpt-4-1106-preview model 2023-11-14 08:28:57 -05:00
Piotr Osiewicz
dfd68d4cb8 WIP: start search2 2023-11-13 20:38:37 +01:00
Max Brunsfeld
1968becf94 Merge branch 'main' into project-panel2 2023-11-13 11:26:51 -08:00
Max Brunsfeld
b9e098ead8 Start work on creating gpui2 version of project panel 2023-11-09 16:51:03 -08:00
Piotr Osiewicz
d184e0d426 Start working on command_palette2 2023-11-09 17:54:05 +01:00
Mikayla
7888dc4592
Add notifications2 2023-11-08 21:23:31 -08:00
Marshall Bowers
acf37804eb
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