mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-02 08:20:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6290 commits 536 branches 832 tags 222 MiB
Commit graph

214 commits

Author SHA1 Message Date
Max Brunsfeld
ea85473f4f Enable and disable application menu items based on the active view 2022-05-19 16:50:40 -07:00
Max Brunsfeld
7445197f4d Derive application menu key equivalents from the keymap 2022-05-19 10:04:01 -07:00
Antonio Scandurra
225536accc Merge branch 'main' into request-to-join-project 2022-05-17 14:55:20 +02:00
Antonio Scandurra
e0c772db3e Hold a weak handle to Presenter when dispatching events 
This ensures that the only strong reference to the presenter is held
by `App`. This is important because we want to call `flush_effects`
when removing a window and implicit drops of the `Presenter` would
make that hard.

Before this commit, if a rendered view contained strong handles to
views and models, we would only drop them on the next `flush_effects`.
This was manifesting itself in `Project`s not being released when
closing their containing window.
 2022-05-17 13:04:38 +02:00
Nathan Sobo
d821e7a4c1 Cancel join requests when the requester closes the window 2022-05-16 20:29:36 -06:00
Antonio Scandurra
aa90c06012 Display a temporary window while remote project is loading 2022-05-16 17:45:50 +02:00
Nathan Sobo
a620665bed Only synthesize mouse moves on scene construction if window is active 2022-05-13 14:05:13 -06:00
Max Brunsfeld
7f64076f8d Focus/blur views when application windows become active/inactive 2022-04-22 14:18:50 -07:00
Nathan Sobo
92f040df00 Apply cursor styles during paint 
This makes the editor's cursor an IBeam and properly deals with nested cursor styles.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-22 10:54:18 -06:00
Antonio Scandurra
3def7a6803 Avoid flicker when toggling project browser on workspace open 2022-04-22 11:53:45 +02:00
Max Brunsfeld
066b4faf61 Restructure KeyMap file, make it easy to edit in Zed 
Add a JSON schema for this file so that autocomplete can be used for the actions.
 2022-04-21 13:35:10 -07:00
Antonio Scandurra
a210b05d00 Remove App::on_open_files, as it's a subset of on_open_urls 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-04-20 17:36:27 +02:00
Antonio Scandurra
f7055c2acc Implement zed --wait 2022-04-20 17:28:31 +02:00
Nathan Sobo
75f0326e54 Use ipc_channel crate to communicate between cli and app 
We still aren't handling CLI requests in the app, but this lays the foundation for bi-directional communication.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-04-20 17:15:46 +02:00
Max Brunsfeld
3901d9d544 Display key bindings in the command palette 
They still need to be styled.

Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-04-18 17:11:08 -07:00
Max Brunsfeld
4630071f58 Start work on a command palette 2022-04-18 17:11:08 -07:00
Max Brunsfeld
99f8466cb5 Add a gpui method for listing the available actions 2022-04-18 17:11:07 -07:00
Antonio Scandurra
77d3cc359e Fix tests 2022-04-14 18:50:45 +02:00
Antonio Scandurra
5a8297a02f Introduce ViewContext::observe_focus 2022-04-14 18:22:55 +02:00
Nathan Sobo
27057fdb1b Only process a single focus effect per batch 
This allows us to focus the query editor of the project search when deploying it. Previously, a complex interplay between focus events was preventing this from working in an intuitive way. What happened previously:

- We'd activate the project search, which enqueued a focus effect for the project search view
- We'd focus the query editor, which enqueued an effect
- We'd process the focus effect for the search view, which would enqueue an effect to transfer focus to the results editor
- We'd process the effect to focus the query editor
- We'd process the effect to focus the results editor

Now...

- We activate the project search pane item, enqueuing a focus effect for the project search itself
- We focus the query editor and *remove* the previous pending focus change effect
- We process the focus effect
 2022-04-14 08:52:24 -06:00
