oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
632 Commits 1 Branch 0 Tags
491932b69105469cb4cb7d24c03476a2540ecd3a
Commit Graph
114 Commits
Author SHA1 Message Date
Antonio Scandurra 491932b691 Rename HighlightedChunksIter to HighlightedChunks 2021-05-24 15:07:02 +02:00
Antonio Scandurra 4ada5e0666 Rename rope::ChunksIter to rope::Chunks 
This is consistent with how we name the other chunk iterators.
 2021-05-24 15:05:11 +02:00
Antonio Scandurra 6e791edb18 Don't acquire the buffer mutably in highlighted_text_for_range 2021-05-24 12:43:29 +02:00
Antonio Scandurra 23b25307d9 Start on a basic implementation of HighlightedChunksIter 2021-05-24 11:23:42 +02:00
Max Brunsfeld b51ae1f668 WIP 2021-05-23 21:42:45 -07:00
Antonio ScandurraandNathan Sobo b0859d4265 Extract a Buffer::syntax_tree to sync the syntax tree with the buffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-22 12:34:35 +02:00
Antonio Scandurra c1b4cca48b Delete commented-out diff code 2021-05-22 12:34:35 +02:00
Antonio Scandurra 3a576f0b65 Don't clone visible_text for splicing edits into the parse tree 2021-05-22 12:34:35 +02:00
Antonio Scandurra 64b1113455 Restructure parsing to use edits_since 2021-05-22 12:34:35 +02:00
Antonio Scandurra 9836f1f638 Reparse buffer on undo, redo and after applying a remote operation 2021-05-22 12:34:35 +02:00
Max Brunsfeld fe8dc9fba0 Add a unit test for reparsing a buffer 2021-05-22 12:34:35 +02:00
Max Brunsfeld 46e6b2cff4 Start maintaining a syntax tree on buffers 2021-05-22 12:34:35 +02:00
Max BrunsfeldAntonio ScandurraNathan Sobo
 		2f378be1a8 Introduce LanguageRegistry object 
* Include it, along with settings in `OpenParams` grouped under a new struct called `AppState`

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-22 12:34:35 +02:00
Antonio ScandurraandNathan Sobo b42f5142f7 Rename rightmost_{row,chars} to longest_{row,chars} 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-20 16:32:09 +02:00
Antonio Scandurra 6a0757ebf9 Don't store rightmost row/char-column as a Point 2021-05-20 12:52:58 +02:00
Antonio Scandurra 96538354b3 Express rightmost_point in terms of chars as opposed to bytes 2021-05-20 12:47:08 +02:00
Max BrunsfeldandAntonio Scandurra 510f20411a Get cursor movement working with byte columns 
Introduce `clip_point` and `clip_offset` methods on `Rope`, `Buffer`, and `FoldMap`.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-05-20 12:47:08 +02:00
Max BrunsfeldandNathan Sobo 6621b9b552 Expand tabs correctly with multibyte characters 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-20 12:47:08 +02:00
Max Brunsfeld a9583d0074 Introduce FoldMapSnapshot::chunks_at, use it in FoldMap::text 
Get the FoldMap randomized tests passing. This also required adding
a test-only FoldMap::prev_char_boundary method.
 2021-05-20 12:47:08 +02:00
Max Brunsfeld 72b98ad688 Get buffer tests passing after switching to byte coordinates 2021-05-20 12:47:08 +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 781aa92f26 Don't summarize unnecessary information when resolving anchor 2021-05-18 17:34:28 +02:00
Antonio Scandurra 76a74e431e Introduce rope::Cursor::summary to avoid slicing only to get a summary 
This also deletes `Rope::slice`, as it's just a convenience method that
can be easily re-implemented by using the cursor.
 2021-05-15 11:29:48 +02:00
Max Brunsfeld e860cacb9f Get randomized tests passing in the presence of multibyte chars 2021-05-14 17:45:16 -07:00
Max Brunsfeld 614e96b957 Clarify how the ropes are kept consistent with the fragments 2021-05-14 14:48:19 -07:00
Max Brunsfeld fc2533555c Remove inline assertions about RopeBuilder invariants 2021-05-14 14:07:25 -07:00
Max BrunsfeldandNathan Sobo 79c91de2f4 Get tests passing with RopeBuilder 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-14 12:47:19 -07:00
Nathan Sobo cba8603335 WIP 2021-05-14 10:58:02 -06:00
Antonio ScandurraandNathan Sobo 2cdf315d95 WIP: Replace ropey with our own Rope 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-14 18:30:47 +02:00
Antonio Scandurra e48973f75a Start on a SumTree-based Rope implementation 2021-05-14 11:33:39 +02:00
Max BrunsfeldandNathan Sobo 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 ScandurraMax BrunsfeldNathan Sobo
 		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 ScandurraandMax Brunsfeld 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 ScandurraandMax Brunsfeld 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 ScandurraandNathan Sobo 0e9441e5cd WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-05-13 18:35:48 +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 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 BrunsfeldandAntonio Scandurra 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 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
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 SoboandMax Brunsfeld 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 1c2b381f74 Use gpui::test macro for synchronous tests in zed 2021-05-12 17:18:23 +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 ScandurraandNathan Sobo 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 ScandurraandNathan Sobo 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