yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,594 Commits 5 Branches 0 Tags
c46bb384ffdc111cf0d0a2e9776fac74e4391cdf
Commit Graph
496 Commits
Author SHA1 Message Date
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
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 30cf42d108 Finish generalizing ToggleComments to support block comments 2022-10-05 12:25:32 -07:00
Max Brunsfeld 2a70aa2499 Start work on toggling block comments for HTML 2022-10-04 17:27:03 -07:00
Max Brunsfeld b2af17d4e6 Add assertions to test for autoclose with embedded languages 2022-10-03 13:24:37 -07:00
JuliaandMikayla Maki 0615592f81 Rename head text to indicate that it's not always going to be from head 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-03 15:11:06 -04:00
JuliaMax BrunsfeldMikayla Maki
 		c15e29be64 WIP Start refactoring separation of concerns for repo metadata 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-30 18:25:25 -04:00
JuliaMikayla MakiMax Brunsfeld
 		484bdb0fc0 Start a test for remote git data updating 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-09-30 15:51:32 -04:00
Mikayla Maki ab3f820edc WIP, re-doing fs and fake git repos 2022-09-29 13:16:02 -04: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
Julia 5527234e06 Build again 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
JuliaandMikayla Maki f53a544038 Avoid racing git diffs & allow for "as fast as possible" diff updating 
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 9d777c74f2 Perform initial file load git diff async 2022-09-29 13:16:02 -04:00
Julia 6d23cbedc2 Properly invalidate when async git diff completes 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
Julia 203d0b2770 Track buffer row divergence while iterating through diff lines 
This allows for offsetting head row index of deleted lines to normalize
into buffer row space
 2022-09-29 13:16:02 -04:00
Julia ddeb59c3f3 Use row range while building buffer range during diff line iteration 2022-09-29 13:16:02 -04:00
Julia a5e049ec09 Reorganize for for purely file level invalidation 2022-09-29 13:16:02 -04:00
Julia 9cb5f7e323 Clear out commented code & once again perform full file diff on update 2022-09-29 13:16:02 -04:00
Julia 984f7052b2 Handle deletions more robustly and correctly 2022-09-29 13:16:02 -04:00
Julia ba0108b6ba Small clean 2022-09-29 13:16:02 -04:00
Julia 440a9aab5e buffer_divergence doesn't seem to be a concept that needs to be tracked 2022-09-29 13:16:02 -04:00
Julia ecc700e9d0 Checkpoint preparing for a more organized approach to incremental diff 2022-09-29 13:16:02 -04:00
Julia eb8c304418 Move diff logic back into BufferDiff::update 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 343a34df74 Switch head range from row range to byte offset range 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-09-29 13:16:02 -04:00
JuliaandMax Brunsfeld 60bff07555 Move cloneable diff state into new snapshot type 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-09-29 13:16:02 -04:00
Julia 1853e15a73 Checkpoint on incremental diff sumtree shenanigans 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
Julia d05e7a0b5b Correct start/end of git diff hunks 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
ForLoveOfCats d7fbe9b084 Load a file's head text on file load just to get started 2022-09-29 13:16:01 -04:00
Max Brunsfeld be3f274785 Make Buffer::language_at fall back to Buffer::language 
For languages with no grammar (plain text), there
will be no layers.
 2022-09-28 13:38:54 -07: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
Max Brunsfeld 28356223a5 Tweak HTML indents and highlights 2022-09-28 12:32:04 -07:00
Max Brunsfeld ed323dbfd9 Fix crash when querying for enclosing brackets at EOF 2022-09-02 10:23:46 -07:00
Mikayla Maki 4e3db12e8e Finished terminal search 2022-09-01 13:45:46 -07:00
Max Brunsfeld 13cf937778 Merge pull request #1559 from zed-industries/language-injection 
Add language injection support
 2022-08-30 11:54:00 -07:00