Commit Graph
621 Commits
Author SHA1 Message Date
Mikayla Maki bb80bd45bf Removed debugs, simplified settings 2022-10-03 17:43:05 -07:00
Mikayla Maki b49d0e782c Fixed a couple bugs in tests and worktree path handling 2022-10-03 17:18:38 -07:00
JuliaandMikayla Maki c680a6ebbc Once again respect user settings for git gutter
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 15:42:30 -04: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
JuliaandMikayla Maki fb3c69db37 Move git gutter settings out of editor settings
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 14:53:33 -04:00
JuliaandMikayla Maki 20cff89bed Store repo content path as absolute
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 14:00:58 -04:00
Julia aaa4984ffe Be clearer about using GitFilesIncluded setting 2022-10-03 11:58:48 -04:00
Mikayla Maki da143ae46a made git diff rendering respect line wrap 2022-10-02 18:00:13 -07:00
Mikayla Maki bf215cf3c8 Added proto messages for updating the head text 2022-10-01 18:18:35 -07:00
Mikayla Maki cb189400a6 Touched up comments 2022-09-30 17:36:22 -07:00
d2ac8018bb Refactored git repository code to seperate out repository entry tracking data and git2 mocking code.
Co-authored-by: Max <max@zed.dev>
Co-authored-by: Julia <julia@zed.dev>
2022-09-30 17:33:34 -07:00
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
Julia b754c2e663 Perform git diff on remote buffer open 2022-09-30 18:05:09 -04:00
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
Julia 310975fcbc Fix test build 2022-09-30 11:13:22 -04:00
Julia d1a7dc02a2 Track index instead of head for diffs 2022-09-29 13:16:02 -04:00
Mikayla Maki 4398b2f9a4 Added test, and fix, for changed_repos method on LocalWorktree 2022-09-29 13:16:02 -04:00
Julia b1838a6a1d Don't pretend this is async 2022-09-29 13:16:02 -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 486156fd26 Update repo scan id when files under dot git dir events
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 74deb91776 Remove git repos from worktree when deleted on storage
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki a40f477416 Find repos under worktree & return correct results for repo queries
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Mikayla Maki 0199141606 Get the test to failing,,, correctly 2022-09-29 13:16:02 -04:00
Mikayla Maki 2170499ac3 Added git repository type infrastructure and moved git file system stuff into fs abstraction so we can test without touching the file system. Co-Authored-By: kay@zed.dev 2022-09-29 13:16:02 -04:00
Mikayla Maki 5deb414296 WIP - max & mikayla working on tests 2022-09-29 13:16:02 -04:00
7a52a2dde5 WIP pls amend me
Co-Authored-By: Max Brunsfeld <max@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki 39789691d5 Utilize initial file contents as head text by default
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-09-29 13:16:02 -04:00
Julia f019cfc81d Async-ify head text loading 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
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 ec18564a71 Merge branch 'main' into new-signup-flow 2022-09-27 15:35:05 -07:00
Nathan SoboandJoseph Lyons 22265e4f99 Extract db module from project to its own crate
This will let us use it from the telemetry crate.

Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-09-26 16:37:09 -06:00
Julia 884b6728a7 Backward compat format settings 2022-09-26 11:41:31 -04:00
Max Brunsfeld 81af17d294 Start work on a client-side telemetry system 2022-09-23 12:23:12 -07:00
Julia 018a737961 Add editor action to manually invoke buffer format 2022-09-22 18:21:05 -04:00
Max Brunsfeld fdc1cc2702 Avoid changing entry's kind from Dir to PendingDir in refresh_entry
When lots of filesystem changes are occurring, the filesystem event
for the directory creation may be delivered before the call to
fs::metadata resolves.
2022-08-30 16:13:07 -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
Max Brunsfeld 80ac53d83d Use SyntaxMap in Buffer 2022-08-24 13:00:27 -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
Antonio Scandurra c033206129 Default to language that started LSP when querying project symbols 2022-08-22 14:30:27 +02:00
Antonio Scandurra 2e7bfd19c1 Create buffers for remote collaborators out of band
Previously, we would use `Project::serialize_buffer_for_peer` and
`Project::deserialize_buffer` respectively in the host and in the
guest to create a new buffer or just send its ID if the host thought
the buffer had already been sent.

These methods would be called as part of other methods, such as
`Project::open_buffer_by_id` or `Project::open_buffer_for_symbol`.
However, if any of the tasks driving the futures that eventually
called `Project::deserialize_buffer` were dropped after the host
responded with the buffer state but (crucially) before the guest
deserialized it and registered it, there could be a situation where
the host thought the guest had the buffer (thus sending them just the
buffer id) and the guest would wait indefinitely.

Given how crucial this interaction is, this commit switches to creating
remote buffers for peers out of band. The host will push buffers to guests,
who will always refer to buffers via IDs and wait for the host to send them,
as opposed to including the buffer's payload as part of some other operation.
2022-08-17 11:55:36 +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
Max Brunsfeld ac140c478e Handle RPC requests for type definitions on server and host 2022-08-04 15:10:46 -07:00
ForLoveOfCats 4e5bcdc9ce Add ability to provide custom LSP server initialization options 2022-08-04 14:47:06 -04:00
Antonio Scandurra 9a1ae987f4 Fix tests 2022-08-02 18:48:17 +02:00