mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-22 18:16:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
1257 commits 510 branches 815 tags 252 MiB
Commit graph

167 commits

Author SHA1 Message Date
Max Brunsfeld
dc8e216fcb WIP - Maintain a set of open buffers on a LocalWorktree 2021-06-22 12:29:58 -07:00
Max Brunsfeld
cabf6b1f58 Emit a diff event when worktree's snapshot is updated 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-06-21 17:07:56 -07:00
Max Brunsfeld
7a88e44264 Add menu command to join worktree using URL on clipboard 
Introduce rpc::Client struct that wraps zed_rpc::Peer
 2021-06-17 20:42:36 -07:00
Antonio Scandurra
8112efd522 Replace callback-based requests/messages with streams 2021-06-16 14:26:54 +02:00
Max Brunsfeld
8b66e0aa7e WIP - Allow RpcClient to register handlers for incoming messages 2021-06-15 17:22:48 -07:00
Max Brunsfeld
20542f54ef Start work on connecting to RPC endpoint 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-06-10 22:12:04 -07:00
Nathan Sobo
66c76d5469 Test creating a new empty workspace and fix test compile errors 2021-06-09 16:38:32 -06:00
Nathan Sobo
3a932cc9bf Rename MainThreadPlatform to ForegroundPlatform and fix crash on quit 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-06-07 17:42:49 -06:00
Nathan Sobo
6daddf5146 Allow platform references to be sent to background threads 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-06-07 17:35:27 -06:00
Nathan Sobo
ebbe517bfa Move path prompting methods to MainThreadPlatform 
They need to call back into the main thread, meaning the callbacks can't be Send + Sync.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-06-07 17:32:03 -06:00
Nathan Sobo
7b98994d1f Rename PlatformLifecycle to MainThreadPlatform 
Don't love it, but at least it's accurate.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-06-07 17:21:34 -06:00
Nathan Sobo
14b519f78d Extract a platform::Lifecycle trait 
This will allow us to make platform::Platform be Send + Sync and keep the lifecycle on the main thread.
 2021-06-07 17:02:24 -06:00
Max Brunsfeld
6ef447866a Rename context parameters to cx in gpui 2021-05-28 15:32:35 -07:00
Antonio Scandurra
d7f5587d84 Revert "Temporary: ensure CI env variable is being set" 
This reverts commit 074dc55ab7.
 2021-05-19 15:20:33 +02:00
Antonio Scandurra
074dc55ab7 Temporary: ensure CI env variable is being set 2021-05-19 15:19:07 +02:00
Antonio Scandurra
65cf9b7c1d Remove condition_with_duration for ModelHandle 
Also, use a 2s timeout on CI for both `ModelHandle::condition` and
`ViewHandle::condition`.
 2021-05-19 14:50:28 +02:00
Antonio Scandurra
830fc38503 Increase condition timeout on CI and remove condition_with_duration 
`condition_with_duration` wasn't really being used, as the default
timeout was `500ms` and the only places that did use it specified
`500ms` as well.
 2021-05-19 14:42:10 +02:00
Max Brunsfeld
d76d532692 Merge branch 'master' into file-changed-on-disk 2021-05-12 20:08:09 -07:00
Max Brunsfeld
493643c15f Remove dropped entities even if there are no effects to flush 2021-05-12 19:45:45 -07:00
Nathan Sobo
9dac491ed5 Don't remove entities whose ref count has become positive again 2021-05-12 19:29:17 -06:00
Nathan Sobo
e81a28e57e Remove dropped entities after every effect 2021-05-12 19:28:48 -06:00
Max Brunsfeld
4910bc50c6 Merge branch 'master' into file-changed-on-disk 2021-05-12 16:20:03 -07:00
Max Brunsfeld
d6c89521d9 Remove commented-out tests for spawn and spawn_stream 2021-05-12 15:27:58 -07:00
Nathan Sobo
a3be5595dd Pass a handle to the current view model when spawning 
Most of the time, we'll want a way to get a reference back to the current view or model, so this facilitates that common case.
 2021-05-12 15:28:59 -06:00
