Max Brunsfeld
2cb5a395e2
Bump Tree-sitter for a crash fix
2023-11-30 11:36:36 -08: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
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 Bowers and Nate 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
Julia and Nathan 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 Bulatov and Mikayla 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
Max Brunsfeld
30580b8abb
Merge branch 'main' into picker
2023-11-07 09:34:57 -08: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
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
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
Mikayla
c163c12bca
Get collab2 green
2023-11-03 18:01:06 -07:00
Marshall Bowers
f9701564ce
Merge branch 'main' into import-theme
2023-11-03 15:41:12 -04:00
Max Brunsfeld and Marshall
eeaa7c7685
Add channel2 crate
...
Co-authored-by: Marshall <marshall@zed.dev >
2023-11-03 10:41:41 -07:00
Nate Butler
7d5e80d90a
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler and Marshall 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
Mikayla
9be2b21c0e
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Julia
51997f65e8
Port multi_buffer to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04:00
Max Brunsfeld