Commit Graph
255 Commits
Author SHA1 Message Date
Max Brunsfeld 853c34fdfb Merge pull request #2187 from zed-industries/save-untitled-buffer-bugs
Fix newly-discovered bugs in saving untitled buffers
2023-02-20 10:05:58 -08:00
Kay Simmons 15cd99c013 Fix failing test 2023-02-17 22:00:39 -08:00
Max Brunsfeld 61d5482bd5 Start work on making save and save_as code paths more similar 2023-02-17 15:52:13 -08:00
Kay Simmons 327c58fdc3 fix vim percent motion to better match the docs and observed behavior 2023-02-17 14:55:19 -08:00
Kay Simmons 3e152b5d33 wip 2023-02-16 12:23:45 -08:00
Kay Simmons 66b98aa2cc fix comment typo 2023-02-15 14:11:00 -08:00
Kay Simmons 6f1c04827f use more predictable rules for selecting which bracket to jump to and where 2023-02-15 14:04:16 -08:00
Max BrunsfeldandJulia Risley b3dc191963 Implement scope-specific bracket matching and comment toggling
Co-authored-by: Julia Risley <julia@zed.dev>
2023-01-19 15:04:27 -08:00
Max BrunsfeldandJulia Risley 786ff5ab05 Start work on language config overrides
Co-authored-by: Julia Risley <julia@zed.dev>
2023-01-19 12:32:08 -08:00
Antonio Scandurra 89ccd53f33 Merge branch 'main' into optimize-large-multi-buffers 2023-01-19 16:18:21 +01:00
Antonio Scandurra 33f4c816d5 Add test for stream_excerpts_with_context_lines 2023-01-19 15:54:32 +01:00
Antonio Scandurra f6c378366f Introduce MultiBuffer::stream_excerpts_with_context_lines
This allows us to push excerpts in a streaming fashion without blocking
the main thread.
2023-01-19 15:42:14 +01:00
Max Brunsfeld c0730db60e Replace MultiBuffer::files with ::for_each_buffer 2023-01-17 16:16:44 -08: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
JuliaandNathan Sobo da9a238d26 Handle reversed=true for multi-buffer git-hunks-in-range iteration
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2022-12-15 18:17:32 -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 9f81f1f5c7 Clamp end of visual git hunk to requested range 2022-12-13 13:58:50 -05:00
Julia 4c2ee3d972 Cleanup 2022-12-13 12:35:58 -05:00
Julia d100acd3b1 Initial hacky displaying of git gutter in multi-buffers 2022-12-13 12:35:58 -05:00
Max Brunsfeld ce0c9a8dd4 Start work on following in multi-buffers 2022-11-29 14:50:43 -08:00
Max Brunsfeld 80f0d19ed7 Send full multibuffer anchors to following peers 2022-11-28 18:00:38 -08:00
Max Brunsfeld 6d9d5f0c52 Emit events from a multibuffer when adding/removing excerpts 2022-11-28 17:57:55 -08:00
Max Brunsfeld 38699bcbb0 Implement Copy for multibuffer anchors 2022-11-28 14:18:49 -08:00
Max Brunsfeld 883d683ee8 Add a layer of indirection between excerpt ids and locators 2022-11-28 14:18:49 -08:00
Julia 10927128bd Bump protocol version back down as proto changes are non-breaking 2022-11-23 13:40:49 -05:00
Julia 06895033f3 Fixup compile errors 2022-11-22 02:49:47 -05:00
Julia c4eca8274a Rename clamped -> clipped 2022-11-21 15:23:00 -05:00
Julia 1ca040ee67 Clamp UTF-16 to point conversions 2022-11-21 14:25:01 -05: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
K Simmons 55b9eff3df Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Julia a2e05e3a47 Merge pull request #1768 from zed-industries/git-gutter-meets-code-folding
Git gutter meets code folding (and word wrap fixes)
2022-10-17 14:51:47 -04:00
Julia 7abe6bfd4a Use correct range to get diff hunks in the presence of wrapped lines 2022-10-13 13:52:44 -04: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
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -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 225f341f0a Derive indent size from the language at the cursor when auto-indenting 2022-10-05 17:07:35 -07:00
Max Brunsfeld fb39256ee5 Remove last usages of MultiBufferSnapshot::language 2022-10-05 14:44:34 -07:00
JuliaandMikayla Maki 1da2b63b97 Move git related things into specialized git crate
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 51d8a04748 WIP Notifying buffers of head text change
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Julia 3eadb80c9a Fully qualify outside git-related code when a diff is a git diff 2022-09-29 13:16:02 -04:00
Julia 8c17183c5a Changed diffs to be async and dropped git delay 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 26464ad25b Update git gutter status after debounced delay
Co-authored-by: Max Brunsfeld <max@zed.com>
2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 745b30e6e9 Start painting some sort of hunk info, it's wrong but it's close
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-09-29 13:16:01 -04:00
Max BrunsfeldandJulia Risley 09e9b4e1a1 Add Buffer::language_at, update MultiBuffer to use it
Co-authored-by: Julia Risley <floc@unpromptedtirade.com>
2022-09-28 12:32:04 -07:00
Antonio Scandurra 89b54e5272 Move operation serialization off the main thread 2022-08-23 16:34:25 +02:00
Antonio Scandurra ce4bb4e715 Stream buffer ops in the background when creating buffer for peers 2022-08-23 16:05:56 +02:00
ForLoveOfCatsandMikayla fbea44bc5c One big cleanup pass of clippy lints
Co-authored-by: Mikayla <mikayla@zed.dev>
2022-08-10 16:51:01 -07:00