Commit Graph
134 Commits
Author SHA1 Message Date
Antonio Scandurra cf934ab696 Fix compile errors 2023-06-02 10:08:06 +02:00
Antonio Scandurra 20e65a533c Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-02 09:32:11 +02:00
Mikayla Makiandmax 1a23fe91b4 WIP: Remove focus side effects from toggle dock commands
co-authored-by: max <max@zed.dev>
2023-05-30 12:00:15 -07:00
Antonio Scandurra 69e8a166e4 Start on assistant::QuoteSelection 2023-05-30 15:25:53 +02:00
Nathan Sobo 8f6e67f440 Cancel assists on escape 2023-05-26 14:49:27 -06:00
Nathan SoboandAntonio Scandurra 80080a43e4 Start on an assistant panel based on multi-buffers
Each message is represented as a multibuffer excerpt to allow for
fluid editing of the conversation transcript.

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-05-26 10:09:55 -06:00
Nathan Sobo 747322a02d Merge remote-tracking branch 'origin/main' into zmd 2023-05-24 11:04:07 -06:00
Antonio Scandurra 35f9996a4f WIP 2023-05-24 18:45:47 +02:00
Antonio ScandurraandNathan Sobo 50cfe5eec3 Use cmd-b/cmd-r/cmd-j to toggle left/right/bottom dock and focus when opening
Also, bind the same keys with shift to toggle the dock without focusing.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-05-24 15:59:06 +02:00
Antonio Scandurra 208ff2fba7 Merge remote-tracking branch 'origin/main' into panels 2023-05-23 08:24:28 +02:00
Nathan Sobo 234dbc3ca9 WIP 2023-05-23 00:16:44 -06:00
Julia 7190840081 Add paragraph based vertical movements 2023-05-22 09:12:36 -04:00
Antonio Scandurra 146809eef0 Merge branch 'main' into panels 2023-05-22 14:10:17 +02:00
Antonio Scandurra 2098ac2c77 Fix formatting for keymap.json 2023-05-22 10:41:48 +02:00
Antonio ScandurraandMikayla Maki f097444546 Rebind ctrl-` to toggle terminal panel focus
Also, add `ctrl-~` to create new terminals.

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-05-17 17:35:10 +02:00
Antonio Scandurra adf361b374 Implement zooming for panes and docks 2023-05-16 11:49:48 +02:00
Kirill BulatovandAntonio 18e0ee44a6 Remove redundant scopes and actions to fix the focus toggle on ESC
co-authored-by: Antonio <antonio@zed.dev>
2023-05-15 13:10:15 +03:00
Nathan Sobo ba50b35de6 wip 2023-05-13 14:34:09 -06:00
Antonio Scandurra cdcb7c8084 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00
Kirill BulatovandJulia 0e31d13a1e Rework tab and escape key handling in search panel
Fixes
https://linear.app/zed-industries/issue/Z-1238/focus-the-results-multibuffer-in-project-search-on-esc

and adds a tab shortcut for project search inputs

co-authored-by: Julia <julia@zed.dev>
2023-05-10 11:11:31 +03:00
Nathan Sobo 03f8c1206a Rename Sidebar to Dock 2023-05-09 10:18:10 +02:00
Nathan Sobo 1919a826f9 Remove dock from workspace 2023-05-09 10:18:10 +02:00
Petros Amoiridis eca93c124a Apply the tab_size change to keymaps and settings 2023-04-20 14:08:30 +03:00
Mikayla Maki dd73233973 Merge pull request #2386 from zed-industries/copilot-shipping
Get copilot ready to ship
2023-04-20 12:38:27 +12:00
Mikayla Maki ea1c3fa7a0 Only fire completion cycling requests if specifically asked for by the user 2023-04-19 15:21:30 -07:00
Petros AmoiridisandJulia f9c60b98c0 Add newline above and improve newline below
Add a new action for inserting a new line above the current line. @ForLoveOfCats  also helped fix a bug among other things. When two collaborators had their cursors at the end of a line, and one collaborator performed a newline below action, the second collaborator's cursor would be dragged to the new line. This is also fixing that.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-04-19 19:57:23 +03:00
Joseph Lyons 5e55eb279c Update copy path commands 2023-04-07 02:36:56 -04:00
Mikayla Maki 1627cf7eae Add standard copilot keybinding 2023-04-03 16:14:07 -07:00
Mikayla Maki 48d9c30b0e Remove per-file copilot enable/disable 2023-04-03 15:15:42 -07:00
Mikayla Maki ebd06b43f5 Add copilot settings
Add copilot pause / resume
Add copilot statusbar item stub
2023-03-29 16:40:52 -07:00
Antonio Scandurra 093e0a30e9 Replace editor::CycleCopilotSuggestions with copilot::NextSuggestion 2023-03-28 09:42:01 -07:00
Joseph Lyons 90bca1b94a Add default keybindings for reveal in finder 2023-03-12 04:58:17 -04:00
Antonio ScandurraandNathan Sobo ce828d55d5 Bind language_selector::Toggle to cmd-k m
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-03-10 16:32:18 +01:00
Mikayla Maki 350b7b82f7 Merge pull request #2207 from zed-industries/project-panel-actions
Fix project panel actions
2023-02-23 14:31:29 -08:00
Mikayla Maki 8860346324 Fix broken dock command 2023-02-23 14:15:29 -08:00
Mikayla Maki 9004640586 Convert keymap context to use generics and Cow<'static> so we don't have to add .to_string() and .into() for each usage 2023-02-23 14:10:55 -08:00
Kay Simmons 03498314fa Merge pull request #2211 from zed-industries/hover-binding
add hover binding from vscode
2023-02-23 14:05:28 -08:00
Kay Simmons ce4b672a14 add hover binding from vscode 2023-02-23 13:50:43 -08:00
Mikayla Maki f6601f64e5 Added editor-in-project-panel overrides to the default keymap 2023-02-23 09:36:30 -08:00
Max BrunsfeldandJoseph Lyons d33d27faa4 Fix ToggleContactsMenu action name in keymap
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2023-02-22 14:17:59 -08:00
Kay Simmons 04df00b221 Iterate over keymap then dispatch path when matching keybindings to make precedence more intuitive
Rename action which adds the active tab to the dock to be more intuitive
Add action which moves the active tab out of the dock and bind it to the same keybinding
2023-02-18 13:10:01 -08:00
Joseph T. Lyons a4a179763a Merge pull request #2171 from zed-industries/add-option-to-advance-cursor-downward-when-toggling-comment
Add option to advance cursor downward when toggling comment
2023-02-16 15:03:38 -05:00
Max Brunsfeld 7037842bef Put back shift-escape binding for FocusDock action 2023-02-15 13:57:07 -08:00
Joseph LyonsandJulia 5fbc9736e5 Add option to advance cursor downward when toggling comment
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-02-15 14:00:49 -05:00
Antonio Scandurra 4a2b7e4820 Use alt-z to toggle soft wrap in active editor
When there isn't a default soft-wrapping for the active editor, we
will soft wrap at the editor width. This is consistent with Visual
Studio Code.
2023-02-14 15:16:06 +01:00
Joseph Lyons d42d495cb0 Remove toggle right sidebar command 2023-02-11 21:53:10 -05:00
Mikayla Maki ca2e0256e1 Renamed open recent action to match menu 2023-01-27 15:38:48 -08:00
Max Brunsfeld 3312a06368 Move focus back from buffer search using tab, not cmd-f 2023-01-16 16:01:15 -08:00
Joseph Lyons 60f29410ca Add close clean items command 2022-12-29 13:28:52 -05:00
Joseph Lyons ca3c4566dd Add close all items command 2022-12-29 01:43:49 -05:00