mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 05:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
734 commits 486 branches 806 tags 265 MiB
Commit graph

734 commits

This branch
This branch
All branches
Author SHA1 Message Date
Max Brunsfeld
9aeb35bfab Get tests passing using a slow rightmost_point impl 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-13 11:54:29 -07:00
Antonio Scandurra
d8f7b35dca Fix concurrent editing in buffer after using ropes 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-13 19:59:01 +02:00
Antonio Scandurra
39c56b75ed Get local buffer usage working with ropes 
Randomized tests for remote edits are still not passing.

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-05-13 19:48:55 +02:00
Antonio Scandurra
7b98fb33dd WIP: Get the type checker passing... 
...but not the borrow checker!

Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-05-13 19:24:03 +02:00
Antonio Scandurra
0e9441e5cd WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-13 18:35:48 +02:00
Antonio Scandurra
b348276974
Merge pull request #60 from zed-industries/fix-failures 
Fix more test flakiness
 2021-05-13 11:55:26 +02:00
Antonio Scandurra
37f0ba9586 Increase timeout for fs-dependent conditions 2021-05-13 11:38:39 +02:00
Antonio Scandurra
4884a05a73 Change buffer atomically when reloading from disk 2021-05-13 11:26:11 +02:00
Antonio Scandurra
19f51bc480 Rely more on conditions for state derived after worktree changes 2021-05-13 11:25:29 +02:00
Antonio Scandurra
2c430668fc
Merge pull request #59 from zed-industries/more-resilient-fs-events 
Use `flush_fs_events` more after performing synchronous fs mutations
 2021-05-13 10:42:58 +02:00
Antonio Scandurra
eea9cb47fd Use flush_fs_events more after performing synchronous fs mutations 
I am not sure I have caught all the examples of this, but in general
I think we always want to perform a `flush_fs_events` as opposed to
`next_scan_complete` when doing synchronous I/O. Indeed, the file
system may inform us about the events caused by the just-performed
I/O over multiple batches, and `next_scan_complete` may return
before seeing all of them.

Note that this also removes a few assertions which were ensuring
that, on start, a worktree's file handle wouldn't know its deleted
status, even if the file didn't exist for sure on disk. However,
now that `file` is an async API, it's possible that by the time the
`FileHandle` is resolved, `Worktree` has already completed scanning.
We test a similar behavior further along in the test where those
assertions were removed, so it felt okay to proceed without them.
 2021-05-13 10:25:16 +02:00
Max Brunsfeld
0187b6da2c
Merge pull request #54 from zed-industries/file-changed-on-disk 
Handle buffers' files changing on disk from outside of Zed
 2021-05-12 20:19:39 -07:00
Max Brunsfeld
520cbfb955 Read file's mtime in background when getting a FileHandle 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-05-12 20:13:56 -07:00
Max Brunsfeld
d76d532692 Merge branch 'master' into file-changed-on-disk 2021-05-12 20:08:09 -07:00
Max Brunsfeld
d0b737779c
Merge pull request #57 from zed-industries/dropped-entities 
Fix panic when an entity's ref count is decremented to 0 and then is incremented again
 2021-05-12 20:03:24 -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
c757b3f46e Allow a longer timeout in buffer conflict test 2021-05-12 16:20:22 -07:00
Max Brunsfeld
4910bc50c6 Merge branch 'master' into file-changed-on-disk 2021-05-12 16:20:03 -07:00
Max Brunsfeld
36163f7b80
Merge pull request #56 from zed-industries/async-ctx 
Simplify spawning and asynchronous code
 2021-05-12 15:35:07 -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
Max Brunsfeld
d0f69c76e1
Merge pull request #55 from zed-industries/test-macros 
Introduce a `gpui::test` macro for less ceremony when writing tests
 2021-05-12 10:19:46 -07: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
ab04d71508 Use gpui::test in async tests in zed 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-05-12 18:20:49 +02:00
Antonio Scandurra
1c2b381f74 Use gpui::test macro for synchronous tests in zed 2021-05-12 17:18:23 +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
ac2168f1bd Update mtime and is_deleted when saving/loading a file 2021-05-12 14:34:56 +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
Max Brunsfeld
c54a49e5d1 Use a different tab icon color for buffers with conflicts 2021-05-11 16:59:31 -07:00
Max Brunsfeld
040189db3c Add basic handling for buffer's files changing on disk 2021-05-11 16:18:29 -07:00
Max Brunsfeld
d5218fbac5 Add failing test for buffer detecting on-disk changes 2021-05-11 11:38:10 -07:00
Antonio Scandurra
de6376ca80 Mark FileHandle as not deleted right after saving it 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-11 17:26:26 +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
e076c2c6dc
Merge pull request #48 from zed-industries/file-deletion 
Fix management of buffers' dirty state
 2021-05-11 17:00:44 +02:00
Antonio Scandurra
45b41465e1 Don't consider scan as being complete until its state is Idle 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-11 16:54:01 +02:00
Antonio Scandurra
d8f7054f28 Fix saving files in single-file worktrees 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-11 16:46:22 +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
Antonio Scandurra
02bd9c8420 Make sure next_scan_complete resolves 
Sometimes the scan state could change so quickly that the consumer
wouldn't notice that it ever went to a scanning state before going back
to an idle state, hence never resolving.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-11 16:06:12 +02:00
Max Brunsfeld
ff5561d402 Fix management of buffers' dirty state 
* Don't consider files deleted if they just haven't been scanned yet.
* Consider a buffer dirty if its file has been deleted.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-11 15:37:01 +02:00
Antonio Scandurra
01b20d524d
Merge pull request #51 from zed-industries/add-cursors-and-cancel-selections 
Implement `add_selection_above`, `add_selection_below` and `cancel`
 2021-05-11 13:02:37 +02:00
Antonio Scandurra
d9e7547d95 💄 2021-05-11 12:43:24 +02:00
Antonio Scandurra
07ef0d474e Bind add_selection_{above,below} to cmd-alt-{up,down} 2021-05-11 12:37:30 +02:00
Antonio Scandurra
17258d4f8c Add test for add_selection_above and add_selection_below 2021-05-11 12:35:27 +02:00
Antonio Scandurra
6f5e47d631 Add test for BufferView::cancel 2021-05-11 12:35:27 +02:00
Antonio Scandurra
0622722ab7 Split multi-line selection when starting a new columnar selection 2021-05-11 12:35:27 +02:00