oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,071 Commits 1 Branch 0 Tags
c7796331542f4355a392073e56807e1f74b532a4
Commit Graph
161 Commits
Author SHA1 Message Date
Nathan SoboandAntonio Scandurra c779633154 Make unfolding inclusive 
If the range *touches* the fold, we unfold. This was needed to fix the behavior for unfolding at the current selection position. Previously, there was some kind of translation issue that was allowing us to accidentally work the way we wanted without this.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-07-30 09:50:28 -07:00
Nathan SoboandAntonio Scandurra 38d4662a4e Only honor rightward bias for buffer points *inside* of folds 
(Not at boundaries)

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-07-30 09:50:28 -07:00
Max BrunsfeldandNathan Sobo 82ed33a924 Fix bugs in {prev,next}_row_boundary 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-30 09:50:28 -07:00
Max Brunsfeld 05f8a61bc8 Add a bias parameter when converting buffer points to fold points 2021-07-30 09:50:28 -07:00
Max BrunsfeldandNathan Sobo c1808d09ef Add randomized test for DisplayMap 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-30 09:50:28 -07:00
Antonio ScandurraNathan SoboMax Brunsfeld
 		c1a9a20ac9 Setup randomized test harness in gpui::test 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-07-30 09:50:28 -07:00
Antonio Scandurra 42e2b9ff4d Move buffer rows test into WrapMap randomized test 
Also, change the way we assert on buffer rows to reflect the fact
that we will still show the line as soft-wrapped when there is a
fold that spans multiple buffer rows.
 2021-07-30 09:50:28 -07:00
Antonio Scandurra 169a298af1 Expand edits correctly when there are folds or multi-byte chars 
Previously, we were mistakenly adding `tab_size` to the extent
produced by the fold edits but that could cause the edit to land on
a multi-byte character (like a fold or an emoji).

In practice, we only need to expand the edit's extent by 1 because
we are operating in the fold coordinate space and all we need to
convey is that we want to encapsulate the first tab next to whatever
edit has just occurred in the `FoldMap`.
 2021-07-30 09:50:28 -07:00
Antonio Scandurra e7d1af2735 Add fold mutations to randomized test for WrapMap 2021-07-30 09:50:28 -07:00
Nathan Sobo 613192974f Don't render line numbers for soft-wrapped line segments 2021-07-30 09:50:28 -07:00
Antonio ScandurraandNathan Sobo 164cafa57d Preserve indentation when soft-wrapping 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-30 09:50:28 -07:00
Antonio Scandurra 2f1a5c48d3 Use LineWrapper in a thread-local fashion 
This removes the critical section from a hot code path, yielding a 2x
speedup to rewrap an entire file.
 2021-07-30 09:50:28 -07:00
Max BrunsfeldandNathan Sobo 2dcf04cfb9 Avoid allocation in LineWrapper::wrap_line 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-30 09:50:28 -07:00
Max BrunsfeldandNathan Sobo 59bb6624e2 🐎 Avoid SumTree::update_last when wrapping lines 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-30 09:50:16 -07:00
Antonio Scandurra 9d14ca8d33 Store pending edits until applying them to a non-interpolated snapshot 2021-07-26 17:17:07 +02:00
Antonio Scandurra 1ef7474564 Change wrap width in randomized test and fix discovered bugs 2021-07-26 15:38:24 +02:00
Antonio Scandurra 0586a897ca Fix unused variable warning 2021-07-26 13:03:43 +02:00
Antonio Scandurra b647e3ee71 Make WrapMap and DisplayMap models 
This removes the need for a lock around in `WrapMap` and also removes
`WrapMap::notifications` because gpui already has a standard way of
notifying when a model updates.
 2021-07-26 13:02:31 +02:00
Antonio Scandurra b04c5741aa Set snapshot in the foreground after recomputing it in the background 2021-07-26 12:11:48 +02:00
Antonio Scandurra 0004dc6921 Remove remaining I/O nomenclature for DisplayMap coordinates 2021-07-26 11:19:36 +02:00
Nathan Sobo 61b5d66ba8 Eliminate input/output nomenclature from fold_map 
Instead, just use FoldPoint, FoldOffset, etc. We don't need the naming to be general because we know exactly which layer we're building on at each layer of the DisplayMap.
 2021-07-25 08:22:50 -06:00
