oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,010 Commits 1 Branch 0 Tags
235470bbfda3deac657b0f2bcfcdb87f3ae78981
Commit Graph
9010 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antonio Scandurra 235470bbfd Merge pull request #2451 from zed-industries/kb/extra-deps 
Remove unused dependencies
 2023-05-08 14:46:27 +02:00
Kirill Bulatov 6cb0bc89d2 Remove unused dependencies 2023-05-07 21:07:55 +03:00
Antonio Scandurra 0296974ab1 Merge pull request #2441 from zed-industries/implicit-ancestry 
Determine view ancestry during layout
 2023-05-05 10:58:00 +02:00
Antonio Scandurra 5e16f70067 💄 2023-05-05 10:53:15 +02:00
Antonio Scandurra 080a1f00a3 Delay focus_in event for window activation till after layout 2023-05-05 10:47:42 +02:00
Antonio Scandurra b9ed327b94 Replace usages of is_parent_view_focused with is_self_focused 
Previously, this was used because we didn't have access to the current
view and `EventContext` was an element-only abstraction. Now that the
`EventContext` wraps the current view's `ViewContext` we can simply check
for the view's focus and avoid querying ancestors.
 2023-05-05 10:08:22 +02:00
Antonio Scandurra 80ad59a620 Make focusing the parent an effect to avoid querying ancestors 2023-05-05 10:04:54 +02:00
Joseph T. Lyons c55a4c0feb Merge pull request #2447 from zed-industries/fix-auto-update 
Do not use post_json() to auto update
 2023-05-04 17:15:09 -04:00
Mikayla Maki 3631b3a86c Merge pull request #2446 from zed-industries/fix-copilot-logged-out 
Fix copilot stuck in logged out state
 2023-05-04 16:52:04 -04:00
Mikayla Maki 89af803565 Rearrange the state machine 2023-05-04 13:45:31 -07:00
Julia 137cbaba34 Merge pull request #2445 from zed-industries/construct-text-buffer-in-background 
Construct text buffer in background
 2023-05-04 16:01:39 -04:00
Julia eacea55aaf Fixup cases using buffer model handle id as buffer id 2023-05-04 12:32:31 -04:00
JuliaandAntonio Scandurra 1883e260ce Offload text::Buffer construction to background worker 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-05-04 12:32:31 -04:00
JuliaandAntonio Scandurra 7e06062bdb Store history base text as rope 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-05-04 12:32:31 -04:00
Joseph Lyons 8313414e1e Do not use post_json() to auto update 2023-05-04 12:12:36 -04:00
Antonio Scandurra d6b0569bed Merge branch 'main' into implicit-ancestry 2023-05-04 17:19:06 +02:00
Antonio Scandurra f51425d390 Merge pull request #2444 from zed-industries/fix-clicking-sidebar-buttons 
Use `Workspace::toggle_sidebar_item` when clicking on sidebar button
 2023-05-04 17:14:40 +02:00
Antonio Scandurra 64e0c16baa Use Workspace::toggle_sidebar_item when clicking on sidebar button 
Previously, we were mistakenly using `Sidebar::toggle_item`, which only
performs part of the toggle operation.
 2023-05-04 17:06:37 +02:00
Antonio Scandurra cbae4e751b Merge pull request #2443 from zed-industries/fix-vim-mode-rename 
Avoid calling `update_window` twice in `blurred` event handler
 2023-05-04 16:24:51 +02:00
Antonio Scandurra 912a4cf549 Avoid calling update_window twice in blurred event handler 
This was preventing us from unhooking vim when performing a rename,
which prevented typing in the rename editor.
 2023-05-04 16:18:01 +02:00
Antonio Scandurra 0f93714d4f Merge pull request #2442 from zed-industries/filter-vim-commands 
Filter out vim commands when vim mode is disabled
 2023-05-04 15:00:19 +02:00
Antonio Scandurra b1f5cfaa79 Merge pull request #2440 from zed-industries/fix-navigate-to-definitions-panic 
Fix panic when opening multiple definitions in a multibuffer
 2023-05-04 14:56:43 +02:00
Antonio Scandurra b3baebde22 Filter out vim commands when vim mode is disabled 2023-05-04 14:52:34 +02:00
Antonio Scandurra da19edc3e3 Merge branch 'main' into implicit-ancestry 2023-05-04 14:39:58 +02:00
Antonio Scandurra 121264d35a Fix panic when opening multiple definitions in a multibuffer 
The editor is on the stack, so adding an item to the `Pane` containing
the editor will cause a double borrow and a consequent panic. This
commit fixes the issue by deferring the opening of the definitions.
 2023-05-04 14:34:42 +02:00
Antonio Scandurra 7e2a461486 Merge pull request #2439 from zed-industries/fix-keystrokes-for-action 
Cache view's type id and keymap context into a separate map
 2023-05-04 14:22:42 +02:00
