Commit Graph
1594 Commits
Author SHA1 Message Date
Max Brunsfeld 85ba7d512a Merge pull request #2035 from zed-industries/always-auto-indent-block-on-paste
Always auto-indent in block-wise mode when pasting
2023-01-17 10:24:41 -08:00
Antonio Scandurra e2ecfdc72d Relay saved version metadata to ensure buffers modified state converges 2023-01-17 16:32:54 +01:00
Antonio Scandurra 26e3920cbd Include saved mtime and fingerprint when serializing buffers
This still doesn't include:

- An assertion in the randomized test to ensure buffers are not spuriously
marked as modified
- Sending an update when synchronizing buffers after a reconnection
2023-01-17 10:46:19 +01:00
Max Brunsfeld d6cf69a56c Add a test for block-wise auto-indent without original indent info 2023-01-16 18:06:58 -08:00
Max Brunsfeld ab5c9fb038 Always auto-indent in block-wise mode when pasting
If the text was copied outside of Zed, so the original indent column is unknown,
then act as if the first line was copied in its entirety.
2023-01-16 17:42:06 -08:00
Antonio Scandurra 97c1c1cc6c Make Buffer::diff_base available outside of tests 2023-01-08 09:36:58 -07:00
Nathan Sobo ce223e88fe Fix tests that failed due to defaulting the grouping interval to zero in tests 2023-01-06 17:56:21 -07:00
Max BrunsfeldandNathan Sobo c07f90cb54 Assert that buffers' file state matches in randomized collab test
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-12-21 15:38:44 -08:00
Antonio Scandurra 55c5989abc Synchronize buffers when either the host or a guest reconnects 2022-12-21 14:20:56 +01:00
Julia 6fb3bad2e8 Merge pull request #1983 from zed-industries/multi-buffer-git-gutter
Multi buffer git gutter
2022-12-19 10:53:42 -05:00
JuliaandMax Brunsfeld 48c0db49da Rewrite multi-buffer aware git hunks in range to be more correct
Less ad-hoc state tracking, rely more on values provided by the
underlying data

Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-12-15 17:09:09 -05:00
Julia c0c47139aa Get tests building again 2022-12-15 00:17:28 -05:00
Julia d100acd3b1 Initial hacky displaying of git gutter in multi-buffers 2022-12-13 12:35:58 -05:00
Max Brunsfeld 80f0d19ed7 Send full multibuffer anchors to following peers 2022-11-28 18:00:38 -08:00
Max Brunsfeld e16439ad2b Merge pull request #1912 from zed-industries/matching-brackets-must-contain-range
Fix enclosing-bracket bug that appeared in JS for loops
2022-11-23 13:44:48 -08:00
Max Brunsfeld 2c14c1a0ce Fix enclosing-bracket bug that appeared in JS for loops
Previously, we were relying on the tree-sitter query's range restriction to
avoid returning brackets that did not contain the given range. But the
query's range restriction only guarantees that we don't descend into parent
nodes unless they intersect the range.
2022-11-23 13:37:22 -08:00
Julia 10927128bd Bump protocol version back down as proto changes are non-breaking 2022-11-23 13:40:49 -05:00
JuliaandMax Brunsfeld dde8f8e781 Clip diagnostic range before and during empty range expansion
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-11-23 13:21:05 -05:00
Julia 06895033f3 Fixup compile errors 2022-11-22 02:49:47 -05:00
Julia 475e37d4cf Wrap a bunch of traits for Unclipped<T> 2022-11-21 15:58:44 -05:00
JuliaandMax Brunsfeld 0b63261fb8 Start adding concept of Unclipped text coordinates
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-11-21 15:48:25 -05:00
Julia 1837b188d2 Clamp for all UTF-16 to offset conversions which used to use ToOffset 2022-11-21 14:25:01 -05:00
Max Brunsfeld d3a588533f Add LspAdapter hook for processing completions, fix completion sorting from Pyright 2022-11-17 15:26:46 -08:00
Max Brunsfeld b395c72047 Use a longer example text in random combined injections test 2022-11-14 16:56:21 -08:00
Max Brunsfeld 7e96dddb53 SyntaxMap - Don't ignore deletions at the boundaries of layers 2022-11-11 16:43:57 -08:00
Max Brunsfeld 791142ab59 Fix boundary condition where injection was not found after an edit 2022-11-10 17:04:40 -08:00
Max Brunsfeld ab63f71a20 Add randomized test for syntax map with combined injections 2022-11-08 11:29:23 -08:00
Max Brunsfeld 9e9f1727ed Rename some sum_tree seek targets in SyntaxMap 2022-11-08 10:36:44 -08:00
Max Brunsfeld 784629a00e Fix panic in handling edits to combined injections 2022-11-07 17:32:15 -08:00
62177c70ff Get combined injections basically working
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2022-11-07 16:58:12 -08:00
Max Brunsfeld 06427afdc7 Start work on handling combined injections in SyntaxMap 2022-11-07 14:45:17 -08:00
Max Brunsfeld 2b6021fa29 Start work on ERB language support 2022-11-04 09:33:59 -07:00
Max BrunsfeldandKay Simmons a491a27b62 Add basic support for ruby
Co-authored-by: Kay Simmons <kay@zed.dev>
2022-11-03 15:52:33 -07:00
Julia 93d7f4d262 Merge pull request #1800 from zed-industries/go-to-diff-hunk
Add action to go to next/previous git diff in editor
2022-10-31 14:38:52 -04:00
Max Brunsfeld 4df8c58951 Fix panic when hitting tab at the beginning of a line with mixed tab/space indent 2022-10-31 10:51:20 -07:00
Julia 985758426d Add test for go-to hunk and fix discovered bugs 2022-10-28 15:08:13 -04:00
JuliaandKay Simmons 412c77460e Add action to go to next/previous git diff in editor
Co-Authored-By: Kay Simmons <kay@zed.dev>
2022-10-28 15:08:13 -04:00
Antonio Scandurra 8325be5b10 Show shared screen as a pane item 2022-10-24 10:04:08 +02:00
Mikayla Maki c59df65e85 Merge branch 'main' into breadcrumbs 2022-10-17 16:51:38 -07:00
K Simmons 55b9eff3df Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Mikayla Maki f23f3ad9f8 fixed a bug where files outside of the project would show 'untitled' in the search bar 2022-10-17 12:58:48 -07:00
Max Brunsfeld a2c9a67558 Re-export basic text types from text and language crates
Also avoid production dependencies on fs and rope in collab
2022-10-12 15:48:19 -07:00
Antonio Scandurra ff0f0c94f3 Clear auto-indent requests if they couldn't be computed 2022-10-12 10:53:44 +02:00
Mikayla Maki a2a958ccdc Moved settings_file.rs into settings crate. Should be ready to start now :D 2022-10-11 16:03:38 -07:00
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
JuliaandJoseph Lyons 9905d9833c Reset buffer git diff when setting diff base to None
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
2022-10-07 15:37:37 -04:00
Max Brunsfeld 20f22f78e4 Rename language::tests -> language::buffer_tests 2022-10-06 13:32:49 -07:00
Max Brunsfeld 260e5e66e8 Apply buffer diff edits as a single batch 2022-10-06 11:54:28 -07:00
Max Brunsfeld 428e05a5fa Merge pull request #1404 from zed-industries/html-support
Basic html support
2022-10-06 10:32:44 -07:00
Max Brunsfeld 62b9331c6f Add a test for multi-language auto-indent 2022-10-05 17:59:31 -07:00