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
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
Mikayla
9b30f490c7
Merge branch 'main' into add-collab-tests
2023-11-08 09:57:08 -08:00
Mikayla
3050c440f4
Merge branch 'main' into add-collab-tests
2023-11-08 09:41:57 -08:00
Max Brunsfeld
d690fb038d
Merge branch 'main' into picker
2023-11-07 11:27:14 -08:00
Max Brunsfeld
69eb49a2ed
Merge branch 'main' into picker
2023-11-07 09:34:57 -08:00
Conrad Irwin
a2a28af052
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
3f7dc59512
Snapshot for kirill
2023-11-06 12:33:20 -08:00
Marshall Bowers
f8504c349c
Merge branch 'main' into import-theme
2023-11-06 12:08:46 -05:00
Piotr Osiewicz
7374ca999b
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
e1525e2b47
Get collab2 green
2023-11-03 18:01:06 -07:00
Marshall Bowers
12500364b4
Merge branch 'main' into import-theme
2023-11-03 15:41:12 -04:00
Max Brunsfeld
b085569b46
Add channel2 crate
...
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-03 10:41:41 -07:00
Nate Butler
b4e2368943
Merge branch 'main' into import-theme
2023-11-02 20:16:09 -04:00
Nate Butler
058981350c
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
e82d8eb5b8
Merge branch 'main' into zed2-workspace
2023-11-01 11:46:28 -07:00
Julia
b7625d81e8
Port multi_buffer to gpui2 ( #3193 )
...
Release Notes:
- N/A
2023-11-01 11:45:44 -04:00
Marshall Bowers
36a73d657a
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:
18431051d9/crates/language2/src/highlight_map.rs (L15-L41)
2023-10-31 23:05:50 -04:00
Julia
795369a1e3
Port multi_buffer to gpui2
2023-10-31 18:34:36 -04:00
Mikayla
3dadfb8ba8
Merge branch 'zed2' into zed2-workspace
2023-10-30 16:53:21 -07:00
Marshall Bowers
b31a004def
Add menu2 crate
2023-10-30 12:56:23 -04:00
Antonio Scandurra
bd750fbbe2
Merge branch 'zed2' into zed2-workspace
2023-10-30 12:16:34 +01:00
Joseph T. Lyons
6b65d76014
Port journal to GPUI2
2023-10-28 11:37:25 -04:00
Conrad Irwin
4a6a17d866
Merge branch 'main' into zed2
2023-10-27 10:55:15 +02:00
Joseph T. Lyons
98d03f6e7a
Revert "Add activity_indicator2"
...
This reverts commit 88a3a57789
2023-10-26 17:13:40 +02:00
Joseph T. Lyons
88a3a57789
Add activity_indicator2
2023-10-26 16:49:39 +02:00
Antonio Scandurra
821fe0f5b5
Merge branch 'zed2' into zed2-workspace
2023-10-26 15:34:55 +02:00
Max Brunsfeld
a4b7e3c9f6
Merge branch 'zed2-hangs' into zed2
2023-10-26 12:48:35 +02:00
Conrad Irwin
065d26f5b2
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
c8b5b085f4
WIP
2023-10-26 12:27:20 +02:00
Antonio Scandurra
06c22206af
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
483ac9491a
Start fixing room2
2023-10-26 11:27:12 +02:00
Piotr Osiewicz
7f6bb3d1eb
Extract multi_buffer module out of editor ( #3170 )
...
Release Notes:
- N/A
2023-10-25 19:31:47 +02:00
Antonio Scandurra
412c0ff7dc
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
6b5947a1fa
Start work on theme converter
2023-10-25 16:54:26 +02:00
Kirill Bulatov
18930c33fe
Make audio2
2023-10-24 17:15:59 +02:00
Antonio Scandurra
11953e613b
Checkpoint
2023-10-24 16:15:20 +02:00
Antonio Scandurra
191285a8f1
Checkpoint
2023-10-24 15:18:51 +02:00
Kirill Bulatov
4d5ca37edb
Fix the branch compilation
2023-10-24 14:04:45 +02:00
Antonio Scandurra
18eb4a7292
WIP
2023-10-24 10:01:19 +02:00
Piotr Osiewicz
97a0864134
grammars: Update Bash grammar ( #3155 )
...
Fixes zed-industries/community#2168
Release Notes:
- Updated Bash (Shell script) Tree-sitter grammar (fixes
zed-industries/community#2168 )
2023-10-24 09:16:06 +02:00
Antonio Scandurra
05cbceec24
WIP
2023-10-23 17:36:49 +02:00
Antonio Scandurra
a72434f67b
WIP
2023-10-23 12:16:33 +02:00
Antonio Scandurra
0de4a93ec7
WIP
2023-10-23 11:43:08 +02:00
Antonio Scandurra
56462ef793
Checkpoint
2023-10-23 10:59:29 +02:00
Antonio Scandurra
a0b667a2ca
WIP
2023-10-22 19:56:25 +02:00
Antonio Scandurra
72435af170
Checkpoint
2023-10-22 18:34:45 +02:00