Antonio Scandurra 5cc6304fa6 Verify keystrokes can be queried while views are on the stack 2023-05-04 12:09:32 +02:00
Antonio Scandurra 3d679ddb26 Avoid re-allocating KeymapContext after every view notification 2023-05-04 12:04:30 +02:00
Antonio Scandurra 18e39ef2fa Cache view's type id and keymap context into a separate map 
During `layout`, we now pass a mutable reference to the element's
parent view. This is a recursive process that causes the view to
be removed from `AppContext` and then re-inserted back into it once
the layout is complete.

As such, querying parent views during `layout` does not work as such
views will have been removed from `AppContext` and not yet re-inserted
into it. This caused a bug in `KeystrokeLabel`, which used the `keystrokes_for_action`
method to query its ancestors to determine their type id and keymap context.

Now, any time a view notifies, we will cache its keymap context so that
we don't need to query the parent view during `layout`.
 2023-05-04 10:47:56 +02:00
Antonio Scandurra 7b7a495be3 Remove stray dbg! statement 2023-05-04 09:56:49 +02:00
Antonio Scandurra f6f18be9c3 Remove WindowContext::is_child_focused 2023-05-04 09:53:35 +02:00
Antonio Scandurra 67a3891f15 Make dispatch_event related methods public to the crate only 2023-05-04 09:53:35 +02:00
Antonio Scandurra 92183e0d72 Ensure querying keystrokes or actions is safe 
This is achieved by moving `available_actions` into `AsyncAppContext` (where
we know no view/window is on the stack) and `keystrokes_for_action` into `LayoutContext`
where we'll fetch the previous frame's ancestors and notify the current view if those
change after we perform a layout.
 2023-05-04 09:53:31 +02:00
Joseph Lyons 053b34875b collab 0.11.0 2023-05-03 14:59:04 -04:00
Joseph Lyons 653ea3a85d v0.86.x dev 2023-05-03 14:38:41 -04:00
Max Brunsfeld c2c29d3fb6 Merge pull request #2427 from zed-industries/copilot-disabled-globs 
Add copilot.disabled_globs setting
 2023-05-03 11:00:08 -07:00
Max Brunsfeld 9d41f83b1b Merge branch 'main' into copilot-disabled-globs 2023-05-03 10:53:28 -07:00
Antonio Scandurra 040cc4d4c3 Allow notifying views when the ancestry of another view is outdated 2023-05-03 19:25:00 +02:00
Max Brunsfeld 8eb1312deb Add copilot menu item for enabling paths by glob 2023-05-03 10:14:01 -07:00
Antonio Scandurra 7250754f8e Make dispatch_keystroke public to the crate only 2023-05-03 19:13:17 +02:00
Antonio Scandurra 9e8f852afb Remove ViewContext::is_child 2023-05-03 19:09:07 +02:00
Antonio Scandurra 5157442703 Fix integration test relying on deferred happening after focus 
Focus is now one of the last things that happens during `flush_effects`,
and we shouldn't have relied on `defer` in the first place to verify
focus changes.
 2023-05-03 19:00:32 +02:00
Antonio Scandurra c65465b0b5 Ensure workspace gets rendered in collab integration tests 2023-05-03 18:31:07 +02:00
Antonio Scandurra e9ed40da37 Remove the ability to retrieve the view's parent 2023-05-03 16:52:55 +02:00
Antonio Scandurra 7f137ed3dd Compute view ancestry at layout time 2023-05-03 16:36:14 +02:00
Antonio Scandurra 7f345f8bf5 Separate Window::build_scene into layout and paint 2023-05-03 12:18:16 +02:00
Antonio Scandurra 3f037e5128 Merge pull request #2437 from zed-industries/fix-joining-call 
Fix "IncomingCallNotification was dropped" error when accepting a call
 2023-05-03 10:49:04 +02:00
Antonio Scandurra 376aa1235f Fix "IncomingCallNotification was dropped" error when accepting a call 
This was caused by accepting the call, which caused the notification to
be removed. When `active_call.accept_incoming()` finally completed, we
would try to get the app state from it in order to join the project, but
couldn't becuase the view would have already been dropped.

This commit fixes the bug by capturing a weak handle to the app state
when accepting the call as opposed to trying to read it from the view
when the accept completes.
 2023-05-03 10:37:57 +02:00
Antonio Scandurra c3cf9e3185 Merge pull request #2436 from zed-industries/close-window-end-call 
Move methods querying window state into `AsyncAppContext`
 2023-05-03 10:27:05 +02:00
Joseph T. Lyons f576586cd7 Merge pull request #2435 from zed-industries/use-json-post-request-for-update-requests 
Use json_post() request for update requests
 2023-05-02 23:42:25 -04:00