Max Brunsfeld
949fbe7cd3 Allow dumping the project diagnostic view's state as JSON 
Also, improve DebugElements action so that it shows the JSON in an editor.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-04-11 19:51:46 -07:00
Max Brunsfeld
be11f63f1e Watch ~/.zed/bindings.json file for custom key bindings 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-11 16:50:44 -07:00
Max Brunsfeld
3636c9ec25 Load workspace and editor key bindings from a JSON file 2022-04-10 11:18:08 -07:00
Max Brunsfeld
fd4b81c8fc Allow actions to be deserialized from JSON 
Introduce separate macro for implementing 'internal' actions which
are not intended to be loaded from keymaps.
 2022-04-08 15:47:51 -07:00
Max Brunsfeld
5242a3a6dc Restructure action macro to assign a namespace to every action 
Also, allow arbitrary types to be used as Actions via the impl_actions macro

Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-04-07 16:20:49 -07:00
Max Brunsfeld
b354af7bda Use an unbounded channel in gpui test helper methods 
The bounded channel could fill up when many events were emitted in one
effect cycle.
 2022-04-06 22:02:04 -07:00
Keith Simmons
1812480cbb Tab size is pulled properly from settings instead of hardcoded 2022-04-06 10:23:37 -07:00
Nathan Sobo
4f4364d510 Ensure we drop the last pane item 
Previously, we weren't updating the toolbar's active item when emptying out a pane. This enhances an integration test to ensure that we don't hold references to any editors or buffers once we close everything.
 2022-04-05 13:05:14 -06:00
Nathan Sobo
41a27e6925 💄 2022-04-05 12:09:40 -06:00
Nathan Sobo
e2bf89b1e8 Don't require a path in TestAppContext::dispatch_action 
Instead, derive it from the presenter. This makes tests easier to write and more reliable since we'll be accurately simulating the actual relationship between parent and child views.
 2022-04-05 12:08:25 -06:00
Nathan Sobo
daf999c3be Fully disable vim mode on start unless it's enabled 
Also: Make some structural adjustments to remove the need for defer. Instead of accessing the global in associated VimState functions, have a single method that allows us to call update instance methods.
 2022-03-26 19:19:12 -06:00
Keith Simmons
bb9b36dccd Add initial vim mode mode switching 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-03-25 20:10:37 -07:00
Keith Simmons
0a8d543f66 Add global tests and wrap global update functions in update call to flush effects 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2022-03-23 10:27:27 -07:00
Keith Simmons
454f7a570c Add global change observations 2022-03-23 09:14:12 -07:00
Antonio Scandurra
3298529ed1 Fix global nested event test after turning subscriptions into effects 2022-03-23 09:14:33 +01:00
Max Brunsfeld
880eaa268b Coalesce followed view updates only within one frame 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-22 17:03:24 -07:00
Antonio Scandurra
9885c4f6ba Don't trigger observations with notifications emitted prior to observing 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-22 16:28:11 +01:00
Antonio Scandurra
5ecf945e28 Don't trigger global subscriptions with events emitted prior to subscribing 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-22 16:14:21 +01:00
Antonio Scandurra
73eae287a1 Don't trigger subscriptions with events emitted prior to subscribing 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-22 15:57:30 +01:00
Antonio Scandurra
a154e4500b Implement Workspace::unfollow 
This also changes the structure of the follow state back to be per-pane. This
is because we can't share the same view state across different panes for
a couple of reasons:

- Rendering the same view in N different panes is almost always not something
that we want due to global state such as focus.
- If we allowed it and a user followed the same person in two different panes,
there would be no way of unfollowing in one pane without also unfollowing in
the other.
 2022-03-21 16:55:18 +01:00