Nathan Sobo
fa6bd1f926 Introduce AsyncAppContext and simplify spawning 
Now when you call spawn in various context, you pass an FnOnce that is called with an AsyncAppContext and returns a static future. This allows you to write async code similar to how our tests work, borrowing the guts of the AsyncAppContext when needed to interact, but using normal async await semantics instead of callbacks.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-05-12 15:16:49 -06:00
Antonio Scandurra
2326ac3dbf Use gpui::test for tests in gpui 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-05-12 18:21:32 +02:00
Antonio Scandurra
048bbc9da0 Test prompting when saving while there's a conflict 2021-05-12 15:21:50 +02:00
Antonio Scandurra
2eff936154 Make MutableAppContext::prompt private 
...as we're supposed to call this method only via ViewContext.
 2021-05-12 11:57:05 +02:00
Antonio Scandurra
62403343fa Display prompt when trying to save a conflicting file 2021-05-12 11:54:48 +02:00
Antonio Scandurra
d8eed53f13 Emit Dirtied event when a clean buffer's file is deleted 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-11 16:32:52 +02:00
Max Brunsfeld
b292baf334 Remove logging of retained views 2021-05-07 14:51:55 -07:00
Max Brunsfeld
3120906275 Merge branch 'master' into close-window 2021-05-07 14:24:48 -07:00
Max Brunsfeld
83a844f120 Fix the Clone impl for AnyViewHandle 2021-05-07 14:16:16 -07:00
Nathan Sobo
318e8abf2f Avoid redundant entity refcount operations 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-05-07 14:15:43 -07:00
Max Brunsfeld
3c3cf3b7c5 Keep weak handles to workspace items 2021-05-07 09:52:15 -07:00
Nathan Sobo
b5f1f31693 Fix focus test 
Call on_focus on the root view when the window is originally created. Test dropping a focused view. Simplify test to avoid relying on emitting events.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-05-07 09:43:07 -06:00
Max Brunsfeld
e6323f0d02 Fix handling of new files with new buffer/file structure 2021-05-06 21:06:20 -07:00
Nathan Sobo
35e0eaaae2 Refocus root view if focused view is removed 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-05-06 16:30:10 -06:00
Nathan Sobo
5e08a02ca8 Don't retain entities after EntityTasks are dropped 
This allows us to spawn long-running tasks without leaking entities, but it also ensures that if we *do* hold on to a task, that the entity exists until the future or stream complete so that the task doesn't need to return an Option type.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-05-06 16:19:38 -06:00
Nathan Sobo
ab10e27424 Create a pending view handle before creating a view 
This way, if we create and drop a handle during the creation of a view, we don't drop the view before we have a chance to increment its initial reference count.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-05-06 15:18:09 -06:00
Max Brunsfeld
290fcb4c06 In handle ::condition, re-poll on events as well as notifications 2021-05-06 13:18:41 -07:00
Nathan Sobo
7717700b2c Implement Drop on AnyViewHandle 
This was a pretty bad oversight.
 2021-05-05 23:21:39 -06:00
Nathan Sobo
6cb656db9a Require window to have a root view and focused view 
This is possible now that the window doesn't need to own the view. We can create the root view before we create the window.
 2021-05-05 23:21:19 -06:00
Nathan Sobo
45a01d1526 Don't store views on windows 
Instead, store all views in a single top-level map that's keyed by window id and view id. This ensures we'll keep a view alive even if its window is gone, so long as we're holding a handle. This can happen with things like spawned tasks. We don't want to panic during a spawned task after we close the window.
 2021-05-05 22:48:16 -06:00
Max Brunsfeld
1fcbadaa99 Add TestAppContext::simulate_new_path_selection 2021-05-05 11:04:39 -07:00
Nathan Sobo
3f844bc953 Fix crash when closing windows 2021-05-05 11:34:49 -06:00
Max Brunsfeld
5fd084ec09 Start work on creating and saving new files 2021-05-04 19:04:11 -07:00
Nathan Sobo
ed28bd3f95 Combine Workspace and WorkspaceView 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-05-03 20:15:55 -06:00
Max Brunsfeld
5826a976ef Return a future from WorkspaceView::open_paths 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-29 14:55:28 -07:00
Nathan Sobo
6b357a6ae7 Fix tests 
I didn't realize a previous change had broken stuff. We need to always call `remove_dropped_entities` and `update_windows` in `flush_effects`, even if there aren't any effects. To achieve this, I use a `loop` to ensure we call these methods at least once before breaking.
 2021-04-28 14:16:10 -06:00
