Commit Graph
758 Commits
Author SHA1 Message Date
0a40cfac9f Compare anchors via their fragment and their offset within it
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2021-06-01 11:52:42 -07:00
Antonio Scandurra 5e16e7e11c WIP: Compare anchors without using FragmentId 2021-06-01 17:54:58 +02:00
Antonio Scandurra f2468d0984 Pull up VersionedOffset 2021-06-01 16:57:03 +02:00
Antonio Scandurra dea3208ede Fix randomized tests for concurrent edits 2021-06-01 16:54:02 +02:00
Antonio Scandurra 82d7c2a977 Implement anchors using an offset + a version vector 2021-06-01 15:28:20 +02:00
Antonio Scandurra 6d3bdcd3e5 Supply a context when adding summary to Dimension 2021-06-01 12:50:10 +02:00
Nathan Sobo 9204d55dda Add RPC implementation details to the collaboration plan 2021-05-31 17:40:39 -06:00
Max BrunsfeldandNathan Sobo f34127ad1b Add document outlining plans for collaboration
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-05-31 15:31:57 -07:00
Antonio Scandurra f1f67c30d7 WIP 2021-05-31 16:57:15 +02:00
Antonio Scandurra d4b54d3fe1 Merge pull request #77 from zed-industries/merge-selections-larger-syntax-node
Merge selections correctly when selecting larger syntax node
2021-05-31 16:55:21 +02:00
Antonio Scandurra c8fa82d5f1 Merge pull request #78 from zed-industries/fewer-calls-to-add-summary
Avoid calling `add_summary` twice in `sum_tree::Cursor`
2021-05-31 16:55:03 +02:00
Antonio Scandurra b24743dad9 Fix tests 2021-05-31 16:51:33 +02:00
Antonio Scandurra 7fff08de91 Avoid calling add_summary twice in sum_tree::Cursor
As I was looking into `SumTree` for the upcoming round of changes to the
buffer, I noticed that we were inadvertently adding summaries twice
every time we skipped over a node in the tree.

This is a pretty heavy code path that's pretty ubiquitous in the
codebase, so this commit gets rid of the unnecessary addition.
2021-05-31 16:45:57 +02:00
Antonio Scandurra 3e37aded94 Merge selections correctly when selecting larger syntax node
When running this command with multiple cursors, if one of them was at a
later position in the buffer but lying on a shallower node, it could
happen that its start could move prior to cursors that were before it
but lying on a deeper node.

This could cause the selection merging algorithm to mistakenly keep some
selections even if they overlapped. With this commit we now sort
selections prior to merging them in `Editor::select_larger_syntax_node`.
2021-05-31 16:33:26 +02:00
Nathan Sobo 5d3a2c9925 Add more emacs-inspired bindings
Word-wise movement and columnar selection without reaching for the arrows.
2021-05-29 12:06:52 -06:00
Max Brunsfeld cd0f9bd94e Fix error when running workspace:open command 2021-05-28 16:34:28 -07:00
Nathan Sobo bcc24a9e50 Merge pull request #75 from zed-industries/naming-cleanup
Clean up naming conventions project-wide
2021-05-28 16:42:20 -06:00
Max Brunsfeld 5203f8af1c Rename context parameters to cx in gpui 2021-05-28 15:32:35 -07:00
Max Brunsfeld cbeefad159 Rename context parameters to cx in sum_tree 2021-05-28 15:32:24 -07:00
Max Brunsfeld e2b6a05dec Rename context parameters to cx in main.rs 2021-05-28 15:10:39 -07:00
Max Brunsfeld 824a8c25bf Rename context parameters to cx in pane.rs 2021-05-28 15:09:52 -07:00
Max Brunsfeld 69b466d27c Rename context parameters to cx in fold_map.rs 2021-05-28 15:08:38 -07:00
Max Brunsfeld 64eb30f21f Rename context parameters to cx in selection.rs 2021-05-28 15:06:58 -07:00
Max Brunsfeld 9f8531e497 Rename context parameters to cx in movement.rs 2021-05-28 15:06:32 -07:00
Max Brunsfeld fd479db3df Rename context parameters to cx in editor/element.rs 2021-05-28 15:05:46 -07:00
Max Brunsfeld f7e69eb2b7 Rename context parameters to cx in display_map.rs 2021-05-28 15:04:34 -07:00
Max Brunsfeld ed99cb2cb6 Rename context parameters to cx in buffer.rs 2021-05-28 15:03:13 -07:00
Max Brunsfeld e20e8a2e33 Rename context parameters to cx in worktree.rs 2021-05-28 15:01:35 -07:00
Max Brunsfeld 3dc752d6c6 Rename context parameters to cx in workspace.rs 2021-05-28 14:59:24 -07:00
Max Brunsfeld 82a6291562 Rename context parameters to cx in file_finder.rs 2021-05-28 14:56:44 -07:00
Max Brunsfeld 3f73c937b3 Rename context parameters to cx in editor.rs 2021-05-28 14:56:38 -07:00
Max BrunsfeldandNathan Sobo ace298518e Rename BufferView -> Editor
* BufferElement -> EditorElement

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-05-28 14:41:58 -07:00
Max BrunsfeldandNathan Sobo a82d25e5dd Rename foo/mod.rs files too foo.rs
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-05-28 14:41:58 -07:00
Max Brunsfeld dca74cf2f0 Merge pull request #73 from zed-industries/grammars-cursor
Initial syntax support
2021-05-28 14:40:14 -07:00
Max BrunsfeldandNathan Sobo 6411acb855 Bump Tree-sitter
Pass ranges to `set_byte_range`, `set_point_range`

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-05-28 14:25:30 -07:00
Max BrunsfeldandNathan Sobo 6243f6ee6f Implement bracket matching using queries
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2021-05-28 13:09:57 -07:00
Nathan Sobo 3032fbd2fa Implement buffer::move_to_enclosing_bracket 2021-05-28 12:07:30 -06:00
Antonio Scandurra 76aaa52b57 WIP 2021-05-28 19:41:13 +02:00
111a95e06e Add Buffer::enclosing_bracket_ranges
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2021-05-28 19:35:04 +02:00
Antonio Scandurra 4034bc6b0f Delete stale indents.scm file 2021-05-28 15:11:54 +02:00
Antonio Scandurra 510e55a8f7 Add unit test for BufferView::select_{larger,smaller}_syntax_node 2021-05-28 14:59:29 +02:00
Antonio Scandurra 32d1c09dc7 💄 2021-05-28 13:36:20 +02:00
Antonio Scandurra 22d33256fb Implement select-smaller-syntax-node for buffer 2021-05-28 13:35:21 +02:00
Antonio Scandurra 118e85fff7 Implement select_larger_syntax_node for buffer 2021-05-28 13:25:09 +02:00
Antonio Scandurra 722a912ab5 Acquire and release QueryCursors via a QueryCursorHandle 2021-05-28 11:48:49 +02:00
Antonio Scandurra def3bb1bfb Punt on auto-indentation for now 2021-05-28 10:17:10 +02:00
Max Brunsfeld fd82a522db WIP - new approach to autoindent
- Indent one row at a time.
- Consider only the innermost match.
2021-05-27 15:05:19 -07:00
Max BrunsfeldandAntonio Scandurra a6b5a94ab7 Reset QueryCursors before putting them back in the pool
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2021-05-27 09:37:17 -07:00
Antonio Scandurra 8effdacad3 Fix panic in autoindent_for_rows caused by overshooting row range 2021-05-27 18:23:32 +02:00
Antonio Scandurra 1e156bb01c WIP: Print autoindents on tab 2021-05-27 18:22:33 +02:00