Commit Graph
2855 Commits
Author SHA1 Message Date
Antonio Scandurra e2a0dd6ccf Allow saving the OpenAI API key in the assistant panel 2023-06-02 11:38:02 +02:00
Antonio Scandurra 5f5cbb5700 Allow moving the assistant panel to other docks 2023-06-02 10:55:19 +02:00
Antonio Scandurra 83542684d5 Fix compile errors 2023-06-02 10:08:06 +02:00
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
Antonio Scandurra d987c468f8 Merge remote-tracking branch 'origin/main' into assistant-2 2023-05-30 15:11:06 +02:00
Nathan Sobo e49775c401 Fix annoying system prompt
I was having fun, but it was too much. It makes the assistant too annoying to be useful.
2023-05-29 21:47:59 -06: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
Kirill Bulatov bf53e1aa01 Allow to disable the new feature 2023-05-25 09:45:50 +03: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
Nathan Sobo 9918b9bed2 WIP 2023-05-24 10:26:14 -06:00
Nathan Sobo 6c05d378e1 WIP 2023-05-24 09:12:16 -06: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
Nathan Sobo 50cde5ee41 WIP 2023-05-23 18:04:33 -06:00
Nathan Sobo ffc94fa07a WIP 2023-05-23 15:25:34 -06:00
Nathan Sobo 5b165a609c WIP 2023-05-23 08:52:21 -06:00
Nathan Sobo cc2cac108a WIP 2023-05-23 01:23:01 -06: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
Mikayla Maki b9317166d5 Add initial project panel settings 2023-05-22 20:23:07 -07:00
Mikayla Maki 430d0ad098 Switch back to 2023-05-22 12:16:47 -07:00
Mikayla Maki 571b6ba990 Adjust scrollbar settings to be expandable 2023-05-22 12:12:56 -07: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
Max Brunsfeld 7fbdbffbbc Merge branch 'main' into setting-store 2023-05-17 14:56:35 -07:00
Mikayla Maki 4901d96e9e Add never option to scrollbar settings 2023-05-17 14:19:35 -07:00
Mikayla Maki 9d15fa8ab1 Add scrollbars setting 2023-05-17 14:09:26 -07:00
Max Brunsfeld 460d6d652a Define base keymap setting in welcome crate 2023-05-17 11:23:09 -07: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
Nathan Sobo f2984b5cc2 Make panels independently resizable 2023-05-12 09:44:14 -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 SoboandJoseph Lyons 5b8332da51 Allow the project panel to be docked right or left
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
2023-05-09 17:26:54 -06: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 3045e18d75 Introduce a version control branch icon 2023-05-08 14:33:58 -07:00
Kirill Bulatov 9f008a5a69 Use more convntional name for the settings 2023-05-08 19:36:51 +03:00
Kirill Bulatov e3ff9ad822 Support invisibles in the selection 2023-05-08 19:36:51 +03:00
Kirill Bulatov 23ef5d3f14 Make invisibles display configurable 2023-05-08 19:36:51 +03:00
Max Brunsfeld 1486f1e91a Add copilot.disabled_globs setting 2023-05-01 13:45:47 -07:00
Petros Amoiridis 812c3bd193 Add newline shortcuts for popular editors 2023-04-21 18:29:35 +03:00