oak-team/oak-gpui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,389 Commits 1 Branch 0 Tags
8ced7ab00a79d642c4191fd56732d588564a8b6e
Commit Graph
469 Commits
Author SHA1 Message Date
Piotr Osiewicz 8ced7ab00a Merge branch 'main' into Z-1292/show_search_results_in_scrollbar 2023-07-06 11:43:44 +02:00
Nate Butler a7ce602bac Update collaboration sounds, add sounds to screensharing 2023-07-04 16:18:42 -04:00
Mikayla Maki d2127825e3 Add first-pass sound support to Zed 2023-07-03 13:30:04 -07:00
Joseph T. Lyons 4a654f5252 Fix bug preventing the assist command from working in certain keymaps 2023-06-30 13:27:48 -04:00
Kirill Bulatov 1ed52276e0 Add inlay hint settings 2023-06-29 22:25:49 +03:00
Mikayla Maki ce52d90a9d Collab UI v2 (#2618) 
This PR implements
https://www.figma.com/file/pLq7dvhx2mFeWFOedXpUQ5/Project-%E2%80%93-Collaboration-UI?type=design&node-id=666%3A8610&t=XFGk6KEtTCFXBvCQ-1

Release notes:
- [x] Redesigned collaboration UI
- [x] Added voice support
 2023-06-28 09:14:39 -07:00
Nathan SoboandAntonio Scandurra 8f8a99d788 Bind cmd-? to assistant::toggle_focus 
Bypass system help menu shortcut at the app delegate level to achieve this.

Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-06-28 11:43:24 +02:00
Nathan SoboandAntonio Scandurra f52d3ea5ef Clean up tooltips, create conversation on cmd-n 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2023-06-28 10:27:29 +02:00
Piotr Osiewicz 625814d30a Merge branch 'main' into collab-titlebar-2 2023-06-27 15:40:43 +02:00
Nathan Sobo 04d93dfbd9 vim: indent/outdent (#2644) 
Release Notes:

- vim: support indent/outdent
([#832](https://github.com/zed-industries/community/issues/832>)).
 2023-06-27 04:15:55 -06:00
Nathan Sobo fd3ee0ebd0 Vim toggle case (#2648) 
Release Notes:

- vim: Add ~ to toggle case
([#1410](https://github.com/zed-industries/community/issues/1410))
 2023-06-27 04:13:24 -06:00
Nathan Sobo 29b2639b4c Merge remote-tracking branch 'origin/main' into vim-indent 2023-06-27 12:09:47 +02:00
Nathan Sobo 16c23557b8 vim: Fix scrolling (#2647) 
After #2641 we noticed that scrolling didn't take a count parameter, and
a few other issues with the way that we calculated the distance to
scroll.
 
Release Notes:

- Improved distance calculations for page-up/page-down
- vim: Allow counts to work with scrolling shortcuts.
 2023-06-27 04:01:14 -06:00
Nathan Sobo 7294314ce7 vim: shortcuts for tab navigation (#2649) 
Release Notes:

- vim: added gt/ctrl-pagedown and gT/ctrl-pageup for tab navigation
 2023-06-27 03:57:01 -06:00
Nathan Sobo 0fd0b60bd6 vim: Fix code actions menu (#2650) 
Fixes: zed-industries/community#1690

I'm not sure this is the correct way to fix this...
* A simpler approach would be to just say `!showing_code_actions` in the
binding file (as `showing_completions` can only happen in insert mode -
and `VimControl` will be false). This seemed a little error prone if
more menus were added in the future.
* A more complicated approach would be to copy the way this is done from
the MouseContextMenu, which registers its own keyboard shortcuts, and as
such uses those when it's open. This seems "more correct", but is a
major refactoring for a very small reward.

Release Notes:

- vim: Fix code actions menu
([#1690](https://github.com/zed-industries/community/issues/1690))
 2023-06-27 03:56:08 -06:00
Conrad Irwin a1343f0d2c vim: Fix code actions menu 
Fixes: zed-industries/community#1690
 2023-06-26 21:46:06 -06:00
Conrad Irwin a9aa5e5196 vim: Add ~ to change case 
Fixes: zed-industries/community#1410
 2023-06-26 20:22:24 -06:00
Conrad Irwin 73920807a9 vim: shortcuts for tab navigation 2023-06-26 15:07:19 -06:00
Conrad Irwin 02fc5dd6c9 vim: Fix scrolling 
After #2641 we noticed that scrolling didn't take a count parameter.

The PageDown/PageUp logic was also broken by an additional -1 (for both
vim mode and not).
 2023-06-26 13:29:14 -06:00
Conrad Irwin c3e8cae20f vim: indent/outdent 
Fixes: zed-industries/community#832
 2023-06-26 10:08:34 -06:00
Antonio Scandurra 723c8b98b3 Show quote selection button 2023-06-26 17:24:31 +02:00
Antonio ScandurraandNathan Sobo edc7f30660 Add assistant icons to the toolbar 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-06-26 16:49:33 +02:00
Antonio Scandurra 00e37bc2a2 Merge remote-tracking branch 'origin/main' into save-conversations 2023-06-26 15:59:19 +02:00
Max Brunsfeld 030984dca4 Vim: substitute support (#2641) 
Release Notes:

- vim mode now supports `s` for substitute
 2023-06-23 12:58:14 -07:00
Antonio Scandurra 5ea5368c07 Re-enable buffer search in assistant 2023-06-23 09:57:31 +02:00
Antonio Scandurra 6f0efec146 Merge remote-tracking branch 'origin/main' into save-conversations 2023-06-23 09:09:42 +02:00
Conrad IrwinandNathan Sobo 16022e9c1a Add counts to subsitute (and all) 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-06-22 11:50:56 -06:00
Piotr Osiewicz f774dbfe2e Use new icons, delete old ones 2023-06-22 18:58:11 +02:00
Piotr Osiewicz 18c4d43ee7 Add deafen button 2023-06-22 18:51:26 +02:00
Nate Butler 1a0b2bfef8 Update stream control icons 2023-06-22 12:21:59 -04:00
Nate Butler 1079838443 Add mic and mic-mute icons 2023-06-22 12:00:42 -04:00
Nate Butler 05730afdf0 Add radix icons 
There are a lot of them, but they add less than 350kb to the app
 2023-06-22 11:58:51 -04:00
Piotr Osiewicz 1a55b687b0 Merge branch 'main' into collab-titlebar-2 2023-06-22 17:41:00 +02:00
Piotr Osiewicz b16b6dcec7 Render microphone toggle 2023-06-22 17:40:29 +02:00
Nathan Sobo ea5398a702 vim: binding fixes (#2637) 
Release Notes:

- In vim mode you can now use count modifiers with arrow keys (`5<down>`
will go down 5 lines).
- In vim mode `ctrl+]` and `ctrl+o` now work to go to definition and
back
 2023-06-22 06:44:12 -06:00
Nathan Sobo a75341db97 Move model and remaining tokens to assistant toolbar 2023-06-21 19:01:30 -06:00
Conrad Irwin e1f975e52e vim: Support s on selections and with multiple cursors 2023-06-21 15:44:19 -06:00
Conrad Irwin dcca98b5cc vim: Add basic 's' support 2023-06-21 15:06:34 -06:00
Conrad Irwin 0c40ed5d85 vim: ctrl+] and ctrl+o to jump to definition and back 
Equivalent to f12 and ctrl-- in non-vim mode.
 2023-06-21 14:34:35 -06:00
Conrad Irwin d6b1af6244 vim: Allow up/down/left/right in vim mode 
The user impact of this is to 5<down> to move 5 lines at a time.
 2023-06-21 14:20:39 -06:00
Nathan SoboandConrad Irwin a365b2f177 Add shift-J binding to Vim normal mode 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 11:58:31 -06:00
Nathan SoboandConrad Irwin cde8d7d747 Don't use test-only method; add ctrl-j binding 
Co-Authored-By: Conrad Irwin <conrad.irwin@gmail.com>
 2023-06-21 11:53:11 -06:00
Antonio Scandurra 9217224fa6 Finish renaming AssistantEditor to ConversationEditor 2023-06-21 09:00:26 +02:00
Nathan Sobo 3a61fd503f WIP: Trying to display the toolbar but tired. May be worth discarding this. 2023-06-20 20:11:37 -06:00
Nathan SoboandJulia Risley 23bc11f8b3 Remove the nested Pane from the assistant 
Since we don't want tabs, I think it would be better to render the toolbar
for ourselves directly and handle switching between conversations.

Co-Authored-By: Julia Risley <julia@zed.dev>
 2023-06-20 18:52:48 -06:00
Antonio Scandurra c83a918a7e Merge remote-tracking branch 'origin/main' into save-conversations 2023-06-20 18:16:40 +02:00
Joseph T. Lyons bb04d65b8e Add pane activation bindings for Atom keymap 2023-06-18 02:05:25 -04:00
Nathan Sobo 882009bc75 Save conversations to ~/.config/zed/conversations 
Still need to implement loading / listing.
I'd really be rather write operations to a database. Maybe we
should be auto-saving? Integrating with panes? I just did
the simple thing for now.
 2023-06-16 16:15:07 -06:00
Nathan Sobo 75b5ac8488 Cycle message roles on ctrl-r 2023-06-16 11:50:18 -06:00
Antonio Scandurra 21e8e8763e Allow splitting of messages using shift-enter 2023-06-15 14:05:26 +02:00