Nathan Sobo da50576129 Fix remaining errors and warnings 2021-07-25 07:56:53 -06:00
Nathan Sobo 9edc8b9a06 WIP 2021-07-24 08:40:48 -06:00
Nathan Sobo 3bf47be51e WIP 2021-07-24 08:09:04 -06:00
Nathan Sobo f81f043058 WIP 2021-07-23 12:25:09 -06:00
Antonio ScandurraandNathan Sobo 14fcc26e73 Don't insert empty isomorphic transforms when interpolating 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-23 16:20:27 +02:00
Antonio ScandurraandNathan Sobo a8db06426c Get wrapping randomized test passing with wrap width as small as 0 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-23 15:58:05 +02:00
Antonio ScandurraandNathan Sobo 174a546c18 Expand tabs correctly in TabMap's highlighted chunks iterator 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-23 15:08:59 +02:00
Antonio Scandurra 416571e8e0 Fix wrap map randomized tests 2021-07-23 11:26:53 +02:00
Max Brunsfeld d61f26d03e Get randomized test compiling against new WrapMap structure 
It doesn't pass.
 2021-07-22 20:45:14 -07:00
Max Brunsfeld 53fd3a1a92 Move LineWrapper test to line_wrapper.rs 2021-07-22 20:42:18 -07:00
Max BrunsfeldandNathan Sobo 5d22c6c4bd Start restructuring WrapMap with simpler concurrency 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-22 16:21:42 -07:00
Antonio Scandurra 80f13dd737 WIP 2021-07-22 18:31:01 +02:00
Antonio Scandurra f7c8864995 Fix panic in WrapMap::highlighted_chunks_for_rows 
Also, add a unit test for `DisplayMap` with syntax highlighting when
soft wrap is on.
 2021-07-22 10:08:29 +02:00
Max Brunsfeld 830f5336b9 Start work on wrapping lines without text shaping 2021-07-21 17:50:37 -07:00
Nathan Sobo 699e558db9 Remove logging 2021-07-21 11:21:13 -06:00
Antonio ScandurraandNathan Sobo ef42d14b8c Fix WrapMap::clip_point at the end of a soft-wrapped line 
If that's the case and `Bias` is `Left` we clip to the last
character of the soft-wrapped line.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-21 18:32:32 +02:00
Antonio ScandurraandNathan Sobo 915c710f94 Ensure that we use the WrapMap where appropriate in DisplayMap 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-21 18:04:58 +02:00
Antonio ScandurraandNathan Sobo 0875a86c69 Account for the impact of edits on tab expansion 
Tab characters are expanded differently based on the column on which
they appear, which edits can affect. Thus, `TabMap::sync` will now
expand edits to the first tab that appears on the line in which the edit
occurred.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-21 17:18:15 +02:00
Antonio Scandurra 62ad97a728 Add randomized test for DisplayMap::buffer_rows and fix logic errors 2021-07-21 14:45:25 +02:00
Max BrunsfeldandNathan Sobo 72fdd3fb9a Start rendering highlighted text and line numbers via the wrap map 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-20 18:03:02 -07:00
Nathan Sobo b513df3844 WIP 2021-07-20 17:22:03 -06:00
Max Brunsfeld 07e97e6cad wip 2021-07-20 15:30:50 -07:00
Max Brunsfeld d0fdc7b5e8 Get simple unit test passing for soft-wrap in DisplayMap 2021-07-20 15:22:11 -07:00
Max BrunsfeldandNathan Sobo 7832562675 Add WrapMap as a member of DisplayMap 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-20 13:03:59 -07:00
Max BrunsfeldandNathan Sobo dbc8fc3bfa Fix assertions in fold map test 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-07-20 11:43:10 -07:00
Antonio ScandurraNathan SoboMax Brunsfeld
 		f6263768b3 WIP: interpolate edits into snapshot coming from BackgroundWrapper 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-07-20 19:21:52 +02:00
Antonio Scandurra 3d8c59af31 Implement Snapshot::interpolate 2021-07-20 14:25:56 +02:00
Antonio Scandurra b66de06d0e Ensure that WrapMap's input lines match TabMap's output lines 2021-07-20 11:30:00 +02:00
Antonio Scandurra d0113a114c Coalesce contiguous isomorphic transforms 2021-07-20 11:27:12 +02:00