Commit Graph
39175 Commits
Author SHA1 Message Date
Conrad Irwin 235edc51c8 Merge branch 'main' into dispatch-tree 2023-11-13 13:21:57 -07:00
Mikayla c0b2ecf405 Get editor tests compiling 2023-11-13 12:10:14 -08:00
Marshall Bowers 079616a622 Choose appropriate player colors based on theme appearance 2023-11-13 15:07:13 -05:00
Conrad Irwin 4e819cdbb1 Fix on_action on focusable
We were accidentally dropping the key context
2023-11-13 12:48:36 -07:00
8e12256eae Add delete, open file, and rename actions to the project panel
Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-13 11:38:47 -08: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
53fc2028a8 Get some project panel actions working
Add styling for hovered and selected items

Co-authored-by: Marshall <marshall@zed.dev>
Co-authored-by: Julia <julia@zed.dev>
2023-11-13 11:08:51 -08:00
Nate Butler 2d0473c02f Refine command palette (#3311)
[[PR Description]]

Update command palette styles

Release Notes:

- N/A
2023-11-13 13:58:51 -05:00
Nate Butler b2c70dc203 Reorganize theme2 crate 2023-11-13 13:58:23 -05:00
c38707749f Get left, right, and bottom docks rendering in the right places in the workspace
Co-authored-by: Julia <julia@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
2023-11-13 10:47:15 -08:00
Conrad Irwin dd1bc1f2de Better fix for multiple focuses in one frame 2023-11-13 11:32:05 -07:00
Nate ButlerandMarshall Bowers c13a82fabf Resolve errors
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-13 13:16:05 -05:00
3f549377da Redine command palette style
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
2023-11-13 13:13:40 -05:00
Mikayla 8dcdc67bd1 Merge branch 'main' into editor-tests 2023-11-13 09:54:02 -08:00
Nate Butler 85bfa9caaa Checkpoint Broken 2023-11-13 12:44:50 -05:00
Antonio Scandurra 0ecb9099e1 💄 2023-11-13 18:33:08 +01:00
Antonio Scandurra 16edc402e2 Fix panic when querying available actions 2023-11-13 18:29:18 +01:00
Nate Butler 5322689909 Checkpoint 2023-11-13 12:09:31 -05:00
Nate Butler 2e18121d4c Update Status Colors 2023-11-13 11:56:42 -05:00
Kirill Bulatov 986ab3badd Make inlay hint cache tests pass (#3310)
Release Notes:

- N/A
2023-11-13 18:42:16 +02:00
Kirill BulatovandConrad 7f6dbeef29 Make inlay hint cache tests pass
Co-Authored-By: Conrad  <conrad.irwin@gmail.com>
2023-11-13 18:25:21 +02:00
Marshall Bowers b8beeaee43 Add Sized bound to StyledExt trait (#3309)
This PR moves the `Sized` bound to the `StyledExt` trait so we don't
have to repeat it on each of the methods.

Release Notes:

- N/A
2023-11-13 11:22:49 -05:00
Marshall Bowers 940cb582b5 Remove unnecessary map 2023-11-13 11:10:08 -05:00
Marshall Bowers 44f67a2763 Move Sized bound to StyledExt trait 2023-11-13 11:10:00 -05:00
Joseph T. Lyons 6f3ef27d85 Update jetbrains keymap to match community repo 2023-11-13 10:41:56 -05:00
Antonio Scandurra 5082646901 Clear all the state when clearing KeyDispatcher 2023-11-13 15:31:35 +01:00
Antonio Scandurra f021e72b06 Register actions on the right div 2023-11-13 15:21:47 +01:00
Antonio Scandurra dc3cc470a7 💄 2023-11-13 15:20:43 +01:00
Antonio Scandurra 3f59bc123f Clear pending keystrokes when finding action 2023-11-13 14:48:08 +01:00
Antonio Scandurra 3a05795b33 Capture node in dispatch tree even if it's not focusable 2023-11-13 14:42:16 +01:00
Antonio Scandurra 873be74687 Fix focus story 2023-11-13 14:35:49 +01:00
Kirill Bulatov 51941e36f2 Uncomment inlay hints logic and tests (#3307)
Tests compile, but do not pass due to todo!s in the platform code, hence
ignored for now.

Release Notes:

- N/A
2023-11-13 15:20:43 +02:00
Kirill Bulatov 1cfaaa7924 Ignore tests for now 2023-11-13 15:02:24 +02:00
Piotr Osiewicz dadb37be50 chore: Bump cc to 1.0.84 (#3304)
This resolves a minor issue where build scripts could've acquired more
job server tokens from Cargo than allowed by `-j` parameter. I've filled
a PR at https://github.com/rust-lang/cc-rs/pull/878 and we've iterated
on the design over there since.

TL;DR: some build scripts may complete a tad bit quicker, potentially
shaving off a few seconds off of debug/release builds. Full description
of the issue is available in
https://github.com/rust-lang/cc-rs/issues/858

Release Notes:

- N/A
2023-11-13 13:14:22 +01:00
Kirill Bulatov 6765223273 Uncomment all inlay hint cache code and tests 2023-11-13 14:07:48 +02:00
Kirill Bulatov 359613ad0e pane: When opening a buffer, actually scroll to the selected tab. (#3306)
Previously it might've reused a shared state.

Deals with https://github.com/zed-industries/community/issues/2262 also
fixes influencer's feedback.

No gpui2 port, due to 0 scrollable functionality in it yet.

Release Notes:

- Fixed tabs not being scrolled to on buffer (re)open
(https://github.com/zed-industries/community/issues/2262)
2023-11-13 13:21:26 +02:00
Kirill BulatovandPiotr dccdf1955c pane: When opening a buffer, actually scroll to the selected tab. Previously it might've reused a shared state.
Deals with https://github.com/zed-industries/community/issues/2262 also fixes influencer's feedback.

Co-Authored-By: Piotr <piotr@zed.dev>
2023-11-13 13:09:02 +02:00
Antonio ScandurraandThorsten 7c56355f10 Register key and action listeners using Interactive::initialize
Co-Authored-By: Thorsten <mrnugget@gmail.com>
2023-11-13 11:37:57 +01:00
Antonio ScandurraandThorsten ce5d3e2e73 Fix panic when calling with_key_dispatch recursively
Co-Authored-By: Thorsten <mrnugget@gmail.com>
2023-11-13 10:17:52 +01:00
Mikayla 99c75d2916 Poke at getting the project panel showing up 2023-11-12 23:22:02 -08:00
Nate Butler 5df63d3568 Theme elevation + Palette Style (#3305)
[[PR Description]]

Release Notes:

- N/A
2023-11-12 22:29:25 -05:00
Nate Butler 13a8138462 Update command palette style 2023-11-12 22:13:54 -05:00
Piotr Osiewicz c01ef1bdad chore: Bump cc to 1.0.84
This resolves a minor issue where build scripts could've acquired more job server tokens from Cargo than allowed by `-j` parameter. I've filled a PR at https://github.com/rust-lang/cc-rs/pull/878 and we've iterated on the design over there since.

TL;DR: some build scripts may complete a tad bit quicker, potentially shaving off a few seconds off of debug/release builds.
2023-11-12 21:28:02 +01:00
Nathan Sobo a3ec1048fd WIP 2023-11-10 14:47:45 -07:00
Nate ButlerandMarshall Bowers abf4debc13 Refactor command palette, picker and code action styles.
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-10 16:13:25 -05:00
Nate ButlerandMarshall Bowers 61fe4fdebd Add ui::Divider component
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-10 16:12:32 -05:00
Nate ButlerandMarshall Bowers 2725e39675 Add elevation to StyledExt
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-11-10 16:12:14 -05:00
Nathan SoboandAntonio Scandurra f5cc32c077 Add a DispatchTree which will replace the existing key dispatch strategy
Instead of freezing a stack, we will record the entire dispatch tree so we can
change focus.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-11-10 11:56:14 -07:00
Antonio Scandurra 2f0339e574 Wire up code actions in editor2 (#3302)
Release Notes:

- N/A
2023-11-10 16:47:09 +01:00