Commit Graph
1280 Commits
Author SHA1 Message Date
Antonio Scandurra 58959e4179 Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-02 09:32:11 +02:00
Mikayla Makiandmax cb43881260 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 a81821a2fe Start on assistant::QuoteSelection 2023-05-30 15:25:53 +02:00
Nathan Sobo e59a6313cc Cancel assists on escape 2023-05-26 14:49:27 -06:00
Nathan SoboandAntonio Scandurra 9e19d9cd3b 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 0d72a3bec6 Merge remote-tracking branch 'origin/main' into zmd 2023-05-24 11:04:07 -06:00
Antonio Scandurra a3f820017e WIP 2023-05-24 18:45:47 +02:00
Antonio ScandurraandNathan Sobo 57eb51fb3d 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 dee6f22ca2 Merge remote-tracking branch 'origin/main' into panels 2023-05-23 08:24:28 +02:00
Nathan Sobo e10499e163 WIP 2023-05-23 00:16:44 -06:00
Julia 36ab9cb62e Add paragraph based vertical movements 2023-05-22 09:12:36 -04:00
Antonio Scandurra 8f56c80d68 Merge branch 'main' into panels 2023-05-22 14:10:17 +02:00
Antonio Scandurra e6585d4083 Fix formatting for keymap.json 2023-05-22 10:41:48 +02:00
Antonio ScandurraandMikayla Maki 7105ecbb5b 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
Kirill Bulatov 7f1fa93d00 Merge pull request #2470 from zed-industries/kb/fix-project-search-esc
In project search on ESC, reduce multiple carets to one first
2023-05-16 15:16:34 +03:00
Antonio Scandurra fafe7a193b Implement zooming for panes and docks 2023-05-16 11:49:48 +02:00
Joseph Lyons 0fa5245426 Update jetbrains keymap 2023-05-15 14:12:02 -04:00
Kirill BulatovandAntonio 36e4876e07 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 4d44ed41ce wip 2023-05-13 14:34:09 -06:00
Antonio Scandurra f1363f8f70 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00
Kirill BulatovandJulia 75ff55bad5 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 a978561ff7 Rename Sidebar to Dock 2023-05-09 10:18:10 +02:00
Nathan Sobo e7d9fdc4b5 Remove dock from workspace 2023-05-09 10:18:10 +02:00
Petros Amoiridis 812c3bd193 Add newline shortcuts for popular editors 2023-04-21 18:29:35 +03:00
Petros Amoiridis 4c1be53252 Apply the tab_size change to keymaps and settings 2023-04-20 14:08:30 +03:00
Mikayla Maki b1334525ad Merge pull request #2386 from zed-industries/copilot-shipping
Get copilot ready to ship
2023-04-20 12:38:27 +12:00
Mikayla Maki bcc60773a8 Only fire completion cycling requests if specifically asked for by the user 2023-04-19 15:21:30 -07:00
Petros AmoiridisandJulia 25c3c42740 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 6614f8f635 Update copy path commands 2023-04-07 02:36:56 -04:00
Mikayla Maki 90669f1882 Add standard copilot keybinding 2023-04-03 16:14:07 -07:00
Mikayla Maki 49ecb56c52 Remove per-file copilot enable/disable 2023-04-03 15:15:42 -07:00
Mikayla Maki 900232a2cd Add copilot settings
Add copilot pause / resume
Add copilot statusbar item stub
2023-03-29 16:40:52 -07:00
Antonio Scandurra 97dfcfe905 Replace editor::CycleCopilotSuggestions with copilot::NextSuggestion 2023-03-28 09:42:01 -07:00
Joseph Lyons b49f7b472b Swap atom keybinding for CollapseSelectedEntry
This is a temporary solution to this bug:

https://linear.app/zed-industries/issue/Z-340/the-project-panel-shouldnt-be-listening-to-key-commands-when-editing-a
2023-03-16 15:59:14 -04:00
Antonio Scandurra bb4ee21481 Merge pull request #2272 from zed-industries/add-textmate-keymap
Add TextMate keymap
2023-03-13 14:26:32 +01:00
Joseph Lyons 77a483c2a7 Add TextMate keymap 2023-03-13 08:27:04 -04:00
Joseph Lyons fd337e4139 Add default keybindings for reveal in finder 2023-03-12 04:58:17 -04:00
Mikayla Maki ccf4c95ae3 Merge pull request #2199 from zed-industries/welcome-experience
Welcome experience
2023-03-10 10:48:30 -08:00
Antonio ScandurraandNathan Sobo ee26504d83 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 MakiandNathan ebe12e92a6 Add base keymap setting
Format all files

Co-Authored-by: Nathan <nathan@zed.dev>
2023-03-07 12:19:51 -08:00
Kay Simmons 07b2eac2a6 add go to definition binding to vim normal mode 2023-02-27 10:23:30 -08:00
Mikayla Maki 1cbe0990e4 Merge pull request #2207 from zed-industries/project-panel-actions
Fix project panel actions
2023-02-23 14:31:29 -08:00
Mikayla Maki 70f0950c9a Fix broken dock command 2023-02-23 14:15:29 -08:00
Mikayla Maki 730ea83ee0 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 62e09b83a2 Merge pull request #2211 from zed-industries/hover-binding
add hover binding from vscode
2023-02-23 14:05:28 -08:00
Kay Simmons cbe703a44b add hover binding from vscode 2023-02-23 13:50:43 -08:00
Kay Simmons 04777cf816 Merge pull request #2210 from zed-industries/fix-enter-vim-normal-mode
Fix enter in normal mode acting incorrectly
2023-02-23 13:46:15 -08:00
Kay Simmons 24a448f00c Fix enter in normal mode acting incorrectly 2023-02-23 13:40:31 -08:00
Mikayla Maki 4a94bb187d Added editor-in-project-panel overrides to the default keymap 2023-02-23 09:36:30 -08:00
Max BrunsfeldandJoseph Lyons f95c7a1a06 Fix ToggleContactsMenu action name in keymap
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2023-02-22 14:17:59 -08:00