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
Nathan Sobo
909fbb9538
Checkpoint
2023-10-21 19:07:59 +02:00
Antonio Scandurra
b7d30fca2b
WIP
2023-10-21 17:52:47 +02:00
Antonio Scandurra
e4fe9538d7
Checkpoint
2023-10-21 16:01:47 +02:00
Antonio Scandurra
f3979a9f28
Checkpoint
2023-10-21 15:59:52 +02:00
Max Brunsfeld
e590b43545
Merge branch 'main' into notifications
2023-10-13 11:31:53 -07:00
Piotr Osiewicz
bfbe4ae4b4
Piotr/z 651 vue support ( #3123 )
...
Release Notes:
- Added Vue language support.
2023-10-13 18:58:59 +02:00
Max Brunsfeld
d1756b621f
Start work on notification panel
2023-10-12 17:41:09 -07:00
Max Brunsfeld
cf6ce0dbad
Start work on storing notifications in the database
2023-10-12 17:41:07 -07:00
Marshall Bowers
ef18aaa66f
Merge branch 'main' into gpui2
2023-10-12 17:43:05 -04:00
Marshall Bowers
45f3a98359
Remove old ui and storybook crates ( #3125 )
...
This PR deletes the old `ui` and `storybook` crates in favor of their
newer variants that we'll be landing to `main` in the near future.
### Motivation
These crates are based off the old version of GPUI 2 (the `gpui2`
crate).
At this point we have since transitioned to the new version of GPUI 2
(the `gpui3` crate, currently still on the `gpui2` branch).
Having both copies around is confusing, so the old ones are going the
way of the dinosaurs.
Release Notes:
- N/A
2023-10-12 17:40:20 -04:00
Julia
eced842dfc
Get started with a prettier server package
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-10-11 12:56:28 +03:00
Marshall Bowers
1cf5cdbeca
Add ui2 crate
2023-10-06 16:52:05 -04:00
Marshall Bowers
ad8187b151
Merge branch 'main' into marshall/gpui2-playground
2023-10-06 13:33:04 -04:00
Mikayla
c4870e1b6b
re-unify markdown parsing between hover_popover and chat
2023-10-05 14:22:41 -07:00
Mikayla
d298afba01
Create markdown text element and add to channel chat
2023-10-04 17:47:30 -07:00
Max Brunsfeld
95342c8c33
Merge branch 'main' into channel-changes
2023-10-03 17:52:28 -07:00
Max Brunsfeld
af09861f5c
Specify uuid crate in the root Cargo.toml
...
Co-authored-by: Mikayla <mikayla@zed.dev>
2023-10-03 17:39:24 -07:00
Mikayla
6007c8705c
Upgrade SeaORM to latest version, also upgrade sqlite bindings, rustqlite, and remove SeaQuery
...
co-authored-by: Max <max@zed.dev>
2023-10-03 12:16:53 -07:00
Joseph T. Lyons
892350fa2d
Add memory and cpu events
...
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-10-02 19:35:31 -04:00
Marshall Bowers
d14dc35efe
Merge branch 'gpui2' into marshall/gpui2-playground
2023-10-02 18:36:22 -04:00
KCaverly
dc49dec4f0
catchup with main
2023-09-22 09:43:39 -04:00
KCaverly
48e151495f
introduce ai crate with completion providers
2023-09-21 22:44:56 -04:00
KCaverly
5f6334696a
rename ai crate to assistant crate
2023-09-21 21:54:59 -04:00
Marshall Bowers
baa07e935e
Extract UI elements from storybook into new ui crate ( #3008 )
...
This PR extracts the various UI elements from the `storybook` crate into
a new `ui` library crate.
Release Notes:
- N/A
2023-09-21 19:25:35 -04:00
Nathan Sobo
dfeb702544
WIP - Next: implement Element derive macro
2023-09-20 22:26:46 -06:00
Nathan Sobo
44608517c1
WIP
2023-09-20 14:32:55 -06:00
KCaverly
25cb79e475
remove git2 dependency for repository cloning in semantic_index eval
2023-09-19 18:55:15 -04:00
KCaverly
b57b5c0b33
updated git2 to use ssl
2023-09-19 16:36:51 -04:00
KCaverly
d85acceeec
move git2 to workspace dependency globally
2023-09-19 16:13:47 -04:00
Nathan Sobo
e762f7f3c0
Checkpoint
2023-09-19 13:09:00 -06:00
Nathan Sobo
15ea4af5e7
Merge branch 'main' into storybook
2023-09-11 09:13:46 -06:00
Mikayla
2be34ef254
Add syntax highlighting for nu scripts
2023-09-09 15:39:39 -07:00
Mikayla
ef03e206d6
WIP: Add nushell support
2023-09-09 14:01:53 -07:00
Nathan Sobo
3b5ee59273
Split playground into gpui2 and storybook
2023-08-30 16:12:14 -06:00
Nathan Sobo
746f77bf7c
Checkpoint
2023-08-30 14:40:57 -06:00
Mikayla
74565ed0b8
Add feature flags handling to the client, rewrite staff mode to a trait extension style
2023-08-25 17:00:53 -07:00
Mikayla
a7a4e2e369
Add buffer integration test
...
Rearrange channel crate structure
Get channel buffer from database
co-authored-by: Max <max@zed.dev>
2023-08-23 18:34:43 -07:00
Max Brunsfeld
ff5035ea37
Start work on storing channel buffers
2023-08-23 18:34:43 -07:00
Mikayla
707ca34f19
Merge branch 'main' into disclosable-component
2023-08-23 16:30:27 -07:00
Piotr Osiewicz
1320fadc30
Bump rust embed ( #2883 )
...
This is a follow-up to a recent patch I've submitted to this crate to
improve compile time and runtime (in older versions file lookup was
essentially O(n) with respect to path count, now it's O(log n))
Release Notes:
- N/A
2023-08-24 00:16:35 +02:00
Nathan Sobo
d375f7992d
Merge branch 'main' into divs
2023-08-22 16:35:56 -06:00
Mikayla
e946b0a2ec
Finish building out adapters and names
...
Document core traits
Add start for a component storybook
2023-08-19 14:40:05 -07:00
Max Brunsfeld
09fcacdfd1
Upgrade Tree-sitter for error recovery bug fix
2023-08-18 11:31:40 -07:00
Nathan Sobo
9b74dc196e
Introduce Refinement trait and derive macro
2023-08-18 01:03:46 -06:00
Nathan Sobo
1ef486b227
WIP
2023-08-13 01:40:05 -06:00
Nathan Sobo
d6eaa3c6b8
Ditch the hot reloading approach
2023-08-11 00:26:58 -06:00
Nathan Sobo
c95aecdd53
Merge branch 'main' into cells
2023-08-08 21:23:57 -06:00
Nathan Sobo
adc50469ff
WIP
2023-08-06 12:45:31 -06:00
Nathan Sobo
379652f074
Merge branch 'main' into cells
2023-08-03 19:33:04 -06:00
Mikayla Maki
1545128ec5
Add Nix language support ( #2781 )
...
This adds rudimentary language support for the Nix expression language,
through tree-sitter-nix.
I spent a little bit of time trying to add support for one of the Nix
language servers too, but wasn't able to get any of them running
reliably without crashing, and so I've opted to stick to just the
tree-sitter grammar for now.
2023-07-27 18:35:52 -07:00
Mikayla Maki
45e5d81664
update to dependency without symbol conflict
2023-07-27 17:41:13 -07:00
Mikayla Maki
0dffb728db
Update elixir depedency
...
co-authored-by: Alex <alexviscreanu@gmail.com>
2023-07-27 17:36:09 -07:00
Mikayla Maki
d835274306
Downgrade our dependency on treesitter-cpp
2023-07-27 11:11:24 -07:00
Mikayla Maki
d5c30709b3
Downgrade tree sitter elm to 5.6.4
2023-07-26 15:44:06 -07:00
KCaverly
0ac919f6e0
catchup with main
2023-07-26 09:50:38 -04:00
