mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 21:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
749 commits 489 branches 806 tags 270 MiB
Commit graph

228 commits

Author SHA1 Message Date
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
Max Brunsfeld
139bcb8304 Rename foo/mod.rs files too foo.rs 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-28 14:41:58 -07:00
Antonio Scandurra
5485c1a749 Add test for font selection 2021-05-26 09:41:57 +02:00
Max Brunsfeld
4e74a8726c Bump context-predicate grammar to the latest Tree-sitter 2021-05-22 12:34:35 +02:00
Nathan Sobo
5d614e7e54 Fix test assertions 2021-05-21 14:36:52 -06:00
Nathan Sobo
2c122eb253 Fix typo 2021-05-21 14:36:44 -06:00
Nathan Sobo
b075b0108d Clarify variable name 2021-05-21 14:14:05 -06:00
Nathan Sobo
92ff7f4e5e Accept colors in styling runs passed to layout_str 
Also move from the runs being expressed as ranges to the runs being expressed as a sequence of contiguous scalar lengths.
 2021-05-21 14:10:38 -06:00
Antonio Scandurra
608336c279 Complete unit test for Label highlights 2021-05-20 12:47:08 +02:00
Max Brunsfeld
558ce41130 WIP - Adjust Label element to expect highlights as byte offsets 2021-05-20 12:47:08 +02:00
Max Brunsfeld
92b938f4a8 Adjust layout_str to use byte coordinates 
* Interpret ranges as byte ranges for incoming runs
* Return glyphs whose indices are byte offsets
 2021-05-20 12:47:08 +02: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
Antonio Scandurra
a8ece757e4 Implement time::Global using a SmallVec 
Version vectors are going to be small most of the time, especially
as soon as we introduce an optimization that will let us only
track concurrent versions, thus preventing the version vector from
growing indefinitely over time in the tree.
 2021-05-18 17:34:48 +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
c7d97adf23 Introduce a gpui::test macro 2021-05-12 17:05:03 +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
e72a309734 Add a basic tab keybinding 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-11 17:10:37 +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
f2b009ea6b Ensure that the bundle runs on macOS versions < 11.0 2021-05-10 14:14:04 -06:00
Nathan Sobo
76d9a40f35
Merge pull request #40 from zed-industries/close-window 
Correctly handle closing windows and removing entities
 2021-05-08 09:06:54 -06:00
Nathan Sobo
2c74d75687 Fix double borrow error in Window::on_close callbacks when quitting app 
The simplest solution I could come up with was to make quitting the app asynchronous. Calling mac::Platform::quit enqueues a request to quit the app and then allows the call stack to fully return. This ensures we aren't holding a borrow when we quit and invoke all the Window::on_close callbacks. Seems like it should be fine to be async on quitting.
 2021-05-08 08:49:14 -06:00
Max Brunsfeld
9dbda4551f Ignore events for held-down keys after a key combo is partially released 2021-05-07 16:54:55 -07: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
Nathan Sobo
f408521d12 Gracefully handle a view being updated and removed in the same tick 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-05-06 15:13:26 -06:00