yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,268 Commits 5 Branches 0 Tags
bfe97fbc6abe4d5c01f734009db09cf17536b075
Commit Graph
343 Commits
Author SHA1 Message Date
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
Max BrunsfeldandAntonio Scandurra 27dbced348 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
Max BrunsfeldandAntonio Scandurra b64916817b Avoid sending stale diagnostics after sharing a worktree 
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
 2022-10-12 11:33:19 -07:00
Antonio Scandurra f7de77de3c Remove unnecessary async from Peer::add_connection 2022-10-12 15:32:39 +02:00
Antonio Scandurra 748fd9acc6 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 fa862550fd Merge branch 'main' into test-branch 2022-10-11 19:55:32 -07:00
Kay Simmons 394517dbc6 Merge pull request #1685 from zed-industries/vim-text-objects 
Vim Text Objects and Numeric Repitions
 2022-10-11 16:36:19 -07:00
Mikayla Maki a9ce687031 Finished refactoring out fs and rope 2022-10-11 15:25:54 -07:00
Max Brunsfeld bd45d1ac65 Wait for project sharing to complete in LSP status integration test 2022-10-11 12:15:54 -07:00
Antonio Scandurra b86e80a610 Fix integration tests 2022-10-11 17:09:54 +02:00
Antonio ScandurraandNathan Sobo b732a3a167 Show a different message when participant is active on unshared project 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 15:24:31 +02:00
Antonio Scandurra 262a6360f7 Update contacts when automatically canceling calls 2022-10-11 11:55:15 +02:00
Antonio Scandurra a11c0a8c55 Cancel calls automatically when caller hangs up or disconnects 2022-10-11 11:28:27 +02:00
Antonio Scandurra 7863cace56 Show project root names when displaying incoming call notification 2022-10-11 10:59:36 +02:00
Nathan SoboandAntonio Scandurra 9b3d843f9d Show worktree root names when sharing additional projects on a call 
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
 2022-10-10 17:56:03 -06:00
Antonio Scandurra 3942d71b63 Fix seed script 2022-10-10 16:05:22 +02:00
Antonio Scandurra 794bea8dbd Merge remote-tracking branch 'origin/main' into room 2022-10-10 15:43:38 +02:00
K Simmons 055a8fe14a Fixed some neovim test context issues, added repeated commands in vim mode, and ported some tests to use the neovim testing strategy 2022-10-08 21:52:07 -07:00
Antonio ScandurraandNathan Sobo cf72bc4a14 WIP: Render active call in contacts popover 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-07 17:01:48 +02:00
Antonio Scandurra 17ceb30ae7 Ensure sharing the same project twice is idempotent 2022-10-07 14:47:06 +02:00
Antonio Scandurra d0fb6b3376 Fix room disconnection problems when creating room and sharing project 2022-10-07 14:39:11 +02:00
Antonio Scandurra 28de74f845 Include a busy field in proto::Contact 2022-10-07 12:21:56 +02:00
Antonio Scandurra b80a39c165 Leave room when client is the only participant 2022-10-07 11:58:49 +02:00
Antonio Scandurra 6e6e44b20a Move project sharing into Room 2022-10-07 10:14:17 +02:00
Antonio Scandurra 991a2fd9b2 Unset room on active call when disconnecting 2022-10-07 09:23:25 +02:00
Julia 8b93d084ea Extend a test to cover repos not at worktree root 2022-10-06 22:20:10 -04:00
Antonio Scandurra 0bd465df40 Always include room id in protos 
This is redundant, but it futures-proof the ability to talk about
multiple rooms at any given time and feels safer in terms of race
conditions.
 2022-10-06 15:20:49 +02:00
Antonio Scandurra bf30092c63 Implement call cancellation 2022-10-06 15:12:27 +02:00
Antonio Scandurra 7a30636a76 Delete rooms without pending users or participants 2022-10-06 14:20:40 +02:00
Antonio Scandurra 6597a5183a Move incoming calls into ActiveCall 2022-10-06 09:50:26 +02:00
Antonio Scandurra 33eee3003f Check room invariants in Store::check_invariants 2022-10-05 16:29:22 +02:00
Antonio Scandurra 7c4051e642 Enhance integration test to verify creating rooms while busy 2022-10-05 16:20:01 +02:00
Antonio Scandurra abad8199ee Add integration test verifying calls to busy users 2022-10-05 16:14:40 +02:00
Julia 0158d09e1b Merge pull request #1632 from zed-industries/git-gutter 
Tracking PR: Git gutter
 2022-10-04 15:12:28 -04:00
Antonio ScandurraandMax Brunsfeld d60225f118 Automatically share project when creating the room 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2022-10-04 19:25:48 +02:00
Antonio Scandurra 212a83ba85 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
Antonio Scandurra 396fc03fff Implement Room::set_location 2022-10-04 11:46:01 +02: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
Max BrunsfeldandJoseph Lyons 401558bd8b Set staff user property in telemetry 
Co-authored-by: Joseph Lyons <joseph@zed.dev>
 2022-10-03 10:52:57 -07:00
Antonio Scandurra 32dcfcb580 Emit event on Room when a user shares a new project 2022-10-03 17:12:07 +02:00
Antonio Scandurra a51b32b51f Automatically fetch remote participant users in Room 2022-10-03 16:09:49 +02:00
Antonio Scandurra 48129ae74f Prevent calls from users who aren't contacts 2022-10-03 15:54:20 +02:00
Antonio Scandurra 1387ab407e Fix randomized integration test failure 2022-10-03 15:50:47 +02:00
Antonio Scandurra bbe6bf0d96 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 9c8d2c9ac5 Merge branch 'main' into git-gutter 2022-10-02 18:03:50 -07:00
Mikayla Maki 2bebd94b45 Fix stray merge failure 2022-10-02 18:02:25 -07:00
Mikayla Maki a64bc92bb5 add proto stuff 2022-10-02 18:01:37 -07:00
Mikayla Maki bf215cf3c8 Added proto messages for updating the head text 2022-10-01 18:18:35 -07:00
Mikayla Maki ee8a275c60 Fixed 1 test 2022-09-30 17:34:14 -07:00