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
Marshall Bowers
59b536af38
Remove old Theme definition ( #3195 )
...
This PR removes the old `Theme` definition in favor of the new
`ThemeVariant`s.
The new `SyntaxStyles` have been reverted to the old `SyntaxTheme` that
operates by storing the syntax styles as a vector of
`gpui2::HighlightStyle`s.
This is necessary for the intended usage by `language2`, where we find
the longest key in the theme's syntax styles that matches the capture
name:
https://github.com/zed-industries/zed/blob/766d5959beffcbb82352d5c64d704141aa24f21d/crates/language2/src/highlight_map.rs#L15-L41
2023-10-31 23:05:50 -04:00
Julia
6db30335b1
Port multi_buffer to gpui2
2023-10-31 18:34:36 -04:00
Mikayla
0244be8819
Merge branch 'zed2' into zed2-workspace
2023-10-30 16:53:21 -07:00
Marshall Bowers
03dfee7a52
Add menu2 crate
2023-10-30 12:56:23 -04:00
Antonio Scandurra
4ec2b9a12c
Merge branch 'zed2' into zed2-workspace
2023-10-30 12:16:34 +01:00
Joseph T. Lyons
02a7548566
Port journal to GPUI2
2023-10-28 11:37:25 -04:00
Conrad Irwin
a1fb3523d3
Merge branch 'main' into zed2
2023-10-27 10:55:15 +02:00
Joseph T. Lyons
315c1e6022
Revert "Add activity_indicator2"
...
This reverts commit 456c659c2a
2023-10-26 17:13:40 +02:00
Joseph T. Lyons
456c659c2a
Add activity_indicator2
2023-10-26 16:49:39 +02:00
Antonio Scandurra
c5fb0e6c1f
Merge branch 'zed2' into zed2-workspace
2023-10-26 15:34:55 +02:00
Max Brunsfeld
e49b849e27
Merge branch 'zed2-hangs' into zed2
2023-10-26 12:48:35 +02:00
41d2ad8205
Get RPC2 tests passing
...
Co-authored-by: Conrad <conrad@zed.dev >
Co-authored-by: Kyle <kyle@zed.dev >
2023-10-26 12:47:37 +02:00
Antonio Scandurra
7e8f0bb328
WIP
2023-10-26 12:27:20 +02:00
15afa23430
Add install_cli2
...
Co-authored-by: Mikayla <mikayla@zed.dev >
Co-Authored-By: Kirill <kirill@zed.dev >
2023-10-26 12:09:54 +02:00
Kirill Bulatov
11aade66f8
Start fixing room2
2023-10-26 11:27:12 +02:00
Piotr Osiewicz
d1c8772592
Extract multi_buffer module out of editor ( #3170 )
...
Release Notes:
- N/A
2023-10-25 19:31:47 +02:00
18c036f7ae
Add fs2
...
Co-Authored-By: Max <max@zed.dev >
Co-Authored-By: Conrad <conrad.irwin@gmail.com >
Co-Authored-By: Kyle <kyle@zed.dev >
2023-10-25 19:17:50 +02:00
Marshall Bowers
e4603292eb
Start work on theme converter
2023-10-25 16:54:26 +02:00
Kirill Bulatov
ba8bd2f703
Make audio2
2023-10-24 17:15:59 +02:00
Antonio Scandurra
a184c6aa02
Checkpoint
2023-10-24 16:15:20 +02:00
Antonio Scandurra
0ea159d17c
Checkpoint
2023-10-24 15:18:51 +02:00
Kirill Bulatov
f54f14fed2
Fix the branch compilation
2023-10-24 14:04:45 +02:00
Mikayla