Max Brunsfeld
e338da0271 Allow clicking a titlebar avatar to initiate following 2022-03-18 13:37:07 -07:00
Antonio Scandurra
10e6d82c3e WIP: Start on sending view updates to followers 2022-03-18 14:20:09 +01:00
Max Brunsfeld
eda06ee408 Add AnyWeakViewHandle 2022-03-17 17:53:38 -07:00
Antonio Scandurra
5d14c9abdf Introduce workspace::register_project_item 
This lets downstream crates like `editor` define how project items should be
opened.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-17 15:54:34 +01:00
Antonio Scandurra
44d997c00c Rename app_state to global in gpui 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-17 14:33:01 +01:00
Antonio Scandurra
aced1e2315 Finish refactoring of how editors are opened 2022-03-17 11:29:46 +01:00
Max Brunsfeld
a88320dc5f Remove workspace::Item trait 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Keith Simmons <keith@zed.dev>
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-03-16 13:34:06 -07:00
Antonio Scandurra
b0afb64a6e Fix edge cases when calling refresh_windows 
This commit ensures that new views are rendered for the first time. This fixes
a panic that could be reproduced by dropping the `ThemeSelector` and opening
the file finder during the same update.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-16 14:51:54 +01:00
Keith Simmons
c50be72214 Format including missing formatting changes from previous PR 2022-03-11 15:38:01 -08:00
Keith Simmons
16afb3d5b1 Add some tests for global events and fix potential bug in subscriptions when subscription is dropped inside of it's own callback 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-03-11 15:34:04 -08:00
Keith Simmons
144591d639 Minor renames for clarity 2022-03-11 11:25:36 -08:00
Keith Simmons
81fc812221 Add global events to MutableAppContext and raise global event when new workspace is created 2022-03-10 20:03:01 -08:00
Antonio Scandurra
ef1ec88523 Remove delegate support from GPUI 
We added this because we thought it would save some allocations when
sending operations given that we could move them to the delegate upon
notifying it, but the reality is that we serialize operations and that
only requires a reference.
 2022-03-09 10:48:52 +01:00
Antonio Scandurra
317a1bb07b Remove language servers from buffers 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
Co-Authored-By: Keith Simmons <keith@zed.dev>
 2022-03-08 15:16:07 -08:00
Antonio Scandurra
b49951ac57 Implement {ModelHandle,ViewHandle}::become_delegate 2022-03-08 09:30:32 +01:00
Nathan Sobo
f2848a092b WIP: Start on a delegation... like events, but single consumer that takes ownership of event 2022-03-08 09:01:57 +01:00
Nathan Sobo
40c0b9e7a5 Halt keystroke dispatch when a global action is dispatched 2022-03-06 09:46:33 -07:00
Antonio Scandurra
c38de3243d 🎨 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-04 17:54:48 +01:00
Antonio Scandurra
77e913b5a4 Blur focused view when project becomes read-only 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-04 17:37:26 +01:00
Max Brunsfeld
8b7a9367fa Avoid storing type name string on AnyViewHandle 
It won't be needed for leak error messages, because the typed
view handle will typically be created first. And this avoids
increasing the size of the handle used in production.
 2022-03-01 18:22:09 -08:00
Antonio Scandurra
a25f21df39 Remove debug_elements_callbacks from App 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-03-01 19:16:58 +01:00
Antonio Scandurra
bc9c034baa Fix Presenter leak when removing windows 2022-03-01 18:50:05 +01:00
Antonio Scandurra
83a3402235 Make TestAppContext and its dependencies available only in tests 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-01 17:01:52 +01:00
Antonio Scandurra
0d6f6bf5bb Detect when view handles are leaked 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-01 16:11:12 +01:00
Antonio Scandurra
aa03ebce0e Enable leak backtraces by setting LEAK_BACKTRACE=1 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-03-01 16:00:40 +01:00
Antonio Scandurra
466db69780 Pass a reference to TestAppContext in tests 
This allows us to drop the context *after* we ran all futures to
completion and that's crucial otherwise we'll never drop entities
and/or flush effects.
 2022-03-01 12:01:02 +01:00
Antonio Scandurra
7ce6f23ed4 Remove all windows on dropping TestAppContext 
This allows us to remove the dropped entities and flush effects as
necessary.
 2022-03-01 10:55:12 +01:00
