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
2140 commits 489 branches 806 tags 270 MiB
Commit graph

228 commits

Author SHA1 Message Date
Max Brunsfeld
bf9daf1529 Allow left-biased anchors at the beginnings of excerpts 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-12-14 09:58:28 -08:00
Antonio Scandurra
358a6ff66c Implement MultiBufferSnapshot::contains_str_at 2021-12-14 17:51:14 +01:00
Antonio Scandurra
08e9f3e1e3 Maintain a different undo/redo stack in MultiBuffer 
This only applies to singleton mode.
 2021-12-14 17:43:41 +01:00
Antonio Scandurra
119d44caf7 Remove test-only transaction_group_interval method from MultiBuffer 2021-12-14 14:19:04 +01:00
Antonio Scandurra
2d1ff8f606 Clip anchors created on MultiBuffer's trailing newlines or headers 2021-12-14 12:29:05 +01:00
Antonio Scandurra
1b67f19edc Implement MultiBuffer::set_active_selections 2021-12-14 12:13:19 +01:00
Antonio Scandurra
163ce95171 Implement MultiBufferSnapshot::remote_selections_in_range 2021-12-14 11:34:26 +01:00
Antonio Scandurra
174b37cdf0 Assume all excerpts in the multi buffer have the same language for now 2021-12-14 11:33:53 +01:00
Antonio Scandurra
04ffca95c6 Keep a separate diagnostic update count and parse count in MultiBuffer 2021-12-14 11:32:49 +01:00
Max Brunsfeld
4efdc53d9f WIP 2021-12-13 17:44:20 -08:00
Max Brunsfeld
52b8e3d1a2 Get tests passing after diagnostic + selection changes 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 11:34:56 -08:00
Antonio Scandurra
85674ba506 WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 16:46:35 +01:00
Antonio Scandurra
6645e2820c First attempt at implementing MultiBuffer::edit_internal 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-13 15:43:26 +01:00
Antonio Scandurra
c984b39aaa Show remote collaborators' active selections 2021-12-13 11:38:38 +01:00
Nathan Sobo
cdbcbdfe6d Test undo/redo at editor layer, including selection restoration 2021-12-12 15:04:19 -07:00
Nathan Sobo
44cd0be068 Restore selections upon undo/redo of edits performed in the current editor 2021-12-12 14:12:03 -07:00
Nathan Sobo
1e7184ea07 Get selections rendering again when local selections are owned by Editor 2021-12-11 13:42:46 -07:00
Nathan Sobo
4dd0752e80 More messy progress towards selections in editors 2021-12-11 00:29:34 -07:00
Nathan Sobo
f5c775fcd1 WIP 2021-12-10 22:16:39 -07:00
Nathan Sobo
8432daef6a WIP: Start on removing selections from buffer in favor of editor 2021-12-10 19:23:34 -07:00
Nathan Sobo
f35c419f43 Return optional transaction ids from undo/redo 
This will allow the editor to restore selections that it associated with the start or end of a transaction.
 2021-12-10 18:08:26 -07:00
Nathan Sobo
77defe6e28 Return optional transaction ids when starting/ending a transaction 
If the transaction was nested, we return None. Otherwise we return the transaction id in preparation for editors to maintain their own selection state.
 2021-12-10 18:00:09 -07:00
Nathan Sobo
c8b43e3078 Move multi_buffer to editor crate 2021-12-10 17:37:53 -07:00
Max Brunsfeld
6caf016df9 Get tests passing w/ multibuffer in editor 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 15:54:25 -08:00
Max Brunsfeld
a758bd4f8d Fill in some missing methods on MultiBuffer, MultiBufferSnapshot 2021-12-10 14:27:04 -08:00
Antonio Scandurra
5b31c1ba4e Start making MultiBuffer work with a singleton buffer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 18:04:11 +01:00
Antonio Scandurra
7524974f19 Get everything compiling again 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 17:15:16 +01:00
Antonio Scandurra
da09247e5e WIP 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-10 16:14:12 +01:00
Max Brunsfeld
5e516f59c0 Merge branch 'fragment-locators' into HEAD 2021-12-09 14:49:04 -08:00
Antonio Scandurra
91a7bbbba2 Fix some of the diagnostic tests and make DiagnosticEntry generic 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:53:08 +01:00
Antonio Scandurra
65711b2256 Remove anchor collections 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-09 17:28:27 +01:00
Nathan Sobo
4ee404a0af Take a cx in MultiBuffer::start_transaction 2021-12-08 19:30:52 -07:00
Nathan Sobo
87d16c271e Get Editor compiling with MultiBuffer as its buffer 
There's a bunch of unimplemented methods in MultiBuffer, but everything compiles.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-08 19:23:04 -07:00
Max Brunsfeld
5f8e406c18 Fill out ExcerptList API 
This restores the improvements that we had made on the `project-diagnostics-generic` branch.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-08 10:04:22 -08:00
Antonio Scandurra
a88cff4fa0 Remove lifetime parameter from TextDimension trait 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-12-08 09:45:57 -08:00
Max Brunsfeld
6a44a7448e Consolidate Edit types in editor crate 2021-12-08 09:33:55 -08:00
Max Brunsfeld
fa379885f1 Give more specific names to all snapshot and text iterator types 2021-12-08 09:24:00 -08:00
Antonio Scandurra
8f90d42723 Merge branch 'main' into project-diagnostics 2021-12-06 09:39:03 +01:00
Max Brunsfeld
026c3476db Upgrade tree-sitter to 0.20.1 2021-12-05 21:37:08 -08:00
Nathan Sobo
811696670a Start on a new FragmentList 
Here I'm exploring a new approach to the project-wide diagnostics view that can exactly mirror the contents of cargo check. The `FragmentList` composes an arbitrary list of fragments from other buffers and presents them as if they were a single buffer.
 2021-12-04 06:57:56 -07:00
Nathan Sobo
5ae46709b0 Fix alignment of blocks adjacent to other blocks 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-01 17:58:44 -07:00
Nathan Sobo
ee693a8d2b Get all tests passing with new blocks API 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-01 17:52:34 -07:00
Nathan Sobo
512a10b037 Use new BlockMap API to render diagnostics 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-12-01 17:22:40 -07:00
Max Brunsfeld
0c714210ff Start work on generalizing the BlockMap to allow arbitrary elements 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-01 15:25:55 -08:00
Antonio Scandurra
733e0cb21b Use the new buffer subscription API to keep DisplayMap in sync 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-01 16:08:53 +01:00
Antonio Scandurra
3b536f153f Introduce text::Buffer::subscribe 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-12-01 15:55:05 +01:00
Antonio Scandurra
47c467dafc Bump FoldMap's version in FoldMap::sync (and not in DisplayMap) 2021-12-01 12:05:02 +01:00
Max Brunsfeld
faba276fdc WIP - maintain foldmap with Buffer::edits_since 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-11-30 17:23:02 -08:00
Max Brunsfeld
924e1578ea Use &Snapshot directly instead of impl Into<Content<'a>> 
The text::Buffer and its snapshot already used the same representation
for their content, so we can just make Buffer deref to a Snapshot.
 2021-11-30 13:32:11 -08:00
Nathan Sobo
1445ce10b5 Name the root file of every crate after the crate to ease navigation 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-11-30 12:46:39 -07:00