Antonio Scandurra
b871f906d6
Use FxHashMap and FxHashSet in hot code paths
...
We can also use these maps and sets in place of `SeaHasher` because
they are also deterministic. Note that we're not swapping std's
`HashMap` and `HashSet` wholesale inside of `collections` because
on the server we need cryptographically secure collections.
2023-12-12 13:35:22 +01:00
Conrad Irwin
b66b4915cf
Merge branch 'main' into vim2
2023-12-11 09:38:23 -07:00
Piotr Osiewicz
ddbd5cf2cb
Merge branch 'main' into project_search2
2023-12-11 16:47:48 +01:00
Marshall Bowers
8feb11ccee
Make clicking the breadcrumb toggle the symbol outline ( #3571 )
...
This PR wires up clicks on the breadcrumb to toggle the symbol outline.
Note that the behavior of the symbol outline is a little wonky at the
moment, due to the issues with pane focus.
Release Notes:
- N/A
2023-12-08 18:22:53 -05:00
Conrad Irwin
32837d67be
vim2 compiling (but mostly commented out)
2023-12-08 18:47:14 +00:00
Max Brunsfeld
726d761646
Bump tree-sitter-vue to remove dangling submodule
2023-12-08 10:12:18 -08:00
Joseph T. Lyons
0cab3de0ae
collab 0.30.1
2023-12-08 12:48:02 -05:00
Marshall Bowers
c7e19c0bcd
Emit accurate hex colors in generated themes ( #3547 )
...
This PR fixes an issues where the hex colors in the generated themes
were not correct.
We're using the [`palette`](https://crates.io/crates/palette ) crate to
perform the conversions, as this gives us accurate hex codes that match
the VS Code source themes.
Release Notes:
- N/A
2023-12-07 18:34:03 -05:00
Piotr Osiewicz
0c23e6738b
Barebones project search (no UI, but the crate compiles)
2023-12-07 14:36:45 +01:00
Joseph T. Lyons
d2362d7f12
Merge branch 'main' into feedback-2
2023-12-06 23:16:54 -05:00
Joseph T. Lyons
79e0d8ce3b
WIP
2023-12-06 23:15:04 -05: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
Joseph T. Lyons
46c998ca8d
WIP
2023-12-06 17:27:10 -05:00
Marshall Bowers
cd818f580c
Wire up inline assist quick action ( #3519 )
...
This PR wires up the inline assist quick action in the toolbar.
Release Notes:
- N/A
2023-12-06 15:52:51 -05:00
Max Brunsfeld
dba94c5122
Bring back channel notes ( #3506 )
2023-12-06 12:45:46 -08:00
Marshall Bowers
d711087529
Wire up inline assist quick action
2023-12-06 15:44:50 -05:00
Max Brunsfeld
6bbb1642b8
Fix propagation of active item to followers
...
Enable channel buffer integration tests.
2023-12-06 12:18:48 -08:00
Kirill Bulatov
9e1d797445
Use distinct version for zed2, append git hash to its nightly version
2023-12-06 22:04:45 +02:00
Marshall Bowers
147c99f1a7
Fix layout for terminal tabs ( #3514 )
...
This PR fixes the layout for terminal tabs.
We need to use an `h_stack` here to get the icon and the label to
position themselves next to each other instead of one on top of the
other.
Release Notes:
- N/A
2023-12-06 14:28:31 -05:00
Marshall Bowers
2c350a71fe
Port assistant crate to Zed2 ( #3513 )
...
This PR contains the initial port of the `assistant` crate to Zed2.
Release Notes:
- N/A
2023-12-06 14:04:01 -05:00
Joseph T. Lyons
5ae2060783
collab 0.30.0
2023-12-06 12:34:47 -05:00
Antonio Scandurra
14def2a1a3
Merge remote-tracking branch 'origin/main' into assistant-2
...
# Conflicts:
# crates/ui2/src/components/icon.rs
2023-12-06 18:18:58 +01:00
Marshall Bowers
f6a7a6c4d4
v0.117.x dev
2023-12-06 12:03:59 -05:00
Piotr Osiewicz
1f538c5fdd
Merge branch 'main' into copilot2
2023-12-06 15:13:13 +01:00
Piotr Osiewicz
3f9fe58c48
Signed out state is looking good
2023-12-06 13:00:57 +01:00
Antonio Scandurra
9eb98122ec
Merge remote-tracking branch 'origin/main' into assistant-2
2023-12-06 12:53:02 +01:00
Antonio Scandurra
1de02cf6e5
Start wiring up assistant2
2023-12-06 12:51:25 +01:00
Marshall Bowers
e0ca7f844a
Merge branch 'main' into pane-toolbar-tabbar-ui
2023-12-05 14:15:18 -05:00
Joseph T. Lyons
ce8bdb354b
Merge branch 'main' into feedback-2
2023-12-05 12:49:48 -05:00
Piotr Osiewicz and Nate
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 and Julia Risley
09db455db2
Port semantic_index to gpui2
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-12-05 15:38:36 +01:00
Piotr Osiewicz
d433da1e70
Editor2 tests ( #3486 )
...
Release Notes:
- N/A
2023-12-05 14:52:20 +01:00
Max Brunsfeld
ae6ddceb67
Enable more collab UI features ( #3496 )
...
* Current Call section of the collab panel
* Improve the collab titlebar
* Add basic UI for following
Following only partially works, but the UI for following is now in
place.
2023-12-04 18:01:11 -08:00
Max Brunsfeld
959b2961ff
Revert "Decouple workspace from call ( #3380 )"
...
This reverts commit 6da57cbc6e62b1843704
2023-12-04 17:05:44 -08:00
Marshall Bowers
4cb4033a36
Merge branch 'main' into editor2_tests
2023-12-04 14:09:23 -05:00
Julia
5ab6874ae9
zed2: Port outline view
2023-12-04 11:44:32 -05:00
Conrad Irwin
aa3c9b8568
In-flight entertainment ( #3484 )
...
- +language_selector2
- Language Selector 2 working!
- Prevent languages showing in wrong order first
- copilot_menu2 (though only tested offling, which is insufficient)
- Dismiss tooltips at capture
- Get ChannelModal opening
[[PR Description]]
Release Notes:
- N/A
2023-12-03 13:06:29 -07:00
Conrad Irwin
1da18ebe9a
copilot_menu2 (though only tested offling, which is insufficient)
2023-12-01 23:43:02 -07:00
Conrad Irwin
6a5b5f022d
Language Selector 2 working!
2023-12-01 21:23:20 -07:00
Conrad Irwin
2de6758443
+language_selector2
2023-12-01 21:23:20 -07:00
Piotr Osiewicz
d81fb3680e
Uncomment copilot2 tests
2023-12-01 22:04:43 +01:00
Max Brunsfeld
5dd9db3607
collab 0.29.1
2023-12-01 11:50:05 -08:00
Julia
13f4cc563c
Merge branch 'main' into zed2-breadcrumbs
2023-12-01 11:02:34 -05:00
f987a640fd
init feedback2
...
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com >
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com >
2023-11-30 15:23:42 -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
Joseph T. Lyons
f735f5287e
v0.116.x dev
2023-11-29 11:08:32 -05:00
Antonio Scandurra