oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,594 Commits 1 Branch 0 Tags
cf2ec99a4dddf9fc93ef595a72c8cedd5c262003
Commit Graph
460 Commits
Author SHA1 Message Date
Antonio Scandurra bb0f6e85a8 Assign a new language when remote buffer is renamed 2022-10-26 17:52:39 +02:00
Antonio Scandurra 19adfdf8bb Match progress token's prefix to detect disk-based diagnostic progress 
The new version of rust-analyzer changed the disk-based diagnostic token
to `rust-analyzer/checkOnSave/0`. The trailing number could be different
from 0 when there are multiple Rust projects open using the same rust-analyzer
instance.

As such, with this commit we will perform a prefix match as opposed to a strict
equality check when detecting a disk-based diagnostics progress token.
 2022-10-25 11:35:59 +02:00
Mikayla Maki 1789dfb8b1 Fixed tests 2022-10-17 14:53:52 -07:00
Max BrunsfeldNathan SoboAntonio Scandurra
 		2d3d07d4d7 Clear project's shared state upon every disconnection 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
Co-authored-by: Antonio Scandurra <as-cii@zed.dev>
 2022-10-14 10:17:59 -07:00
Antonio Scandurra f28cc5ca0c Preserve buffer identity when underlying entry temporarily disappears 2022-10-13 09:10:10 +02:00
Max Brunsfeld 6cdf4e98fc 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
Max BrunsfeldandAntonio Scandurra 69dcfbb423 Send guests DiskBasedDiagnosticsFinished messages when they join a project 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2022-10-12 13:49:09 -07:00
Antonio Scandurra 9adbab5d99 Fix opening a buffer after leaving and joining the same project 
This bug existed prior to #1700 and was caused by not clearing the
buffers that were already shared with a peer that left and opened
a project using the same connection. When such peer would re-join
the project and open a buffer that it had opened previously, the
host assumed the peer had already seen that buffer and wouldn't bother
sending it again.
 2022-10-12 10:31:06 +02:00
Mikayla Maki 0beb97547e Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Antonio Scandurra afaacba41f Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
Max Brunsfeld ec76146a23 Merge pull request #1692 from zed-industries/avoid-duplicate-autoformat-edits 
Avoid duplicate autoformat edits
 2022-10-07 09:35:10 -07:00
Antonio Scandurra 386de03f46 Fix room disconnection problems when creating room and sharing project 2022-10-07 14:39:11 +02:00
Antonio Scandurra b479c8c8ba Move project sharing into Room 2022-10-07 10:14:17 +02:00
Max BrunsfeldandNathan Sobo 47a8e4222a Don't allow multiple concurrent formatting requests for the same buffer 
Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-10-06 17:03:38 -07:00
Julia 771215d254 Reload git index on file events to catch new contents 2022-10-06 12:01:21 -04:00
Julia 3f4be5521c Load diff base from correct relative path 2022-10-05 16:04:55 -04:00
Antonio Scandurra 41240351d3 Simplify Collaborator to stop including the user 
It can be retrieved from the `Room` and we're guaranteed to have
a room in order to have collaborators in a project.
 2022-10-04 18:00:54 +02:00
Mikayla Maki 6f7547d28f Fixed a couple bugs in tests and worktree path handling 2022-10-03 17:18:38 -07:00
JuliaandMikayla Maki e6487de069 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
Antonio Scandurra 6426037653 Adapt integration tests to always pass a room id to Project::share 
Randomized test is failing, so we'll look into that next.
 2022-10-03 15:44:11 +02:00
Mikayla Maki 512f817e2f Added proto messages for updating the head text 2022-10-01 18:18:35 -07:00
Mikayla MakiMaxJulia
 		af0974264c 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
Julia 42b7820dbb Perform git diff on remote buffer open 2022-09-30 18:05:09 -04:00
Antonio Scandurra 964a5d2db7 WIP: require sharing projects on a given Room 2022-09-30 18:21:47 +02:00
Antonio Scandurra 074b8f18d1 Rip out project registration and use sharing/unsharing instead 2022-09-30 12:23:57 +02:00
Antonio Scandurra be8990ea78 Remove project join requests 2022-09-30 11:35:50 +02:00
Mikayla Maki 71b2126eca WIP, re-doing fs and fake git repos 2022-09-29 13:16:02 -04:00
JuliaandMikayla Maki d5fd531743 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 7e5d49487b WIP Notifying buffers of head text change 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-29 13:16:02 -04:00
Mikayla Maki 6ac9308a03 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 0d1b2a7e46 WIP - max & mikayla working on tests 2022-09-29 13:16:02 -04:00
JuliaMax BrunsfeldMikayla Maki
 		bb8798a844 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
JuliaandMax Brunsfeld 55ca02351c 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
Antonio ScandurraandNathan Sobo 4a9bf8f4fe Introduce call infrastructure 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-09-28 11:33:38 +02:00
Max Brunsfeld 5d0b6a3da7 Merge branch 'main' into new-signup-flow 2022-09-27 15:35:05 -07:00
Nathan SoboandJoseph Lyons f0c50c1e0a 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 879a0d8b12 Backward compat format settings 2022-09-26 11:41:31 -04:00
Max Brunsfeld 04baccbea6 Start work on a client-side telemetry system 2022-09-23 12:23:12 -07:00
Julia f3395cf4fd Add editor action to manually invoke buffer format 2022-09-22 18:21:05 -04:00
Max Brunsfeld d4bbf21650 Merge pull request #1559 from zed-industries/language-injection 
Add language injection support
 2022-08-30 11:54:00 -07:00
Max Brunsfeld ced45cbb0a Use SyntaxMap in Buffer 2022-08-24 13:00:27 -07:00
Antonio Scandurra f0d35ccc50 Move operation serialization off the main thread 2022-08-23 16:34:25 +02:00
Antonio Scandurra 954695f5fe Stream buffer ops in the background when creating buffer for peers 2022-08-23 16:05:56 +02:00
Antonio Scandurra 13c2021aef Default to language that started LSP when querying project symbols 2022-08-22 14:30:27 +02:00
Antonio Scandurra 9c9bf07e40 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 8ba2f77148 One big cleanup pass of clippy lints 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2022-08-10 16:51:01 -07:00
Max Brunsfeld 7527850546 Handle RPC requests for type definitions on server and host 2022-08-04 15:10:46 -07:00
ForLoveOfCats c21314bfbd Add ability to provide custom LSP server initialization options 2022-08-04 14:47:06 -04:00
ForLoveOfCats 5149c15329 Add "go to type definition" action 2022-07-29 11:41:08 -04:00
Max BrunsfeldandMikayla Maki fa5af4383d Introduce AutoindentMode parameter to Buffer::edit 
This controls whether or not we preserve the relative indentation
of inserted text blocks.

Co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
 2022-07-28 14:03:31 -07:00