Commit Graph
39175 Commits
Author SHA1 Message Date
Piotr Osiewicz cbebdc2935 Fix up warnings, bind 'Done' button to DismissEvent 2024-01-05 16:32:47 +01:00
Piotr Osiewicz c13076a187 Convert copilot popup to modal 2024-01-05 16:27:52 +01:00
Antonio Scandurra a80c37f8e4 Avoid leaking TerminalPanel, which would in turn leak Project (#3908)
Release Notes:

- Fixed a leak that would prevent projects from being automatically
unshared or left when closing the corresponding window.
2024-01-05 16:10:08 +01:00
Piotr Osiewicz 9cecfd81c5 Move UI for copilot sign in to copilot_button 2024-01-05 15:58:45 +01:00
Antonio Scandurra 4e7288df54 Avoid leaking TerminalPanel, which would in turn leak Project 2024-01-05 15:54:23 +01:00
Kirill Bulatov 21659e89fc Return back git status colors for tab labels (#3906) 2024-01-05 13:52:51 +02:00
Piotr Osiewicz acc0657060 gpui: Use async-task 4.7 2024-01-05 11:42:28 +01:00
Kirill Bulatov fc0cf5f985 Return back git status colors for tab labels 2024-01-05 12:38:42 +02:00
Antonio Scandurra e30831fdc7 Don't shift pane content when following someone (#3905)
Release Notes:

- Fixed a bug that would shrink the pane when following someone.
2024-01-05 11:01:23 +01:00
Antonio Scandurra fbbe29b343 Don't shift pane content when following someone 2024-01-05 10:55:33 +01:00
Kirill Bulatov d28839fca3 Return back old project search behavior as default. (#3892)
Add a `workspace::DeploySearch` action and use it as a default for
"cmd-shift-f" binding. This action opens existing search tab if it
exists, or creates a new one otherwise. `workspace::NewSearch` action is
still available and always opens an existing search tab.

Release Notes:

- Added a `workspace::DeploySearch` action and use it as a default for
"cmd-shift-f" binding. `workspace::NewSearch` action is still available
and always opens an existing search tab.
2024-01-05 11:35:28 +02:00
Nate Butler 8aa641b53e WIP - Start on Copilot Modal 2024-01-05 00:51:03 -05:00
Nate Butler e984a2ec32 Add Headline component 2024-01-05 00:40:08 -05:00
Conrad Irwin cc9376aa28 Improve deactivate simulation 2024-01-04 22:06:52 -07:00
Conrad Irwin 6217d66889 Remove un-needed change 2024-01-04 22:06:12 -07:00
Conrad Irwin 7f3c02c4a9 Fix more tests broken by timing change 2024-01-04 21:34:56 -07:00
Conrad Irwin 8213abbd01 Add LeakDetector for gpui2 (#3903)
Needed for debugging some fun following tests
2024-01-04 21:31:37 -07:00
Conrad IrwinandJulia 68b4e31587 Add LeakDetector for gpui2
Co-Authored-By: Julia <julia@zed.dev>
2024-01-04 20:29:44 -07:00
Conrad Irwin 2810575c2e Uncomment editor tests (#3896)
Co-Authored-By: Julia <julia@zed.dev>

[[PR Description]]

Release Notes:

- (Added|Fixed|Improved) ...
([#<public_issue_number_if_exists>](https://github.com/zed-industries/community/issues/<public_issue_number_if_exists>)).
2024-01-04 20:00:04 -07:00
Conrad Irwin 3364b9508e Fixy fix 2024-01-04 19:43:12 -07:00
Julia 0cecda5fd0 Moar terminal bugs de2ified (#3894)
Release Notes:

- N/A
2024-01-04 18:40:55 -05:00
Max Brunsfeld db55b5991d Fix accidental load of default keymap *after* loading user keymap (#3901) 2024-01-04 15:37:04 -08:00
Max Brunsfeld a184a3e54b Fix terminal selection when cursor leaves terminal bounds (#3898)
Previously, terminal mouse selection didn't work when the cursor moved
outside the bounds of the terminal, which made it difficult to select
large amounts of text in the terminal.
2024-01-04 15:32:53 -08:00
e5ecac7b31 Fix accidental load of default keymap *after* loading user keymap
Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Marshall <marshall@zed.dev>
2024-01-04 15:31:00 -08:00
Piotr Osiewicz add5816df8 Move Registrar implementation for Workspace to outer scope.
This fixes various actions like "Activate regex mode" that were dispatched onto main pane instead of assistant search bar.
2024-01-05 00:10:23 +01:00
Piotr Osiewicz 727d9588d8 Add DivRegistrar to reduce code duplication 2024-01-05 00:10:23 +01:00
Piotr Osiewicz 3d98797c02 Use Registrar in Assistant Panel.
This fixes various actions like "Activate regex mode" that were dispatched onto main pane instead of assistant search bar.
2024-01-05 00:10:23 +01:00
Piotr Osiewicz 3bf591232a Touchups to registrar API 2024-01-05 00:10:23 +01:00
Piotr Osiewicz 162f036d4a Explore registrar-based API for search bar.
This commit adds a Registrar trait for use by search crate. Registrar can register actions on some target and search can utilize that trait to opaquely add actions on that target.
Notably, search is now opt-in (it always was in zed2 actually). Having editor doesn't make it searchable straight out of the gate. You might have to call BufferSearchBar::new a bunch more.
2024-01-05 00:10:23 +01:00
Piotr Osiewicz b02b19b781 fixup! terminal/search: Partially fix search in terminal. There are two issues with search in terminal as is: - terminal's pane is not registered as a "legit" pane, so we dispatch buffer search bar::Deploy on the most recent "legit" pane. By legit I mean that workspace::active_pane will *never* return terminal pane as active. - We've had the implementation of as_searchable commented out. Duh! 2024-01-05 00:10:23 +01:00
Piotr Osiewicz aefdd93180 terminal/search: Partially fix search in terminal.
There are two issues with search in terminal as is:
- terminal's pane is not registered as a "legit" pane, so we dispatch buffer search bar::Deploy on the most recent "legit" pane. By legit I mean that
  workspace::active_pane will *never* return terminal pane as active.
- We've had the implementation of as_searchable commented out. Duh!

This commit fixes second issue. That means that if you drag the terminal over to the main editor pane (so that it's in a "legit" pane), it'll work. 1st issue still stands though.
2024-01-05 00:10:23 +01:00
Marshall Bowers 1a82489647 Iterate on collab panel filter input style (#3900)
This PR takes another pass at the collab panel filter input to improve
its styling.

Release Notes:

- Improved the look of the filter input in the collab panel.
2024-01-04 18:08:28 -05:00
Max BrunsfeldandMikayla 456a7341db Fix inconsistent selection start when dragging outside of terminal bounds
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-04 15:05:39 -08:00
Max BrunsfeldandMikayla 709da9ab71 Fix incorrect placement of terminal selection when dragging
Co-authored-by: Mikayla <mikayla@zed.dev>
2024-01-04 14:55:45 -08:00
Marshall Bowers bb83c02d12 Remove unneeded branches 2024-01-04 17:35:18 -05:00
Joseph T. Lyons 7b243d3826 Remove outdated TODO 2024-01-04 17:32:00 -05:00
Marshall Bowers 121882fc6a Merge branch 'main' into collab-titlebar-fixes 2024-01-04 17:31:58 -05:00
Joseph T. Lyons 6cc2e82fe1 Remove outdated TODOs 2024-01-04 17:28:07 -05:00
Marshall Bowers d08ddcff42 Fix label color for inactive tabs (#3899)
This PR fixes an issue where certain tabs were not using the correct
color for their labels when they were inactive.

Release Notes:

- Fixed an issue where some inactive tabs were not using the correct
label color.
2024-01-04 17:25:11 -05:00
Marshall Bowers 55d36fd7ec Render an empty placeholder when not showing file icons in the project panel (#3897)
This PR makes it so when we're not showing file icons in the project
panel we render an empty placeholder instead of nothing.

This prevents the indentation of the items in the file tree from
changing based on the presence of the icon.

Release Notes:

- Fixed layout shift when `project_panel.file_icons` is set to `false`.
2024-01-04 17:10:08 -05:00
Max Brunsfeld b8fa28fc0a Fix terminal selection when cursor leaves terminal bounds 2024-01-04 14:08:18 -08:00
Max BrunsfeldandMarshall 7ae7f15800 Fix some bugs in keymap handling (#3895)
- `base_keymap` setting was not respected, now it is
- without a `~/.config/zed/keymap.json` file, we would fail to load the
*default* keymap

Co-authored-by: Marshall <marshall@zed.dev>
2024-01-04 16:04:17 -05:00
Conrad IrwinandJulia 12e2b2b10e Uncomment editor tests
Co-Authored-By: Julia <julia@zed.dev>
2024-01-04 13:58:19 -07:00
JuliaandConrad Irwin 7d12232a4d Unbork test relying on old keystroke behavior
Previously it would both send the keydown *and then* the action, now
it send the action, and then because there was an action, does not send
the keydown

Co-Authored-By: Conrad Irwin <conrad@zed.dev>
2024-01-04 15:07:46 -05:00
Marshall Bowers 87497797b6 Fix font resolution for UI text so we render with the fallback font (#3893)
This PR updates the font resolution for shaped text to use the new
`resolve_font` method on the text system.

This makes it so we use the fallback font if the desired font cannot be
found rather than rendering nothing.

Release Notes:

- Fixed an issue where nothing would render when the font set in
`ui_font_family` was not found.
2024-01-04 14:26:08 -05:00
Conrad Irwin 271e27a922 Tidy up guest count 2024-01-04 12:22:45 -07:00
Kirill Bulatov a5a9292c76 Return back old project search behavior as default.
Add a `workspace::DeploySearch` action and use it as a default for "cmd-shift-f" binding.
This action opens existing search tab if it exists, or creates a new one otherwise.
`workspace::NewSearch` action is still available and always opens an existing search tab.
2024-01-04 21:17:24 +02:00
Marshall Bowers e3286a8d35 Try to load fallback fonts instead of panicking when a font is not found (#3891)
This PR adjusts our font resolution code to attempt to use a fallback
font if the specified font cannot be found.

Right now our fallback font stack is `Zed Mono`, followed by `Helvetica`
(in practice we should always be able to resolve `Zed Mono` since we
bundle it with the app).

In the future we'll want to surface the ability to set the fallback font
stack from GPUI consumers, and potentially even support specifying font
stacks in the user settings (as opposed to a single font family).

Release Notes:

- Fixed a panic when trying to load a font that could not be found.
2024-01-04 14:10:46 -05:00
Julia 59aaa048b1 Attempt to run keystroke actions before attempting key listeners 2024-01-04 14:01:01 -05:00
Conrad Irwin 2cf11423a3 Tidy up branch 2024-01-04 11:55:14 -07:00