oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,674 Commits 1 Branch 0 Tags
7dbe0519ece2b472ef3ebeee348bb2bd268300a9
Commit Graph
12825 Commits
Author SHA1 Message Date
Piotr Osiewicz a6d713eb3d editor: Keep scrollbar up if there are selections 
Z-2556
 2023-07-10 17:44:27 +02:00
Piotr Osiewicz e00e73f608 branches: Add a modal branch list. 
Extract branch list into a separate vcs_menu crate akin to recent_projects.
Add current bind for a modal branch to branch popover's tooltip.

Z-2555
 2023-07-10 17:18:12 +02:00
Nate Butler 6739c31594 Update assistant styles (#2665) 
Updates the assistant with some style quality of life changes.

## Changes

Restyled the conversation list

<img width="646" alt="CleanShot 2023-07-10 at 10 25 23@2x"
src="https://github.com/zed-industries/zed/assets/1714999/5c9a4f94-11c1-4d28-8aac-4d38141829a9">

Updated the assistant header to be a bit more compact, and use a new tab
bar icon style. The existing tab bar icons will be updated in a later
PR.

<img width="646" alt="CleanShot 2023-07-10 at 10 26 30@2x"
src="https://github.com/zed-industries/zed/assets/1714999/3ef9a053-59fa-4d34-9b76-3bb2701acb33">

Updated the remaining token indicator to have 3 steps:
<img width="662" alt="CleanShot 2023-07-10 at 10 29 51@2x"
src="https://github.com/zed-industries/zed/assets/1714999/13d31545-5b00-427c-b7da-b4dfeac037d6">

Updated role labels, added a hover state to make it more clear these are
interactive
<img width="984" alt="CleanShot 2023-07-10 at 10 32 28@2x"
src="https://github.com/zed-industries/zed/assets/1714999/24748495-dde4-4ee9-98f1-6a082f0c1d4d">


Release Notes:

- Improved the UI of some elements in the Assistant panel.
 2023-07-10 10:54:20 -04:00
Piotr Osiewicz a75a7e2b1d Add tooltip to recent projects button (#2694) 
Z-2545

Release Notes:

- N/A
 2023-07-10 16:53:50 +02:00
Piotr Osiewicz 92a0a4e367 Add styles for branch create button 2023-07-10 16:51:18 +02:00
Nate Butler 4029481fd0 Merge branch 'main' into update-assistant-styles 2023-07-10 10:22:18 -04:00
KCaverly 0189742497 pulled treesitter parsing to own file for ease of testing and management 2023-07-10 10:06:07 -04:00
Piotr Osiewicz 3318896ad9 Display key bind of a modal project picker 2023-07-10 14:29:30 +02:00
Piotr Osiewicz 6c8cb6b2a9 project_search: display result count on cmd-enter 
It also focuses the first result (just like a normal enter).
 2023-07-10 14:21:55 +02:00
Piotr Osiewicz 6e24ded2bc collab_ui: Add tooltip to branches popover (#2695) 
Z-2554

Release Notes:

- N/A
 2023-07-10 14:20:12 +02:00
Conrad Irwin b4b0f622de Rebuild vim search experience on refactored code 2023-07-07 15:57:54 -06:00
Conrad IrwinandAntonio 232d14a3ae Make search less magic 
Co-Authored-By: Antonio <antonio@zed.dev>
 2023-07-07 15:57:54 -06:00
Conrad Irwin dea728a7e5 Better waiting in tests 2023-07-07 15:57:54 -06:00
Conrad Irwin 6cf13c62d1 vim: ? to search backwards, and /<enter> to repeat search 2023-07-07 15:57:52 -06:00
Conrad Irwin dbec2ed1f1 vim: add */#/g*/g# for jumping to next word 
As in vim, this toggles the normal search experience.
 2023-07-07 15:57:35 -06:00
Conrad Irwin 96ce0bb783 vim: Enter/n/N to navigate search results 2023-07-07 15:57:14 -06:00
Conrad Irwin 2ffce24ef0 vim: Don't enter visual mode in search/go to definition 
Fixes: zed-industries/community#1514
Contributes: zed-industries/community#1284
 2023-07-07 15:56:37 -06:00
Conrad Irwin 75fe77c11d search: Allow running a search with different options 
Refactor search options to use bitflags so that we can represent
the entire set of settings in one place.
 2023-07-07 15:56:37 -06:00
Conrad Irwin 20d8a2a1ec vim: indent in visual mode uses only one < 
Fixes: zed-industries/community#1562
 2023-07-07 15:56:35 -06:00
Conrad Irwin 460bf93866 vim: { } to navigate by paragraph (#2668) 
As part of this I added `assert_shared_state()` to the
NeovimBackedTestContext so that it is more like a drop-in replacement
for the VimTestContext.

The remaining part of zed-industries/community#682 is adding bracket
matching to plain text. It looks like the current logic requires there
to be a tree sitter language for the language in order to support
bracket matching. I didn't fix this in this PR because I was unsure
whether to try and work around that, or to try and add a plain text tree
sitter language.

Release Notes:

- vim: support `{` and `}` for paragraph motion
([#470](https://github.com/zed-industries/community/issues/470)).
- vim: fix `%` at the end of the line
([#682](https://github.com/zed-industries/community/issues/682)).
 2023-07-07 14:59:06 -06:00
Conrad Irwin 362023ccf2 vim: keymap tweaks (#2674) 
A few small tweaks to fix some of the community issues

Release Notes:

- vim: Fix `escape` in command palette
([#1347](https://github.com/zed-industries/community/issues/1347)).
- vim: Allow `^` as a motion in actions
([#856](https://github.com/zed-industries/community/issues/856)).
- vim: Allow `ctrl-c` to exit visual mode
([#1447](https://github.com/zed-industries/community/issues/1447)).
 2023-07-07 14:58:01 -06:00
KCaverly 3f5667b101 merged main 2023-07-07 14:24:29 -04:00
Julia caa29d57c2 Avoid checking for duplicate instance when local DB is disabled 2023-07-07 14:20:39 -04:00
Julia b70b76029e Use different port and handshake for different release channels 2023-07-07 14:20:39 -04:00
Julia 66bf56fc4f Prevent duplicate instances by coordinating via a socket 2023-07-07 14:19:44 -04:00
Piotr Osiewicz 4a69c71167 fixup! vcs: Add 'create branch' button 2023-07-07 18:37:53 +02:00
Piotr Osiewicz cb24cb1ea5 vcs: Add 'create branch' button 2023-07-07 18:36:55 +02:00
Piotr Osiewicz d69b07bafd Add tooltip to recent projects button 
Z-2545
 2023-07-07 16:30:19 +02:00
Piotr Osiewicz abf3b4a54e chore: Replace lazy_static Mutex with const. (#2693) 
Mutex::new() is const-stable as of Rust 1.63.

Release Notes:
- N/A
 2023-07-07 15:07:12 +02:00
Antonio Scandurra 318deed25b Skip key down event if preceded by its key equivalent version 
Previously, we would only track whether the previous key down event
was a key equivalent. However, this could cause issues when pressing
certain keystrokes in rapid succession, e.g.:

- Pressing `shift-right` (to select a character)
- Pressing a character (with or without `shift` held down)

This would cause GPUI to ignore the second event because it was
preceded by a key equivalent event. With this commit, we track the
last key equivalent event, and skip the key down event only if it
matches the last key equivalent event.
 2023-07-07 12:02:08 +02:00
KCaverly c03dda1a0c fixed bug on absolute vs relative path 2023-07-06 17:15:41 -04:00
KCaverly 6f1e988cb9 updated embedding treesitter query for python 2023-07-06 16:36:28 -04:00
KCaverly 7d634f66e2 updated vector_store to include extra context for semantic search modal 2023-07-06 16:33:54 -04:00
Kirill Bulatov e6ec0af743 Remove redundant hint kind checks in tests 2023-07-06 23:27:25 +03:00
Kirill Bulatov fff65968bf Restart LSP server on initialization options change 2023-07-06 23:27:22 +03:00
KCaverly e57f6f21fe reindexing update to appropriately accomodate for buffer delay and persistent pending files list 2023-07-06 15:26:43 -04:00
Piotr Osiewicz 3ca0170264 Z 1332/show search results in scrollbar (#2687) 
This PR adds highlighting of search results to the scrollbar.

Release Notes:

- Added highlighting of search results to the scrollbar.
 2023-07-06 19:28:21 +02:00
KCaverly a86b6c42c7 corrected batching order and managed for open ai embedding errors 2023-07-06 11:11:39 -04:00
Antonio Scandurra b4ed0347b4 Filter out non-json files when loading conversations (#2688) 
Fixes
https://linear.app/zed-industries/issue/Z-2540/filter-out-non-conversation-files-from-the-assistant-history
 2023-07-06 16:51:52 +02:00
Kirill Bulatov 11ae99fbd6 Add a test 2023-07-06 17:16:34 +03:00
Antonio Scandurra 708852aa00 Clip left when finding preceding (line) boundary 
This fixes an issue that was causing `alt-left` to not move the cursor
when it was located right after an inlay hint with a `Left` bias.
 2023-07-06 16:25:27 +03:00
Antonio Scandurra 5408275c7a Filter out non-json files when loading conversations 2023-07-06 14:38:05 +02:00
Piotr Osiewicz 3e245fec90 Save a flushing line instead of discarding it 2023-07-06 13:52:03 +02:00
Piotr Osiewicz 5e7d9dc718 Add hunk merging 2023-07-06 13:31:45 +02:00
Piotr Osiewicz b66453e771 fixup! Do not render multiple hunks for the same line 2023-07-06 12:11:08 +02:00
Kirill Bulatov 0b0a161626 Show inlay hints on startup for every language server with work events 
Language servers such as typescript-language-servers report a single
work event, ending right after server's startup.

Other servers might send more similar event, also during startup.
The rest of the events are diagnostic-related and we filter them out.

React on such events with /refresh-like hint update, that will check
only the visible part of the editor for hints and might be replaced by
other /refresh requests, if needed.
 2023-07-06 13:10:59 +03:00
Piotr Osiewicz 492b849ea1 Do not render multiple hunks for the same line 2023-07-06 12:09:33 +02:00
Piotr Osiewicz 8ced7ab00a Merge branch 'main' into Z-1292/show_search_results_in_scrollbar 2023-07-06 11:43:44 +02:00
Kirill Bulatov c298cf7527 Use less padding for typescript parameter hints (#2684) 
Part of https://linear.app/zed-industries/issue/Z-2537/inlay-hint-issues

Release Notes:

- N/A
 2023-07-06 11:23:20 +03:00
Kirill Bulatov 1936bdebb3 Use less padding for typescript parameter hints 2023-07-06 11:16:39 +03:00