mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-25 01:34:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
1879 commits 770 branches 798 tags 246 MiB
Commit graph

1879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathan Sobo
6ba4af3e26 WIP: Start converting SelectionSet to use AnchorRangeMap 2021-10-22 13:19:19 -06:00
Nathan Sobo
3ae5ba09fd Implement TryFrom<proto::SelectionSet> on SelectionSet 
More prep work for changing the selection set representation.
 2021-10-22 12:46:02 -06:00
Nathan Sobo
401bdf0ba1 Simplify protocol messages related to selection sets 
This prepares the way to switch to using AnchorRangeMaps to store and transmit selection sets.
 2021-10-22 12:35:29 -06:00
Nathan Sobo
087ff28d0d Move SelectionSet and Into impl to selection module 2021-10-22 09:56:47 +02:00
Antonio Scandurra
715faaaceb WIP 2021-10-21 19:27:10 +02:00
Antonio Scandurra
2c6aeaed7c Start on integrating rust-analyzer 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-10-21 16:26:37 +02:00
Max Brunsfeld
559774d6ac
Merge pull request #213 from zed-industries/language-buffer 
Extract Buffer's language-aware behavior into a new `language` crate
 2021-10-21 13:22:04 +02:00
Max Brunsfeld
282195b13e Assign new file handles on buffers when their files change on disk 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-21 13:08:54 +02:00
Max Brunsfeld
eb9d7c8660 Update buffer's saved mtime when file is reloaded after on-disk change 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-21 12:05:44 +02:00
Max Brunsfeld
eea0f35d38 Rename TextBuffer back to Buffer 2021-10-21 11:12:19 +02:00
Max Brunsfeld
37eae2ba67 Remove unnecessary dependencies in buffer and language crates 2021-10-21 09:40:50 +02:00
Max Brunsfeld
81a85e9c79 Extract a language crate 2021-10-20 22:51:40 +02:00
Max Brunsfeld
cdb268e656 Re-enable randomized concurrent edits test 2021-10-20 21:44:26 +02:00
Max Brunsfeld
30e2e2014d Extract a TextBuffer from Buffer, which has no tree or file 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-20 00:10:57 +02:00
Nathan Sobo
76774d6a3c
Merge pull request #205 from zed-industries/autoindent 
Autoindent
 2021-10-19 14:23:04 +02:00
Nathan Sobo
5558d553bb Insert an extra newline between brackets 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2021-10-19 13:17:16 +02:00
Nate Butler
2286a94185 Make light collab cursor not yellow for Nathan ;) 2021-10-17 18:28:05 +02:00
Nathan Sobo
561857fdf2 Restore all active selections when undoing/redoing autoindent 
In the unlikely event that we're handling autoindent requests from multiple editors, we undo/redo selections from both editors. This is somewhat imperfect but probably good enough and easier than performing auto-indents on a per-editor basis.
 2021-10-11 17:22:18 -06:00
Max Brunsfeld
47372e7342 Move selections explicitly when applying autoindents 2021-10-11 15:27:38 -07:00
Max Brunsfeld
63e775eb4c Add unit tests for selective indentation adjustment 2021-10-11 13:02:01 -07:00
Max Brunsfeld
6dc9d3ac19 Move buffer tests into their own file 2021-10-11 12:18:31 -07:00
Max Brunsfeld
53f1078119 Ensure that autoindent task yields frequently to respect cancellation 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-11 11:25:15 -07:00
Antonio Scandurra
28ffd750ce WIP: Determine autoindents asynchronously 
We still need to insert yield points in `compute_autoindents`.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-11 18:00:48 +02:00
Antonio Scandurra
7f5d454b2d Fix creation of anchors for the inserted portion of an edit 2021-10-11 13:08:50 +02:00
Antonio Scandurra
b43c78053b Always use seek_forward when resolving anchors 2021-10-11 09:37:21 +02:00
Nathan Sobo
6531df2368 Improve auto-indenting of inserted lines 
Still not working totally correctly with our new approach, but getting closer.
 2021-10-08 22:07:01 -06:00