Max Brunsfeld
21cfb75a73 Flush redundant fs events in worktree test 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-28 12:42:39 -07:00
Nathan Sobo
1cb3fdbf7d Synthesize a mouse moved event in the previous position after painting a scene 
This ensures that we correctly update the hover state of elements whose position has changed relative to the mouse cursor even though the mouse hasn't actually moved.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-28 13:02:39 -06:00
Nathan Sobo
69cc2b0483 WIP 2021-04-27 18:35:24 -06:00
Nathan Sobo
58e336354e Align close tab icon cleanly with unsaved indicator 2021-04-27 16:51:23 -06:00
Nathan Sobo
bb95d58c79 Relay hover events to tabs 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-27 11:37:14 -06:00
Nathan Sobo
fc4b7e2a2a Introduce MouseEventHandler 
Still need to give elements the ability to re-render their parent view. Once that is in place, I think we can implement hoverable close tab buttons.
 2021-04-26 21:52:18 -06:00
Nathan Sobo
a47b0b4ca6 Add a mechanism for storing ephemeral values 
I'll use this in the mouse event handler to track hover and click state.
 2021-04-26 21:24:23 -06:00
Max Brunsfeld
9fd8acdce7 Use our own scoped_pool implementation 2021-04-20 14:07:36 -07:00
Nathan Sobo
9899614f31 Remove task_done condvar which supported finish_pending_tasks 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-20 10:45:42 -06:00
Nathan Sobo
1a8e909a38 Ensure we remove broadcast channels after all conditions resolve 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-20 10:43:13 -06:00
Nathan Sobo
dcc2bdfd4c Panic when awaiting conditions on dropped entities 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-04-20 10:36:54 -06:00
Antonio Scandurra
37444acc9c Time out condition after 200ms and add basic unit tests for it 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-20 17:21:29 +02:00
Antonio Scandurra
cd7dccd30c Replace remaining usages of finish_pending_tasks with condition 2021-04-20 12:28:30 +02:00
Nathan Sobo
a4c1fe5a0b WIP: Add a condition method to model and view handles for use in tests 
It returns a future that resolves when the provided predicate returns true. The predicate is called any time the handle's targeted entity calls notify.

Still need to add a timeout and completely remove finsih_pending_tasks.
 2021-04-19 22:01:54 -06:00
Nathan Sobo
db8cce9aa9 Merge branch 'master' into rescan 2021-04-14 22:26:09 -06:00
Nathan Sobo
36e6ed3aef WIP 2021-04-14 12:38:16 -06:00
Nathan Sobo
4cef25eff8 Replace easy-parallel with scoped-pool for path searches 
The easy-parallel crate spawned new threads on each call, which was resulting in way too many threads.

Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
 2021-04-14 09:08:52 -06:00
Antonio Scandurra
cf23b0e4a2 Prompt for paths asynchronously to avoid double borrow 2021-04-14 16:30:03 +02:00
Antonio Scandurra
29d2236ed2
Merge pull request #19 from zed-industries/single-global-action-dispatch 
Dispatch global actions only once when triggering a menu item
 2021-04-14 15:50:07 +02:00
Antonio Scandurra
f755cbbe98 Dispatch global actions only once when triggering a menu item 
Previously we would dispatch the same global action more than once
because we would invoke `dispatch_action_any` _and_
`dispatch_global_action_any`. However, the former already takes care of
going through the global action handlers when no entity in the dispatch
path handled the action.
 2021-04-14 14:47:18 +02:00
Antonio Scandurra
40980edffe Merge branch 'master' into copy-paste 2021-04-14 12:05:52 +02:00
Nathan Sobo
0cc5e8f742 Replace easy-parallel with scoped-pool for path searches 
The easy-parallel crate spawned new threads on each call, which was resulting in way too many threads.

Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
 2021-04-13 20:07:42 -06:00