Antonio Scandurra
10a872a370 Avoid reference cycle between Client and its models 2022-03-01 10:55:05 +01:00
Max Brunsfeld
426e0e3d4f Flush effects when dropping a TestAppContext 
This way, at the end of a test, dropped entities will be removed, and will drop
the handles that they hold.
 2022-02-28 22:17:20 -08:00
Max Brunsfeld
7d53e37672 Start work on detecting leaked handles in tests 
For now, just track models. Tests fail because we don't
yet clear the app contexts at the right time.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-28 22:02:43 -08:00
Nathan Sobo
cb230ad574 Re-activate the most recently-activated project search on cmd-shift-F 
This commits adds the beginnings of an application state facility as a non-static place to store the most recently-activated search for each project.

I also store workspace items by descending order of their entity id so that we always fetch the newest item of a given type when calling `Workspace::item_of_type`.
 2022-02-27 18:07:46 -07:00
Nathan Sobo
71241b1fb8 Add capture phase for action dispatch 
Just like the DOM, we now bubble events down the tree during a capture phase before bubbling them back up.
 2022-02-27 16:14:40 -07:00
Nathan Sobo
ed6c8b1836 Allow actions to be propagated from nested ViewContexts 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-02-25 16:14:16 -07:00
Antonio Scandurra
38e4ec9157 Replace Inconsolata with Zed Mono and Zed Sans 2022-02-18 14:55:11 +01:00
Max Brunsfeld
10580f96a3 Automatically include current view id in element state ids 2022-02-17 13:44:46 -08:00
Antonio Scandurra
1fbcea6c0d Randomly detach requests on guest to let them race with other local ops 2022-02-17 09:05:06 +01:00
Max Brunsfeld
1ca1595490 Add AnyWeakModelHandle 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-15 17:56:50 -08:00
Antonio Scandurra
a11495af19 Start on a randomized integration test 2022-02-15 17:33:43 +01:00
Max Brunsfeld
ddc1f237a6 Panic if element state is used twice in the same frame 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-14 14:04:27 -08:00
Antonio Scandurra
1eea2f3653 Add integration test for code actions 2022-02-14 11:42:56 +01:00
Antonio Scandurra
2fcdcac080 Fetch code actions on cursor movement instead of on-demand 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-02-11 14:41:19 +01:00
Nathan Sobo
dc20be256e Start on code action confirmation 2022-02-05 12:37:34 -07:00
Antonio Scandurra
5c862bfe98 Maintain search results as query and active editor changes 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-28 15:19:58 +01:00
Nathan Sobo
b755b2d602 Add ViewHandle::defer 
It's like update, but happens after the current effect instead of synchronously. Also, it doesn't allow the callback to return a value because there would be nothing to do with it.
 2022-01-22 13:21:59 -07:00
Nathan Sobo
8b04c5d3ac Add a ViewContext::defer 
This takes a closure that will be enqueued as an effect to ensure there are no entities on the stack.
 2022-01-22 13:14:25 -07:00
Max Brunsfeld
f1fc0bde99 Flush effects after every spawned future completes 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-21 17:43:24 -08:00
Nathan Sobo
19751e9200 Merge remote-tracking branch 'origin/main' into go-to-definition 2022-01-21 11:12:38 -07:00
Antonio Scandurra
e5662dd426 Allow observing the release of entities 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-21 14:34:14 +01:00
Nathan Sobo
fbca28337a When opening a path in an existing window, move it to the foreground 2022-01-20 20:45:30 -07:00
Antonio Scandurra
634340dd84 Return a task from Workspace::save_active_item 
This required changing our approach to OS prompts and this commit greatly
simplifies that. We now avoid passing a callback and return a simple future
instead. This lets callers spawn tasks to handle those futures.
 2022-01-20 09:51:29 +01:00