Max Brunsfeld
e78a5642fa Start on new way of comparing old and new indent suggestions 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-08 16:54:27 -07:00
Nathan Sobo
b85ae89b7e Extend Rust where clauses past their final newline for indentation 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-10-08 10:32:15 -06:00
Nathan Sobo
810315e04c Don't request auto-indent if there is no language assigned on the buffer 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-10-08 10:25:16 -06:00
Nathan Sobo
b4680144c5 Unconditionally preserve indentation when inserting newlines 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-10-08 10:25:00 -06:00
Antonio Scandurra
c60bc00c9e 💄 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-08 17:43:19 +02:00
Antonio Scandurra
f66b52239e Cancel out outdents and indents referring to the previous row 2021-10-08 12:52:48 +02:00
Antonio Scandurra
18e5d75fd3 Bias the start of an autoindent request towards the right for new text 
When a newline is inserted, this prevents the request from including
the line on which the newline got inserted.
 2021-10-08 12:15:21 +02:00
Max Brunsfeld
451f0e7adb Replace Buffer::request_autoindent API with ::edit_with_autoindent 
When computing the "previous autoindent suggestion", we can't just
use the old tree and the current text. We need to find out what the
suggestion would have been before we made any changes.
 2021-10-07 17:55:23 -07:00
Max Brunsfeld
c0a75abcd2 Preserve indentation for lines that are both indented and outdented 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-07 13:55:59 -07:00
Max Brunsfeld
d77025540a Remove no-longer-used dirty field on buffer::SyntaxTree 
This became unnecessary when we reworked our reparsing logic
to block from 1ms on each parse.
 2021-10-07 12:46:08 -07:00
Max Brunsfeld
b5d3ffb16c Fix collection of row ranges in Buffer::perform_autoindent 2021-10-07 12:43:26 -07:00
Max Brunsfeld
2f295382c4 Implement selective auto-indent by comparing old and new suggestions 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2021-10-07 10:46:40 -07:00
Antonio Scandurra
54932a8050 WIP 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-10-07 19:09:14 +02:00
Antonio Scandurra
2018537bb8 Introduce a Tab action to indent line or insert soft tabs 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-07 17:31:58 +02:00
Antonio Scandurra
d36805c464 Don't push empty transactions onto the undo stack 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-07 16:06:55 +02:00
Max Brunsfeld
77af9ef902 Add more rust indent nodes 2021-10-06 22:16:30 -07:00
Max Brunsfeld
add1467d32 Generalize strategy for processing indentation ranges 
* Take into account the ranges' start and end columns, not just the rows
* Generalize the approach to dedenting
 2021-10-06 22:16:18 -07:00
Max Brunsfeld
b83b4ad7c7 Start work on a Buffer API for requesting autoindent on the next parse 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-06 16:09:30 -07:00
Max Brunsfeld
a0c8b60a1b
Merge pull request #203 from zed-industries/autoclose-pairs 
Autoclose pairs
 2021-10-06 11:17:41 -07:00
Antonio Scandurra
724272931a Skip autoclosed pairs 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2021-10-06 19:04:55 +02:00
Antonio Scandurra
05d7e9c4e7 Start on autoclosing pairs 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2021-10-06 16:34:57 +02:00
Max Brunsfeld
3cb7ba0f57 Make the fields of buffer::Language private 2021-10-05 14:19:33 -07:00
Max Brunsfeld
0282e6f255 Add Cargo.toml features to fix compilation of individual crates 2021-10-05 14:18:04 -07:00
Max Brunsfeld
cefb90269e
Merge pull request #202 from zed-industries/crates 
Break project into crates to improve incremental compilation time
 2021-10-05 10:54:15 -07:00