Nathan Sobo
0a2d2aa684 Replace app/app_mut on contexts with AsRef/AsMut impls 
Co-Authored-By: Brooks Swinnerton <934497+bswinnerton@users.noreply.github.com>
 2021-04-13 20:07:25 -06:00
Antonio Scandurra
13514aae6c Allow metadata to be associated with text written to clipboard 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-04-13 19:03:56 +02:00
Antonio Scandurra
f4c1ffc329 Start on copy-paste 2021-04-13 14:58:10 +02:00
Max Brunsfeld
902b0f7dfa Dispatch menu commands on the focused view 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 15:42:33 -07:00
Max Brunsfeld
d4436f3018 Don't try to handle errors when opening platform windows 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 15:14:25 -07:00
Max Brunsfeld
86c0f41c9e Move set_menus method to MutableAppContext 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:38:18 -07:00
Max Brunsfeld
41358f34e3 Set up menu handler in App::new 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:25:00 -07:00
Max Brunsfeld
2332b7e06b Move open command handler to workspace global action 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:18:24 -07:00
Max Brunsfeld
3247f49954 Allow menu items to specify arguments for their commands 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-12 14:09:49 -07:00
Nathan Sobo
4638391412 Remove MutableAppContext::downgrade 2021-04-10 00:14:26 -06:00
Nathan Sobo
620eedb727 Allow effects to be flushed before TestAppContext::update callback completes 2021-04-10 00:11:13 -06:00
Nathan Sobo
97a8a8ed43 Remove unsafe code from App::test_async 
I don't actually think it was correct to allow the future to borrow a mutable app reference. I went back to passing a wrapper around the refcell to async tests. They'll be a bit more annoying to write but also totally safe.
 2021-04-10 00:05:09 -06:00
Nathan Sobo
448dace281 Pass the on_finish_launching callback to Platform::run 2021-04-09 21:33:17 -06:00
Max Brunsfeld
079050541f Get app running and test passing after gpui App+Platform restructure 2021-04-09 16:56:32 -07:00
Nathan Sobo
4ecc17b1bb WIP: Make App the only entry point from main 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-09 13:38:09 -06:00
Nathan Sobo
301163bab7 Add lifecycle methods to Platform trait 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-09 13:03:26 -06:00
Max Brunsfeld
00d7dafbba Merge branch 'master' into menus 2021-04-09 10:34:21 -07:00
Max Brunsfeld
334de06322 Create an API for assigning the menubar contents 2021-04-08 16:01:36 -07:00
Nathan Sobo
9f6f27f305 Order debug JSON and allow elements to be named; copy to clipboard 2021-04-07 21:54:14 -06:00
Nathan Sobo
cbb23a93a6 Log prettified element debug JSON to on cmd-alt-i 2021-04-07 21:54:14 -06:00
Nathan Sobo
765c3f9c18 Open platform window before first invalidation 
This ensures we have an invalidation handler present so we render the first frame in all cases.
 2021-04-06 09:15:21 -06:00
Nathan Sobo
2970e934da Use handles to obtain entities in future callbacks 
This guarantees that the spawning entity will be present and simplifies
the logic for obtaining the entity. Now we can forward the results of spawned futures and streams in the same way regardless of whether what spawned them was a model or a view.
 2021-04-05 20:04:04 -06:00
Max Brunsfeld
fda1394057 Rename Task -> EntityTask (a BackgroundTask is just a Task) 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-05 17:03:42 -07:00
Max Brunsfeld
c39c7c3eff Make background executor available on AppContext 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-04-05 16:45:55 -07:00
Nathan Sobo
c43d7cfb39 Use a condvar instead of a channel to implement finish_pending_tasks 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 13:53:06 -06:00
Nathan Sobo
526a55d0d7 Complete finish_pending_tasks future when tasks are cancelled 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 12:42:23 -06:00
Nathan Sobo
2d79193fb6 Remove future/stream handlers when task is dropped 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 12:03:35 -06:00
Nathan Sobo
914cf37f37 Remove executor::ForegroundTask wrapper 
Now that smol returns the same Task as async_task, we can simply re-export the async_task::Task struct from our executor module.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-04-02 11:02:09 -06:00