Max Brunsfeld
ed88fdcea2 Add unit test for diagnostic + path header ordering 2022-01-12 11:34:57 -08:00
Max Brunsfeld
ce6f3d7f3e Reuse views when moving between diagnostic view and editors 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 11:00:12 -08:00
Antonio Scandurra
794d214eee Refactor opening workspace items 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-01-07 17:38:37 +01:00
Nathan Sobo
943571af2a Report backtraces of pending conditions when deterministic executor illegally parks 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-01-06 13:33:55 -07:00
Nathan Sobo
d7a78e14ac Allow disk-based diagnostic progress begin/end events to interleave 
When multiple saves occur, we can have multiple start events followed by multiple end events. We don't want to update our project diagnostics view until all pending progress is finished.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-01-06 09:32:08 -07:00
Max Brunsfeld
8728d3292d Merge branch 'main' into polish-project-diagnostics 
Also fix false failure in ModelHandle::condition when parking is not forbidden.
 2022-01-05 10:53:18 -08:00
Max Brunsfeld
d8b888c9cb Replicate diagnostic summaries 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-01-04 14:29:22 -08:00
Max Brunsfeld
f5d4e26799 Remove unused context variable 2021-12-27 15:34:07 -08:00
Nathan Sobo
e9a750be71 Don't merge keymap contexts from containing elements 
Co-Authored-By: Aaron Hillegass <charmedliferaft@gmail.com>
 2021-12-24 16:44:35 -07:00
Nathan Sobo
ab5db0bc1e Fix warnings and tests 2021-12-18 11:06:07 -07:00
Nathan Sobo
cd65031cda Halt keystroke dispatch immediately when we call a global action handler 
Someday, we may want to define a global action context that allows us to propagate the action, but this isn't currently supported. Previous to this commit, we were invoking the same global action handler multiple times, once for each view in the responder chain.
 2021-12-18 08:12:08 -07:00
Antonio Scandurra
3426d46b69 Clear pending keystrokes after dispatching an action 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-03 17:59:46 +01:00
Antonio Scandurra
0e93bc41dd In add_option_view, avoid bumping view's ref counts if view is None 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-03 17:52:39 +01:00
Max Brunsfeld
5ec003530f Consolidate pending effects logic into MutableAppContext::update 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-29 14:16:19 -08:00
Max Brunsfeld
4cc1556ca4 Introduce weak_handle methods on ModelContext and ViewContext 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-29 14:13:22 -08:00
Nathan Sobo
73afb29b04 Use alt modifier instead of cmd to add selections 2021-11-23 16:23:30 -07:00
Nathan Sobo
d969f38850 Implement shift-click to extend the newest selection 2021-11-23 15:42:21 -07:00
Antonio Scandurra
bcf38e6bb5 Implement word-wise mouse selection 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-23 18:50:17 +01:00
Nathan Sobo
0ff87e603f Give the MouseEventHandlers for each tab bar their own id 
This fixes a beachball where we oscillate back and forth between hovered and unhovered due to confusing two different tab bars as the same tab bar.
 2021-11-03 19:15:55 -06:00
Antonio Scandurra
a26b066788 Introduce a status bar and add the cursor position to it 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-11-03 17:27:51 +01:00
Nathan Sobo
2c57703ad6 Explicitly shut down language servers when quitting the app 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-11-02 13:16:25 -06:00
Antonio Scandurra
f5aa07aac9 Remove all windows before quitting 
This gives all entities a chance of running `Drop::drop` which,
in turn, could cause them to spawn a critical task. For example,
we use this capability when a language server is dropped and we
need to asynchronously send a shutdown message.
 2021-11-02 14:55:31 +01:00
Max Brunsfeld
b8994c2a89 Add a facility for delaying quit until critical tasks finish 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-11-01 11:57:31 -07:00
Nathan Sobo
fdfed3d7db Move all crates to a top-level crates folder 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-04 13:22:21 -06:00
Renamed from gpui/src/app.rs (Browse further)