1use crate::{
2 rpc::{CLEANUP_TIMEOUT, RECONNECT_TIMEOUT},
3 tests::{
4 channel_id, following_tests::join_channel, room_participants, rust_lang, RoomParticipants,
5 TestClient, TestServer,
6 },
7};
8use anyhow::{anyhow, Result};
9use assistant_context_editor::ContextStore;
10use assistant_slash_command::SlashCommandWorkingSet;
11use buffer_diff::{assert_hunks, DiffHunkSecondaryStatus, DiffHunkStatus};
12use call::{room, ActiveCall, ParticipantLocation, Room};
13use client::{User, RECEIVE_TIMEOUT};
14use collections::{HashMap, HashSet};
15use fs::{FakeFs, Fs as _, RemoveOptions};
16use futures::{channel::mpsc, StreamExt as _};
17use git::status::{FileStatus, StatusCode, TrackedStatus, UnmergedStatus, UnmergedStatusCode};
18use gpui::{
19 px, size, App, BackgroundExecutor, Entity, Modifiers, MouseButton, MouseDownEvent,
20 TestAppContext, UpdateGlobal,
21};
22use language::{
23 language_settings::{
24 AllLanguageSettings, Formatter, FormatterList, PrettierSettings, SelectedFormatter,
25 },
26 tree_sitter_rust, tree_sitter_typescript, Diagnostic, DiagnosticEntry, FakeLspAdapter,
27 Language, LanguageConfig, LanguageMatcher, LineEnding, OffsetRangeExt, Point, Rope,
28};
29use lsp::LanguageServerId;
30use parking_lot::Mutex;
31use pretty_assertions::assert_eq;
32use project::{
33 lsp_store::{FormatTrigger, LspFormatTarget},
34 search::{SearchQuery, SearchResult},
35 DiagnosticSummary, HoverBlockKind, Project, ProjectPath,
36};
37use prompt_store::PromptBuilder;
38use rand::prelude::*;
39use serde_json::json;
40use settings::SettingsStore;
41use std::{
42 cell::{Cell, RefCell},
43 env, future, mem,
44 path::{Path, PathBuf},
45 rc::Rc,
46 sync::{
47 atomic::{AtomicBool, Ordering::SeqCst},
48 Arc,
49 },
50 time::Duration,
51};
52use unindent::Unindent as _;
53use workspace::Pane;
54
55#[ctor::ctor]
56fn init_logger() {
57 if std::env::var("RUST_LOG").is_ok() {
58 env_logger::init();
59 }
60}
61
62#[gpui::test(iterations = 10)]
63async fn test_basic_calls(
64 executor: BackgroundExecutor,
65 cx_a: &mut TestAppContext,
66 cx_b: &mut TestAppContext,
67 cx_b2: &mut TestAppContext,
68 cx_c: &mut TestAppContext,
69) {
70 let mut server = TestServer::start(executor.clone()).await;
71
72 let client_a = server.create_client(cx_a, "user_a").await;
73 let client_b = server.create_client(cx_b, "user_b").await;
74 let client_c = server.create_client(cx_c, "user_c").await;
75 server
76 .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
77 .await;
78
79 let active_call_a = cx_a.read(ActiveCall::global);
80 let active_call_b = cx_b.read(ActiveCall::global);
81 let active_call_c = cx_c.read(ActiveCall::global);
82
83 // Call user B from client A.
84 active_call_a
85 .update(cx_a, |call, cx| {
86 call.invite(client_b.user_id().unwrap(), None, cx)
87 })
88 .await
89 .unwrap();
90 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
91 executor.run_until_parked();
92 assert_eq!(
93 room_participants(&room_a, cx_a),
94 RoomParticipants {
95 remote: Default::default(),
96 pending: vec!["user_b".to_string()]
97 }
98 );
99
100 // User B receives the call.
101
102 let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
103 let call_b = incoming_call_b.next().await.unwrap().unwrap();
104 assert_eq!(call_b.calling_user.github_login, "user_a");
105
106 // User B connects via another client and also receives a ring on the newly-connected client.
107 let _client_b2 = server.create_client(cx_b2, "user_b").await;
108 let active_call_b2 = cx_b2.read(ActiveCall::global);
109
110 let mut incoming_call_b2 = active_call_b2.read_with(cx_b2, |call, _| call.incoming());
111 executor.run_until_parked();
112 let call_b2 = incoming_call_b2.next().await.unwrap().unwrap();
113 assert_eq!(call_b2.calling_user.github_login, "user_a");
114
115 // User B joins the room using the first client.
116 active_call_b
117 .update(cx_b, |call, cx| call.accept_incoming(cx))
118 .await
119 .unwrap();
120
121 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
122 assert!(incoming_call_b.next().await.unwrap().is_none());
123
124 executor.run_until_parked();
125 assert_eq!(
126 room_participants(&room_a, cx_a),
127 RoomParticipants {
128 remote: vec!["user_b".to_string()],
129 pending: Default::default()
130 }
131 );
132 assert_eq!(
133 room_participants(&room_b, cx_b),
134 RoomParticipants {
135 remote: vec!["user_a".to_string()],
136 pending: Default::default()
137 }
138 );
139
140 // Call user C from client B.
141
142 let mut incoming_call_c = active_call_c.read_with(cx_c, |call, _| call.incoming());
143 active_call_b
144 .update(cx_b, |call, cx| {
145 call.invite(client_c.user_id().unwrap(), None, cx)
146 })
147 .await
148 .unwrap();
149
150 executor.run_until_parked();
151 assert_eq!(
152 room_participants(&room_a, cx_a),
153 RoomParticipants {
154 remote: vec!["user_b".to_string()],
155 pending: vec!["user_c".to_string()]
156 }
157 );
158 assert_eq!(
159 room_participants(&room_b, cx_b),
160 RoomParticipants {
161 remote: vec!["user_a".to_string()],
162 pending: vec!["user_c".to_string()]
163 }
164 );
165
166 // User C receives the call, but declines it.
167 let call_c = incoming_call_c.next().await.unwrap().unwrap();
168 assert_eq!(call_c.calling_user.github_login, "user_b");
169 active_call_c.update(cx_c, |call, cx| call.decline_incoming(cx).unwrap());
170 assert!(incoming_call_c.next().await.unwrap().is_none());
171
172 executor.run_until_parked();
173 assert_eq!(
174 room_participants(&room_a, cx_a),
175 RoomParticipants {
176 remote: vec!["user_b".to_string()],
177 pending: Default::default()
178 }
179 );
180 assert_eq!(
181 room_participants(&room_b, cx_b),
182 RoomParticipants {
183 remote: vec!["user_a".to_string()],
184 pending: Default::default()
185 }
186 );
187
188 // Call user C again from user A.
189 active_call_a
190 .update(cx_a, |call, cx| {
191 call.invite(client_c.user_id().unwrap(), None, cx)
192 })
193 .await
194 .unwrap();
195
196 executor.run_until_parked();
197 assert_eq!(
198 room_participants(&room_a, cx_a),
199 RoomParticipants {
200 remote: vec!["user_b".to_string()],
201 pending: vec!["user_c".to_string()]
202 }
203 );
204 assert_eq!(
205 room_participants(&room_b, cx_b),
206 RoomParticipants {
207 remote: vec!["user_a".to_string()],
208 pending: vec!["user_c".to_string()]
209 }
210 );
211
212 // User C accepts the call.
213 let call_c = incoming_call_c.next().await.unwrap().unwrap();
214 assert_eq!(call_c.calling_user.github_login, "user_a");
215 active_call_c
216 .update(cx_c, |call, cx| call.accept_incoming(cx))
217 .await
218 .unwrap();
219 assert!(incoming_call_c.next().await.unwrap().is_none());
220
221 let room_c = active_call_c.read_with(cx_c, |call, _| call.room().unwrap().clone());
222
223 executor.run_until_parked();
224 assert_eq!(
225 room_participants(&room_a, cx_a),
226 RoomParticipants {
227 remote: vec!["user_b".to_string(), "user_c".to_string()],
228 pending: Default::default()
229 }
230 );
231 assert_eq!(
232 room_participants(&room_b, cx_b),
233 RoomParticipants {
234 remote: vec!["user_a".to_string(), "user_c".to_string()],
235 pending: Default::default()
236 }
237 );
238 assert_eq!(
239 room_participants(&room_c, cx_c),
240 RoomParticipants {
241 remote: vec!["user_a".to_string(), "user_b".to_string()],
242 pending: Default::default()
243 }
244 );
245
246 // TODO: Re-enable this test once we can replace our swift Livekit SDK with the rust SDK
247 #[cfg(not(target_os = "macos"))]
248 {
249 // User A shares their screen
250 let display = gpui::TestScreenCaptureSource::new();
251 let events_b = active_call_events(cx_b);
252 let events_c = active_call_events(cx_c);
253 cx_a.set_screen_capture_sources(vec![display]);
254 active_call_a
255 .update(cx_a, |call, cx| {
256 call.room()
257 .unwrap()
258 .update(cx, |room, cx| room.share_screen(cx))
259 })
260 .await
261 .unwrap();
262
263 executor.run_until_parked();
264
265 // User B observes the remote screen sharing track.
266 assert_eq!(events_b.borrow().len(), 1);
267 let event_b = events_b.borrow().first().unwrap().clone();
268 if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_b {
269 assert_eq!(participant_id, client_a.peer_id().unwrap());
270
271 room_b.read_with(cx_b, |room, _| {
272 assert_eq!(
273 room.remote_participants()[&client_a.user_id().unwrap()]
274 .video_tracks
275 .len(),
276 1
277 );
278 });
279 } else {
280 panic!("unexpected event")
281 }
282
283 // User C observes the remote screen sharing track.
284 assert_eq!(events_c.borrow().len(), 1);
285 let event_c = events_c.borrow().first().unwrap().clone();
286 if let call::room::Event::RemoteVideoTracksChanged { participant_id } = event_c {
287 assert_eq!(participant_id, client_a.peer_id().unwrap());
288
289 room_c.read_with(cx_c, |room, _| {
290 assert_eq!(
291 room.remote_participants()[&client_a.user_id().unwrap()]
292 .video_tracks
293 .len(),
294 1
295 );
296 });
297 } else {
298 panic!("unexpected event")
299 }
300 }
301
302 // User A leaves the room.
303 active_call_a
304 .update(cx_a, |call, cx| {
305 let hang_up = call.hang_up(cx);
306 assert!(call.room().is_none());
307 hang_up
308 })
309 .await
310 .unwrap();
311 executor.run_until_parked();
312 assert_eq!(
313 room_participants(&room_a, cx_a),
314 RoomParticipants {
315 remote: Default::default(),
316 pending: Default::default()
317 }
318 );
319 assert_eq!(
320 room_participants(&room_b, cx_b),
321 RoomParticipants {
322 remote: vec!["user_c".to_string()],
323 pending: Default::default()
324 }
325 );
326 assert_eq!(
327 room_participants(&room_c, cx_c),
328 RoomParticipants {
329 remote: vec!["user_b".to_string()],
330 pending: Default::default()
331 }
332 );
333
334 // User B gets disconnected from the LiveKit server, which causes them
335 // to automatically leave the room. User C leaves the room as well because
336 // nobody else is in there.
337 server
338 .test_livekit_server
339 .disconnect_client(client_b.user_id().unwrap().to_string())
340 .await;
341 executor.run_until_parked();
342
343 active_call_b.read_with(cx_b, |call, _| assert!(call.room().is_none()));
344
345 active_call_c.read_with(cx_c, |call, _| assert!(call.room().is_none()));
346 assert_eq!(
347 room_participants(&room_a, cx_a),
348 RoomParticipants {
349 remote: Default::default(),
350 pending: Default::default()
351 }
352 );
353 assert_eq!(
354 room_participants(&room_b, cx_b),
355 RoomParticipants {
356 remote: Default::default(),
357 pending: Default::default()
358 }
359 );
360 assert_eq!(
361 room_participants(&room_c, cx_c),
362 RoomParticipants {
363 remote: Default::default(),
364 pending: Default::default()
365 }
366 );
367}
368
369#[gpui::test(iterations = 10)]
370async fn test_calling_multiple_users_simultaneously(
371 executor: BackgroundExecutor,
372 cx_a: &mut TestAppContext,
373 cx_b: &mut TestAppContext,
374 cx_c: &mut TestAppContext,
375 cx_d: &mut TestAppContext,
376) {
377 let mut server = TestServer::start(executor.clone()).await;
378
379 let client_a = server.create_client(cx_a, "user_a").await;
380 let client_b = server.create_client(cx_b, "user_b").await;
381 let client_c = server.create_client(cx_c, "user_c").await;
382 let client_d = server.create_client(cx_d, "user_d").await;
383 server
384 .make_contacts(&mut [
385 (&client_a, cx_a),
386 (&client_b, cx_b),
387 (&client_c, cx_c),
388 (&client_d, cx_d),
389 ])
390 .await;
391
392 let active_call_a = cx_a.read(ActiveCall::global);
393 let active_call_b = cx_b.read(ActiveCall::global);
394 let active_call_c = cx_c.read(ActiveCall::global);
395 let active_call_d = cx_d.read(ActiveCall::global);
396
397 // Simultaneously call user B and user C from client A.
398 let b_invite = active_call_a.update(cx_a, |call, cx| {
399 call.invite(client_b.user_id().unwrap(), None, cx)
400 });
401 let c_invite = active_call_a.update(cx_a, |call, cx| {
402 call.invite(client_c.user_id().unwrap(), None, cx)
403 });
404 b_invite.await.unwrap();
405 c_invite.await.unwrap();
406
407 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
408 executor.run_until_parked();
409 assert_eq!(
410 room_participants(&room_a, cx_a),
411 RoomParticipants {
412 remote: Default::default(),
413 pending: vec!["user_b".to_string(), "user_c".to_string()]
414 }
415 );
416
417 // Call client D from client A.
418 active_call_a
419 .update(cx_a, |call, cx| {
420 call.invite(client_d.user_id().unwrap(), None, cx)
421 })
422 .await
423 .unwrap();
424 executor.run_until_parked();
425 assert_eq!(
426 room_participants(&room_a, cx_a),
427 RoomParticipants {
428 remote: Default::default(),
429 pending: vec![
430 "user_b".to_string(),
431 "user_c".to_string(),
432 "user_d".to_string()
433 ]
434 }
435 );
436
437 // Accept the call on all clients simultaneously.
438 let accept_b = active_call_b.update(cx_b, |call, cx| call.accept_incoming(cx));
439 let accept_c = active_call_c.update(cx_c, |call, cx| call.accept_incoming(cx));
440 let accept_d = active_call_d.update(cx_d, |call, cx| call.accept_incoming(cx));
441 accept_b.await.unwrap();
442 accept_c.await.unwrap();
443 accept_d.await.unwrap();
444
445 executor.run_until_parked();
446
447 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
448
449 let room_c = active_call_c.read_with(cx_c, |call, _| call.room().unwrap().clone());
450
451 let room_d = active_call_d.read_with(cx_d, |call, _| call.room().unwrap().clone());
452 assert_eq!(
453 room_participants(&room_a, cx_a),
454 RoomParticipants {
455 remote: vec![
456 "user_b".to_string(),
457 "user_c".to_string(),
458 "user_d".to_string(),
459 ],
460 pending: Default::default()
461 }
462 );
463 assert_eq!(
464 room_participants(&room_b, cx_b),
465 RoomParticipants {
466 remote: vec![
467 "user_a".to_string(),
468 "user_c".to_string(),
469 "user_d".to_string(),
470 ],
471 pending: Default::default()
472 }
473 );
474 assert_eq!(
475 room_participants(&room_c, cx_c),
476 RoomParticipants {
477 remote: vec![
478 "user_a".to_string(),
479 "user_b".to_string(),
480 "user_d".to_string(),
481 ],
482 pending: Default::default()
483 }
484 );
485 assert_eq!(
486 room_participants(&room_d, cx_d),
487 RoomParticipants {
488 remote: vec![
489 "user_a".to_string(),
490 "user_b".to_string(),
491 "user_c".to_string(),
492 ],
493 pending: Default::default()
494 }
495 );
496}
497
498#[gpui::test(iterations = 10)]
499async fn test_joining_channels_and_calling_multiple_users_simultaneously(
500 executor: BackgroundExecutor,
501 cx_a: &mut TestAppContext,
502 cx_b: &mut TestAppContext,
503 cx_c: &mut TestAppContext,
504) {
505 let mut server = TestServer::start(executor.clone()).await;
506
507 let client_a = server.create_client(cx_a, "user_a").await;
508 let client_b = server.create_client(cx_b, "user_b").await;
509 let client_c = server.create_client(cx_c, "user_c").await;
510 server
511 .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
512 .await;
513
514 let channel_1 = server
515 .make_channel(
516 "channel1",
517 None,
518 (&client_a, cx_a),
519 &mut [(&client_b, cx_b), (&client_c, cx_c)],
520 )
521 .await;
522
523 let channel_2 = server
524 .make_channel(
525 "channel2",
526 None,
527 (&client_a, cx_a),
528 &mut [(&client_b, cx_b), (&client_c, cx_c)],
529 )
530 .await;
531
532 let active_call_a = cx_a.read(ActiveCall::global);
533
534 // Simultaneously join channel 1 and then channel 2
535 active_call_a
536 .update(cx_a, |call, cx| call.join_channel(channel_1, cx))
537 .detach();
538 let join_channel_2 = active_call_a.update(cx_a, |call, cx| call.join_channel(channel_2, cx));
539
540 join_channel_2.await.unwrap();
541
542 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
543 executor.run_until_parked();
544
545 assert_eq!(channel_id(&room_a, cx_a), Some(channel_2));
546
547 // Leave the room
548 active_call_a
549 .update(cx_a, |call, cx| call.hang_up(cx))
550 .await
551 .unwrap();
552
553 // Initiating invites and then joining a channel should fail gracefully
554 let b_invite = active_call_a.update(cx_a, |call, cx| {
555 call.invite(client_b.user_id().unwrap(), None, cx)
556 });
557 let c_invite = active_call_a.update(cx_a, |call, cx| {
558 call.invite(client_c.user_id().unwrap(), None, cx)
559 });
560
561 let join_channel = active_call_a.update(cx_a, |call, cx| call.join_channel(channel_1, cx));
562
563 b_invite.await.unwrap();
564 c_invite.await.unwrap();
565 join_channel.await.unwrap();
566
567 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
568 executor.run_until_parked();
569
570 assert_eq!(
571 room_participants(&room_a, cx_a),
572 RoomParticipants {
573 remote: Default::default(),
574 pending: vec!["user_b".to_string(), "user_c".to_string()]
575 }
576 );
577
578 assert_eq!(channel_id(&room_a, cx_a), None);
579
580 // Leave the room
581 active_call_a
582 .update(cx_a, |call, cx| call.hang_up(cx))
583 .await
584 .unwrap();
585
586 // Simultaneously join channel 1 and call user B and user C from client A.
587 let join_channel = active_call_a.update(cx_a, |call, cx| call.join_channel(channel_1, cx));
588
589 let b_invite = active_call_a.update(cx_a, |call, cx| {
590 call.invite(client_b.user_id().unwrap(), None, cx)
591 });
592 let c_invite = active_call_a.update(cx_a, |call, cx| {
593 call.invite(client_c.user_id().unwrap(), None, cx)
594 });
595
596 join_channel.await.unwrap();
597 b_invite.await.unwrap();
598 c_invite.await.unwrap();
599
600 active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
601 executor.run_until_parked();
602}
603
604#[gpui::test(iterations = 10)]
605async fn test_room_uniqueness(
606 executor: BackgroundExecutor,
607 cx_a: &mut TestAppContext,
608 cx_a2: &mut TestAppContext,
609 cx_b: &mut TestAppContext,
610 cx_b2: &mut TestAppContext,
611 cx_c: &mut TestAppContext,
612) {
613 let mut server = TestServer::start(executor.clone()).await;
614 let client_a = server.create_client(cx_a, "user_a").await;
615 let _client_a2 = server.create_client(cx_a2, "user_a").await;
616 let client_b = server.create_client(cx_b, "user_b").await;
617 let _client_b2 = server.create_client(cx_b2, "user_b").await;
618 let client_c = server.create_client(cx_c, "user_c").await;
619 server
620 .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
621 .await;
622
623 let active_call_a = cx_a.read(ActiveCall::global);
624 let active_call_a2 = cx_a2.read(ActiveCall::global);
625 let active_call_b = cx_b.read(ActiveCall::global);
626 let active_call_b2 = cx_b2.read(ActiveCall::global);
627 let active_call_c = cx_c.read(ActiveCall::global);
628
629 // Call user B from client A.
630 active_call_a
631 .update(cx_a, |call, cx| {
632 call.invite(client_b.user_id().unwrap(), None, cx)
633 })
634 .await
635 .unwrap();
636
637 // Ensure a new room can't be created given user A just created one.
638 active_call_a2
639 .update(cx_a2, |call, cx| {
640 call.invite(client_c.user_id().unwrap(), None, cx)
641 })
642 .await
643 .unwrap_err();
644
645 active_call_a2.read_with(cx_a2, |call, _| assert!(call.room().is_none()));
646
647 // User B receives the call from user A.
648
649 let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
650 let call_b1 = incoming_call_b.next().await.unwrap().unwrap();
651 assert_eq!(call_b1.calling_user.github_login, "user_a");
652
653 // Ensure calling users A and B from client C fails.
654 active_call_c
655 .update(cx_c, |call, cx| {
656 call.invite(client_a.user_id().unwrap(), None, cx)
657 })
658 .await
659 .unwrap_err();
660 active_call_c
661 .update(cx_c, |call, cx| {
662 call.invite(client_b.user_id().unwrap(), None, cx)
663 })
664 .await
665 .unwrap_err();
666
667 // Ensure User B can't create a room while they still have an incoming call.
668 active_call_b2
669 .update(cx_b2, |call, cx| {
670 call.invite(client_c.user_id().unwrap(), None, cx)
671 })
672 .await
673 .unwrap_err();
674
675 active_call_b2.read_with(cx_b2, |call, _| assert!(call.room().is_none()));
676
677 // User B joins the room and calling them after they've joined still fails.
678 active_call_b
679 .update(cx_b, |call, cx| call.accept_incoming(cx))
680 .await
681 .unwrap();
682 active_call_c
683 .update(cx_c, |call, cx| {
684 call.invite(client_b.user_id().unwrap(), None, cx)
685 })
686 .await
687 .unwrap_err();
688
689 // Ensure User B can't create a room while they belong to another room.
690 active_call_b2
691 .update(cx_b2, |call, cx| {
692 call.invite(client_c.user_id().unwrap(), None, cx)
693 })
694 .await
695 .unwrap_err();
696
697 active_call_b2.read_with(cx_b2, |call, _| assert!(call.room().is_none()));
698
699 // Client C can successfully call client B after client B leaves the room.
700 active_call_b
701 .update(cx_b, |call, cx| call.hang_up(cx))
702 .await
703 .unwrap();
704 executor.run_until_parked();
705 active_call_c
706 .update(cx_c, |call, cx| {
707 call.invite(client_b.user_id().unwrap(), None, cx)
708 })
709 .await
710 .unwrap();
711 executor.run_until_parked();
712 let call_b2 = incoming_call_b.next().await.unwrap().unwrap();
713 assert_eq!(call_b2.calling_user.github_login, "user_c");
714}
715
716#[gpui::test(iterations = 10)]
717async fn test_client_disconnecting_from_room(
718 executor: BackgroundExecutor,
719 cx_a: &mut TestAppContext,
720 cx_b: &mut TestAppContext,
721) {
722 let mut server = TestServer::start(executor.clone()).await;
723 let client_a = server.create_client(cx_a, "user_a").await;
724 let client_b = server.create_client(cx_b, "user_b").await;
725 server
726 .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b)])
727 .await;
728
729 let active_call_a = cx_a.read(ActiveCall::global);
730 let active_call_b = cx_b.read(ActiveCall::global);
731
732 // Call user B from client A.
733 active_call_a
734 .update(cx_a, |call, cx| {
735 call.invite(client_b.user_id().unwrap(), None, cx)
736 })
737 .await
738 .unwrap();
739
740 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
741
742 // User B receives the call and joins the room.
743
744 let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
745 incoming_call_b.next().await.unwrap().unwrap();
746 active_call_b
747 .update(cx_b, |call, cx| call.accept_incoming(cx))
748 .await
749 .unwrap();
750
751 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
752 executor.run_until_parked();
753 assert_eq!(
754 room_participants(&room_a, cx_a),
755 RoomParticipants {
756 remote: vec!["user_b".to_string()],
757 pending: Default::default()
758 }
759 );
760 assert_eq!(
761 room_participants(&room_b, cx_b),
762 RoomParticipants {
763 remote: vec!["user_a".to_string()],
764 pending: Default::default()
765 }
766 );
767
768 // User A automatically reconnects to the room upon disconnection.
769 server.disconnect_client(client_a.peer_id().unwrap());
770 executor.advance_clock(RECEIVE_TIMEOUT);
771 executor.run_until_parked();
772 assert_eq!(
773 room_participants(&room_a, cx_a),
774 RoomParticipants {
775 remote: vec!["user_b".to_string()],
776 pending: Default::default()
777 }
778 );
779 assert_eq!(
780 room_participants(&room_b, cx_b),
781 RoomParticipants {
782 remote: vec!["user_a".to_string()],
783 pending: Default::default()
784 }
785 );
786
787 // When user A disconnects, both client A and B clear their room on the active call.
788 server.forbid_connections();
789 server.disconnect_client(client_a.peer_id().unwrap());
790 executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
791
792 active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none()));
793
794 active_call_b.read_with(cx_b, |call, _| assert!(call.room().is_none()));
795 assert_eq!(
796 room_participants(&room_a, cx_a),
797 RoomParticipants {
798 remote: Default::default(),
799 pending: Default::default()
800 }
801 );
802 assert_eq!(
803 room_participants(&room_b, cx_b),
804 RoomParticipants {
805 remote: Default::default(),
806 pending: Default::default()
807 }
808 );
809
810 // Allow user A to reconnect to the server.
811 server.allow_connections();
812 executor.advance_clock(RECEIVE_TIMEOUT);
813
814 // Call user B again from client A.
815 active_call_a
816 .update(cx_a, |call, cx| {
817 call.invite(client_b.user_id().unwrap(), None, cx)
818 })
819 .await
820 .unwrap();
821
822 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
823
824 // User B receives the call and joins the room.
825
826 let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
827 incoming_call_b.next().await.unwrap().unwrap();
828 active_call_b
829 .update(cx_b, |call, cx| call.accept_incoming(cx))
830 .await
831 .unwrap();
832
833 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
834 executor.run_until_parked();
835 assert_eq!(
836 room_participants(&room_a, cx_a),
837 RoomParticipants {
838 remote: vec!["user_b".to_string()],
839 pending: Default::default()
840 }
841 );
842 assert_eq!(
843 room_participants(&room_b, cx_b),
844 RoomParticipants {
845 remote: vec!["user_a".to_string()],
846 pending: Default::default()
847 }
848 );
849
850 // User B gets disconnected from the LiveKit server, which causes it
851 // to automatically leave the room.
852 server
853 .test_livekit_server
854 .disconnect_client(client_b.user_id().unwrap().to_string())
855 .await;
856 executor.run_until_parked();
857 active_call_a.update(cx_a, |call, _| assert!(call.room().is_none()));
858 active_call_b.update(cx_b, |call, _| assert!(call.room().is_none()));
859 assert_eq!(
860 room_participants(&room_a, cx_a),
861 RoomParticipants {
862 remote: Default::default(),
863 pending: Default::default()
864 }
865 );
866 assert_eq!(
867 room_participants(&room_b, cx_b),
868 RoomParticipants {
869 remote: Default::default(),
870 pending: Default::default()
871 }
872 );
873}
874
875#[gpui::test(iterations = 10)]
876async fn test_server_restarts(
877 executor: BackgroundExecutor,
878 cx_a: &mut TestAppContext,
879 cx_b: &mut TestAppContext,
880 cx_c: &mut TestAppContext,
881 cx_d: &mut TestAppContext,
882) {
883 let mut server = TestServer::start(executor.clone()).await;
884 let client_a = server.create_client(cx_a, "user_a").await;
885 client_a
886 .fs()
887 .insert_tree("/a", json!({ "a.txt": "a-contents" }))
888 .await;
889
890 // Invite client B to collaborate on a project
891 let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
892
893 let client_b = server.create_client(cx_b, "user_b").await;
894 let client_c = server.create_client(cx_c, "user_c").await;
895 let client_d = server.create_client(cx_d, "user_d").await;
896 server
897 .make_contacts(&mut [
898 (&client_a, cx_a),
899 (&client_b, cx_b),
900 (&client_c, cx_c),
901 (&client_d, cx_d),
902 ])
903 .await;
904
905 let active_call_a = cx_a.read(ActiveCall::global);
906 let active_call_b = cx_b.read(ActiveCall::global);
907 let active_call_c = cx_c.read(ActiveCall::global);
908 let active_call_d = cx_d.read(ActiveCall::global);
909
910 // User A calls users B, C, and D.
911 active_call_a
912 .update(cx_a, |call, cx| {
913 call.invite(client_b.user_id().unwrap(), Some(project_a.clone()), cx)
914 })
915 .await
916 .unwrap();
917 active_call_a
918 .update(cx_a, |call, cx| {
919 call.invite(client_c.user_id().unwrap(), Some(project_a.clone()), cx)
920 })
921 .await
922 .unwrap();
923 active_call_a
924 .update(cx_a, |call, cx| {
925 call.invite(client_d.user_id().unwrap(), Some(project_a.clone()), cx)
926 })
927 .await
928 .unwrap();
929
930 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
931
932 // User B receives the call and joins the room.
933
934 let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
935 assert!(incoming_call_b.next().await.unwrap().is_some());
936 active_call_b
937 .update(cx_b, |call, cx| call.accept_incoming(cx))
938 .await
939 .unwrap();
940
941 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
942
943 // User C receives the call and joins the room.
944
945 let mut incoming_call_c = active_call_c.read_with(cx_c, |call, _| call.incoming());
946 assert!(incoming_call_c.next().await.unwrap().is_some());
947 active_call_c
948 .update(cx_c, |call, cx| call.accept_incoming(cx))
949 .await
950 .unwrap();
951
952 let room_c = active_call_c.read_with(cx_c, |call, _| call.room().unwrap().clone());
953
954 // User D receives the call but doesn't join the room yet.
955
956 let mut incoming_call_d = active_call_d.read_with(cx_d, |call, _| call.incoming());
957 assert!(incoming_call_d.next().await.unwrap().is_some());
958
959 executor.run_until_parked();
960 assert_eq!(
961 room_participants(&room_a, cx_a),
962 RoomParticipants {
963 remote: vec!["user_b".to_string(), "user_c".to_string()],
964 pending: vec!["user_d".to_string()]
965 }
966 );
967 assert_eq!(
968 room_participants(&room_b, cx_b),
969 RoomParticipants {
970 remote: vec!["user_a".to_string(), "user_c".to_string()],
971 pending: vec!["user_d".to_string()]
972 }
973 );
974 assert_eq!(
975 room_participants(&room_c, cx_c),
976 RoomParticipants {
977 remote: vec!["user_a".to_string(), "user_b".to_string()],
978 pending: vec!["user_d".to_string()]
979 }
980 );
981
982 // The server is torn down.
983 server.reset().await;
984
985 // Users A and B reconnect to the call. User C has troubles reconnecting, so it leaves the room.
986 client_c.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
987 executor.advance_clock(RECONNECT_TIMEOUT);
988 assert_eq!(
989 room_participants(&room_a, cx_a),
990 RoomParticipants {
991 remote: vec!["user_b".to_string(), "user_c".to_string()],
992 pending: vec!["user_d".to_string()]
993 }
994 );
995 assert_eq!(
996 room_participants(&room_b, cx_b),
997 RoomParticipants {
998 remote: vec!["user_a".to_string(), "user_c".to_string()],
999 pending: vec!["user_d".to_string()]
1000 }
1001 );
1002 assert_eq!(
1003 room_participants(&room_c, cx_c),
1004 RoomParticipants {
1005 remote: vec![],
1006 pending: vec![]
1007 }
1008 );
1009
1010 // User D is notified again of the incoming call and accepts it.
1011 assert!(incoming_call_d.next().await.unwrap().is_some());
1012 active_call_d
1013 .update(cx_d, |call, cx| call.accept_incoming(cx))
1014 .await
1015 .unwrap();
1016 executor.run_until_parked();
1017
1018 let room_d = active_call_d.read_with(cx_d, |call, _| call.room().unwrap().clone());
1019 assert_eq!(
1020 room_participants(&room_a, cx_a),
1021 RoomParticipants {
1022 remote: vec![
1023 "user_b".to_string(),
1024 "user_c".to_string(),
1025 "user_d".to_string(),
1026 ],
1027 pending: vec![]
1028 }
1029 );
1030 assert_eq!(
1031 room_participants(&room_b, cx_b),
1032 RoomParticipants {
1033 remote: vec![
1034 "user_a".to_string(),
1035 "user_c".to_string(),
1036 "user_d".to_string(),
1037 ],
1038 pending: vec![]
1039 }
1040 );
1041 assert_eq!(
1042 room_participants(&room_c, cx_c),
1043 RoomParticipants {
1044 remote: vec![],
1045 pending: vec![]
1046 }
1047 );
1048 assert_eq!(
1049 room_participants(&room_d, cx_d),
1050 RoomParticipants {
1051 remote: vec![
1052 "user_a".to_string(),
1053 "user_b".to_string(),
1054 "user_c".to_string(),
1055 ],
1056 pending: vec![]
1057 }
1058 );
1059
1060 // The server finishes restarting, cleaning up stale connections.
1061 server.start().await.unwrap();
1062 executor.advance_clock(CLEANUP_TIMEOUT);
1063 assert_eq!(
1064 room_participants(&room_a, cx_a),
1065 RoomParticipants {
1066 remote: vec!["user_b".to_string(), "user_d".to_string()],
1067 pending: vec![]
1068 }
1069 );
1070 assert_eq!(
1071 room_participants(&room_b, cx_b),
1072 RoomParticipants {
1073 remote: vec!["user_a".to_string(), "user_d".to_string()],
1074 pending: vec![]
1075 }
1076 );
1077 assert_eq!(
1078 room_participants(&room_c, cx_c),
1079 RoomParticipants {
1080 remote: vec![],
1081 pending: vec![]
1082 }
1083 );
1084 assert_eq!(
1085 room_participants(&room_d, cx_d),
1086 RoomParticipants {
1087 remote: vec!["user_a".to_string(), "user_b".to_string()],
1088 pending: vec![]
1089 }
1090 );
1091
1092 // User D hangs up.
1093 active_call_d
1094 .update(cx_d, |call, cx| call.hang_up(cx))
1095 .await
1096 .unwrap();
1097 executor.run_until_parked();
1098 assert_eq!(
1099 room_participants(&room_a, cx_a),
1100 RoomParticipants {
1101 remote: vec!["user_b".to_string()],
1102 pending: vec![]
1103 }
1104 );
1105 assert_eq!(
1106 room_participants(&room_b, cx_b),
1107 RoomParticipants {
1108 remote: vec!["user_a".to_string()],
1109 pending: vec![]
1110 }
1111 );
1112 assert_eq!(
1113 room_participants(&room_c, cx_c),
1114 RoomParticipants {
1115 remote: vec![],
1116 pending: vec![]
1117 }
1118 );
1119 assert_eq!(
1120 room_participants(&room_d, cx_d),
1121 RoomParticipants {
1122 remote: vec![],
1123 pending: vec![]
1124 }
1125 );
1126
1127 // User B calls user D again.
1128 active_call_b
1129 .update(cx_b, |call, cx| {
1130 call.invite(client_d.user_id().unwrap(), None, cx)
1131 })
1132 .await
1133 .unwrap();
1134
1135 // User D receives the call but doesn't join the room yet.
1136
1137 let mut incoming_call_d = active_call_d.read_with(cx_d, |call, _| call.incoming());
1138 assert!(incoming_call_d.next().await.unwrap().is_some());
1139 executor.run_until_parked();
1140 assert_eq!(
1141 room_participants(&room_a, cx_a),
1142 RoomParticipants {
1143 remote: vec!["user_b".to_string()],
1144 pending: vec!["user_d".to_string()]
1145 }
1146 );
1147 assert_eq!(
1148 room_participants(&room_b, cx_b),
1149 RoomParticipants {
1150 remote: vec!["user_a".to_string()],
1151 pending: vec!["user_d".to_string()]
1152 }
1153 );
1154
1155 // The server is torn down.
1156 server.reset().await;
1157
1158 // Users A and B have troubles reconnecting, so they leave the room.
1159 client_a.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
1160 client_b.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
1161 client_c.override_establish_connection(|_, cx| cx.spawn(async |_| future::pending().await));
1162 executor.advance_clock(RECONNECT_TIMEOUT);
1163 assert_eq!(
1164 room_participants(&room_a, cx_a),
1165 RoomParticipants {
1166 remote: vec![],
1167 pending: vec![]
1168 }
1169 );
1170 assert_eq!(
1171 room_participants(&room_b, cx_b),
1172 RoomParticipants {
1173 remote: vec![],
1174 pending: vec![]
1175 }
1176 );
1177
1178 // User D is notified again of the incoming call but doesn't accept it.
1179 assert!(incoming_call_d.next().await.unwrap().is_some());
1180
1181 // The server finishes restarting, cleaning up stale connections and canceling the
1182 // call to user D because the room has become empty.
1183 server.start().await.unwrap();
1184 executor.advance_clock(CLEANUP_TIMEOUT);
1185 assert!(incoming_call_d.next().await.unwrap().is_none());
1186}
1187
1188#[gpui::test(iterations = 10)]
1189async fn test_calls_on_multiple_connections(
1190 executor: BackgroundExecutor,
1191 cx_a: &mut TestAppContext,
1192 cx_b1: &mut TestAppContext,
1193 cx_b2: &mut TestAppContext,
1194) {
1195 let mut server = TestServer::start(executor.clone()).await;
1196 let client_a = server.create_client(cx_a, "user_a").await;
1197 let client_b1 = server.create_client(cx_b1, "user_b").await;
1198 let client_b2 = server.create_client(cx_b2, "user_b").await;
1199 server
1200 .make_contacts(&mut [(&client_a, cx_a), (&client_b1, cx_b1)])
1201 .await;
1202
1203 let active_call_a = cx_a.read(ActiveCall::global);
1204 let active_call_b1 = cx_b1.read(ActiveCall::global);
1205 let active_call_b2 = cx_b2.read(ActiveCall::global);
1206
1207 let mut incoming_call_b1 = active_call_b1.read_with(cx_b1, |call, _| call.incoming());
1208
1209 let mut incoming_call_b2 = active_call_b2.read_with(cx_b2, |call, _| call.incoming());
1210 assert!(incoming_call_b1.next().await.unwrap().is_none());
1211 assert!(incoming_call_b2.next().await.unwrap().is_none());
1212
1213 // Call user B from client A, ensuring both clients for user B ring.
1214 active_call_a
1215 .update(cx_a, |call, cx| {
1216 call.invite(client_b1.user_id().unwrap(), None, cx)
1217 })
1218 .await
1219 .unwrap();
1220 executor.run_until_parked();
1221 assert!(incoming_call_b1.next().await.unwrap().is_some());
1222 assert!(incoming_call_b2.next().await.unwrap().is_some());
1223
1224 // User B declines the call on one of the two connections, causing both connections
1225 // to stop ringing.
1226 active_call_b2.update(cx_b2, |call, cx| call.decline_incoming(cx).unwrap());
1227 executor.run_until_parked();
1228 assert!(incoming_call_b1.next().await.unwrap().is_none());
1229 assert!(incoming_call_b2.next().await.unwrap().is_none());
1230
1231 // Call user B again from client A.
1232 active_call_a
1233 .update(cx_a, |call, cx| {
1234 call.invite(client_b1.user_id().unwrap(), None, cx)
1235 })
1236 .await
1237 .unwrap();
1238 executor.run_until_parked();
1239 assert!(incoming_call_b1.next().await.unwrap().is_some());
1240 assert!(incoming_call_b2.next().await.unwrap().is_some());
1241
1242 // User B accepts the call on one of the two connections, causing both connections
1243 // to stop ringing.
1244 active_call_b2
1245 .update(cx_b2, |call, cx| call.accept_incoming(cx))
1246 .await
1247 .unwrap();
1248 executor.run_until_parked();
1249 assert!(incoming_call_b1.next().await.unwrap().is_none());
1250 assert!(incoming_call_b2.next().await.unwrap().is_none());
1251
1252 // User B disconnects the client that is not on the call. Everything should be fine.
1253 client_b1.disconnect(&cx_b1.to_async());
1254 executor.advance_clock(RECEIVE_TIMEOUT);
1255 client_b1
1256 .authenticate_and_connect(false, &cx_b1.to_async())
1257 .await
1258 .unwrap();
1259
1260 // User B hangs up, and user A calls them again.
1261 active_call_b2
1262 .update(cx_b2, |call, cx| call.hang_up(cx))
1263 .await
1264 .unwrap();
1265 executor.run_until_parked();
1266 active_call_a
1267 .update(cx_a, |call, cx| {
1268 call.invite(client_b1.user_id().unwrap(), None, cx)
1269 })
1270 .await
1271 .unwrap();
1272 executor.run_until_parked();
1273 assert!(incoming_call_b1.next().await.unwrap().is_some());
1274 assert!(incoming_call_b2.next().await.unwrap().is_some());
1275
1276 // User A cancels the call, causing both connections to stop ringing.
1277 active_call_a
1278 .update(cx_a, |call, cx| {
1279 call.cancel_invite(client_b1.user_id().unwrap(), cx)
1280 })
1281 .await
1282 .unwrap();
1283 executor.run_until_parked();
1284 assert!(incoming_call_b1.next().await.unwrap().is_none());
1285 assert!(incoming_call_b2.next().await.unwrap().is_none());
1286
1287 // User A calls user B again.
1288 active_call_a
1289 .update(cx_a, |call, cx| {
1290 call.invite(client_b1.user_id().unwrap(), None, cx)
1291 })
1292 .await
1293 .unwrap();
1294 executor.run_until_parked();
1295 assert!(incoming_call_b1.next().await.unwrap().is_some());
1296 assert!(incoming_call_b2.next().await.unwrap().is_some());
1297
1298 // User A hangs up, causing both connections to stop ringing.
1299 active_call_a
1300 .update(cx_a, |call, cx| call.hang_up(cx))
1301 .await
1302 .unwrap();
1303 executor.run_until_parked();
1304 assert!(incoming_call_b1.next().await.unwrap().is_none());
1305 assert!(incoming_call_b2.next().await.unwrap().is_none());
1306
1307 // User A calls user B again.
1308 active_call_a
1309 .update(cx_a, |call, cx| {
1310 call.invite(client_b1.user_id().unwrap(), None, cx)
1311 })
1312 .await
1313 .unwrap();
1314 executor.run_until_parked();
1315 assert!(incoming_call_b1.next().await.unwrap().is_some());
1316 assert!(incoming_call_b2.next().await.unwrap().is_some());
1317
1318 // User A disconnects, causing both connections to stop ringing.
1319 server.forbid_connections();
1320 server.disconnect_client(client_a.peer_id().unwrap());
1321 executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
1322 assert!(incoming_call_b1.next().await.unwrap().is_none());
1323 assert!(incoming_call_b2.next().await.unwrap().is_none());
1324
1325 // User A reconnects automatically, then calls user B again.
1326 server.allow_connections();
1327 executor.advance_clock(RECEIVE_TIMEOUT);
1328 active_call_a
1329 .update(cx_a, |call, cx| {
1330 call.invite(client_b1.user_id().unwrap(), None, cx)
1331 })
1332 .await
1333 .unwrap();
1334 executor.run_until_parked();
1335 assert!(incoming_call_b1.next().await.unwrap().is_some());
1336 assert!(incoming_call_b2.next().await.unwrap().is_some());
1337
1338 // User B disconnects all clients, causing user A to no longer see a pending call for them.
1339 server.forbid_connections();
1340 server.disconnect_client(client_b1.peer_id().unwrap());
1341 server.disconnect_client(client_b2.peer_id().unwrap());
1342 executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
1343
1344 active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none()));
1345}
1346
1347#[gpui::test(iterations = 10)]
1348async fn test_unshare_project(
1349 executor: BackgroundExecutor,
1350 cx_a: &mut TestAppContext,
1351 cx_b: &mut TestAppContext,
1352 cx_c: &mut TestAppContext,
1353) {
1354 let mut server = TestServer::start(executor.clone()).await;
1355 let client_a = server.create_client(cx_a, "user_a").await;
1356 let client_b = server.create_client(cx_b, "user_b").await;
1357 let client_c = server.create_client(cx_c, "user_c").await;
1358 server
1359 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
1360 .await;
1361
1362 let active_call_a = cx_a.read(ActiveCall::global);
1363 let active_call_b = cx_b.read(ActiveCall::global);
1364
1365 client_a
1366 .fs()
1367 .insert_tree(
1368 "/a",
1369 json!({
1370 "a.txt": "a-contents",
1371 "b.txt": "b-contents",
1372 }),
1373 )
1374 .await;
1375
1376 let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
1377 let project_id = active_call_a
1378 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
1379 .await
1380 .unwrap();
1381
1382 let worktree_a = project_a.read_with(cx_a, |project, cx| project.worktrees(cx).next().unwrap());
1383 let project_b = client_b.join_remote_project(project_id, cx_b).await;
1384 executor.run_until_parked();
1385
1386 assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
1387
1388 project_b
1389 .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
1390 .await
1391 .unwrap();
1392
1393 // When client B leaves the room, the project becomes read-only.
1394 active_call_b
1395 .update(cx_b, |call, cx| call.hang_up(cx))
1396 .await
1397 .unwrap();
1398 executor.run_until_parked();
1399
1400 assert!(project_b.read_with(cx_b, |project, cx| project.is_disconnected(cx)));
1401
1402 // Client C opens the project.
1403 let project_c = client_c.join_remote_project(project_id, cx_c).await;
1404
1405 // When client A unshares the project, client C's project becomes read-only.
1406 project_a
1407 .update(cx_a, |project, cx| project.unshare(cx))
1408 .unwrap();
1409 executor.run_until_parked();
1410
1411 assert!(worktree_a.read_with(cx_a, |tree, _| !tree.has_update_observer()));
1412
1413 assert!(project_c.read_with(cx_c, |project, cx| project.is_disconnected(cx)));
1414
1415 // Client C can open the project again after client A re-shares.
1416 let project_id = active_call_a
1417 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
1418 .await
1419 .unwrap();
1420 let project_c2 = client_c.join_remote_project(project_id, cx_c).await;
1421 executor.run_until_parked();
1422
1423 assert!(worktree_a.read_with(cx_a, |tree, _| tree.has_update_observer()));
1424 project_c2
1425 .update(cx_c, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
1426 .await
1427 .unwrap();
1428
1429 // When client A (the host) leaves the room, the project gets unshared and guests are notified.
1430 active_call_a
1431 .update(cx_a, |call, cx| call.hang_up(cx))
1432 .await
1433 .unwrap();
1434 executor.run_until_parked();
1435
1436 project_a.read_with(cx_a, |project, _| assert!(!project.is_shared()));
1437
1438 project_c2.read_with(cx_c, |project, cx| {
1439 assert!(project.is_disconnected(cx));
1440 assert!(project.collaborators().is_empty());
1441 });
1442}
1443
1444#[gpui::test(iterations = 10)]
1445async fn test_project_reconnect(
1446 executor: BackgroundExecutor,
1447 cx_a: &mut TestAppContext,
1448 cx_b: &mut TestAppContext,
1449) {
1450 let mut server = TestServer::start(executor.clone()).await;
1451 let client_a = server.create_client(cx_a, "user_a").await;
1452 let client_b = server.create_client(cx_b, "user_b").await;
1453 server
1454 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
1455 .await;
1456
1457 cx_b.update(editor::init);
1458
1459 client_a
1460 .fs()
1461 .insert_tree(
1462 "/root-1",
1463 json!({
1464 "dir1": {
1465 "a.txt": "a",
1466 "b.txt": "b",
1467 "subdir1": {
1468 "c.txt": "c",
1469 "d.txt": "d",
1470 "e.txt": "e",
1471 }
1472 },
1473 "dir2": {
1474 "v.txt": "v",
1475 },
1476 "dir3": {
1477 "w.txt": "w",
1478 "x.txt": "x",
1479 "y.txt": "y",
1480 },
1481 "dir4": {
1482 "z.txt": "z",
1483 },
1484 }),
1485 )
1486 .await;
1487 client_a
1488 .fs()
1489 .insert_tree(
1490 "/root-2",
1491 json!({
1492 "2.txt": "2",
1493 }),
1494 )
1495 .await;
1496 client_a
1497 .fs()
1498 .insert_tree(
1499 "/root-3",
1500 json!({
1501 "3.txt": "3",
1502 }),
1503 )
1504 .await;
1505
1506 let active_call_a = cx_a.read(ActiveCall::global);
1507 let (project_a1, _) = client_a.build_local_project("/root-1/dir1", cx_a).await;
1508 let (project_a2, _) = client_a.build_local_project("/root-2", cx_a).await;
1509 let (project_a3, _) = client_a.build_local_project("/root-3", cx_a).await;
1510 let worktree_a1 =
1511 project_a1.read_with(cx_a, |project, cx| project.worktrees(cx).next().unwrap());
1512 let project1_id = active_call_a
1513 .update(cx_a, |call, cx| call.share_project(project_a1.clone(), cx))
1514 .await
1515 .unwrap();
1516 let project2_id = active_call_a
1517 .update(cx_a, |call, cx| call.share_project(project_a2.clone(), cx))
1518 .await
1519 .unwrap();
1520 let project3_id = active_call_a
1521 .update(cx_a, |call, cx| call.share_project(project_a3.clone(), cx))
1522 .await
1523 .unwrap();
1524
1525 let project_b1 = client_b.join_remote_project(project1_id, cx_b).await;
1526 let project_b2 = client_b.join_remote_project(project2_id, cx_b).await;
1527 let project_b3 = client_b.join_remote_project(project3_id, cx_b).await;
1528 executor.run_until_parked();
1529
1530 let worktree1_id = worktree_a1.read_with(cx_a, |worktree, _| {
1531 assert!(worktree.has_update_observer());
1532 worktree.id()
1533 });
1534 let (worktree_a2, _) = project_a1
1535 .update(cx_a, |p, cx| {
1536 p.find_or_create_worktree("/root-1/dir2", true, cx)
1537 })
1538 .await
1539 .unwrap();
1540 executor.run_until_parked();
1541
1542 let worktree2_id = worktree_a2.read_with(cx_a, |tree, _| {
1543 assert!(tree.has_update_observer());
1544 tree.id()
1545 });
1546 executor.run_until_parked();
1547
1548 project_b1.read_with(cx_b, |project, cx| {
1549 assert!(project.worktree_for_id(worktree2_id, cx).is_some())
1550 });
1551
1552 let buffer_a1 = project_a1
1553 .update(cx_a, |p, cx| p.open_buffer((worktree1_id, "a.txt"), cx))
1554 .await
1555 .unwrap();
1556 let buffer_b1 = project_b1
1557 .update(cx_b, |p, cx| p.open_buffer((worktree1_id, "a.txt"), cx))
1558 .await
1559 .unwrap();
1560
1561 // Drop client A's connection.
1562 server.forbid_connections();
1563 server.disconnect_client(client_a.peer_id().unwrap());
1564 executor.advance_clock(RECEIVE_TIMEOUT);
1565
1566 project_a1.read_with(cx_a, |project, _| {
1567 assert!(project.is_shared());
1568 assert_eq!(project.collaborators().len(), 1);
1569 });
1570
1571 project_b1.read_with(cx_b, |project, cx| {
1572 assert!(!project.is_disconnected(cx));
1573 assert_eq!(project.collaborators().len(), 1);
1574 });
1575
1576 worktree_a1.read_with(cx_a, |tree, _| assert!(tree.has_update_observer()));
1577
1578 // While client A is disconnected, add and remove files from client A's project.
1579 client_a
1580 .fs()
1581 .insert_tree(
1582 "/root-1/dir1/subdir2",
1583 json!({
1584 "f.txt": "f-contents",
1585 "g.txt": "g-contents",
1586 "h.txt": "h-contents",
1587 "i.txt": "i-contents",
1588 }),
1589 )
1590 .await;
1591 client_a
1592 .fs()
1593 .remove_dir(
1594 "/root-1/dir1/subdir1".as_ref(),
1595 RemoveOptions {
1596 recursive: true,
1597 ..Default::default()
1598 },
1599 )
1600 .await
1601 .unwrap();
1602
1603 // While client A is disconnected, add and remove worktrees from client A's project.
1604 project_a1.update(cx_a, |project, cx| {
1605 project.remove_worktree(worktree2_id, cx)
1606 });
1607 let (worktree_a3, _) = project_a1
1608 .update(cx_a, |p, cx| {
1609 p.find_or_create_worktree("/root-1/dir3", true, cx)
1610 })
1611 .await
1612 .unwrap();
1613 worktree_a3
1614 .read_with(cx_a, |tree, _| tree.as_local().unwrap().scan_complete())
1615 .await;
1616
1617 let worktree3_id = worktree_a3.read_with(cx_a, |tree, _| {
1618 assert!(!tree.has_update_observer());
1619 tree.id()
1620 });
1621 executor.run_until_parked();
1622
1623 // While client A is disconnected, close project 2
1624 cx_a.update(|_| drop(project_a2));
1625
1626 // While client A is disconnected, mutate a buffer on both the host and the guest.
1627 buffer_a1.update(cx_a, |buf, cx| buf.edit([(0..0, "W")], None, cx));
1628 buffer_b1.update(cx_b, |buf, cx| buf.edit([(1..1, "Z")], None, cx));
1629 executor.run_until_parked();
1630
1631 // Client A reconnects. Their project is re-shared, and client B re-joins it.
1632 server.allow_connections();
1633 client_a
1634 .authenticate_and_connect(false, &cx_a.to_async())
1635 .await
1636 .unwrap();
1637 executor.run_until_parked();
1638
1639 project_a1.read_with(cx_a, |project, cx| {
1640 assert!(project.is_shared());
1641 assert!(worktree_a1.read(cx).has_update_observer());
1642 assert_eq!(
1643 worktree_a1
1644 .read(cx)
1645 .snapshot()
1646 .paths()
1647 .map(|p| p.to_str().unwrap())
1648 .collect::<Vec<_>>(),
1649 vec![
1650 "a.txt",
1651 "b.txt",
1652 "subdir2",
1653 "subdir2/f.txt",
1654 "subdir2/g.txt",
1655 "subdir2/h.txt",
1656 "subdir2/i.txt"
1657 ]
1658 );
1659 assert!(worktree_a3.read(cx).has_update_observer());
1660 assert_eq!(
1661 worktree_a3
1662 .read(cx)
1663 .snapshot()
1664 .paths()
1665 .map(|p| p.to_str().unwrap())
1666 .collect::<Vec<_>>(),
1667 vec!["w.txt", "x.txt", "y.txt"]
1668 );
1669 });
1670
1671 project_b1.read_with(cx_b, |project, cx| {
1672 assert!(!project.is_disconnected(cx));
1673 assert_eq!(
1674 project
1675 .worktree_for_id(worktree1_id, cx)
1676 .unwrap()
1677 .read(cx)
1678 .snapshot()
1679 .paths()
1680 .map(|p| p.to_str().unwrap())
1681 .collect::<Vec<_>>(),
1682 vec![
1683 "a.txt",
1684 "b.txt",
1685 "subdir2",
1686 "subdir2/f.txt",
1687 "subdir2/g.txt",
1688 "subdir2/h.txt",
1689 "subdir2/i.txt"
1690 ]
1691 );
1692 assert!(project.worktree_for_id(worktree2_id, cx).is_none());
1693 assert_eq!(
1694 project
1695 .worktree_for_id(worktree3_id, cx)
1696 .unwrap()
1697 .read(cx)
1698 .snapshot()
1699 .paths()
1700 .map(|p| p.to_str().unwrap())
1701 .collect::<Vec<_>>(),
1702 vec!["w.txt", "x.txt", "y.txt"]
1703 );
1704 });
1705
1706 project_b2.read_with(cx_b, |project, cx| assert!(project.is_disconnected(cx)));
1707
1708 project_b3.read_with(cx_b, |project, cx| assert!(!project.is_disconnected(cx)));
1709
1710 buffer_a1.read_with(cx_a, |buffer, _| assert_eq!(buffer.text(), "WaZ"));
1711
1712 buffer_b1.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "WaZ"));
1713
1714 // Drop client B's connection.
1715 server.forbid_connections();
1716 server.disconnect_client(client_b.peer_id().unwrap());
1717 executor.advance_clock(RECEIVE_TIMEOUT);
1718
1719 // While client B is disconnected, add and remove files from client A's project
1720 client_a
1721 .fs()
1722 .insert_file("/root-1/dir1/subdir2/j.txt", "j-contents".into())
1723 .await;
1724 client_a
1725 .fs()
1726 .remove_file("/root-1/dir1/subdir2/i.txt".as_ref(), Default::default())
1727 .await
1728 .unwrap();
1729
1730 // While client B is disconnected, add and remove worktrees from client A's project.
1731 let (worktree_a4, _) = project_a1
1732 .update(cx_a, |p, cx| {
1733 p.find_or_create_worktree("/root-1/dir4", true, cx)
1734 })
1735 .await
1736 .unwrap();
1737 executor.run_until_parked();
1738
1739 let worktree4_id = worktree_a4.read_with(cx_a, |tree, _| {
1740 assert!(tree.has_update_observer());
1741 tree.id()
1742 });
1743 project_a1.update(cx_a, |project, cx| {
1744 project.remove_worktree(worktree3_id, cx)
1745 });
1746 executor.run_until_parked();
1747
1748 // While client B is disconnected, mutate a buffer on both the host and the guest.
1749 buffer_a1.update(cx_a, |buf, cx| buf.edit([(1..1, "X")], None, cx));
1750 buffer_b1.update(cx_b, |buf, cx| buf.edit([(2..2, "Y")], None, cx));
1751 executor.run_until_parked();
1752
1753 // While disconnected, close project 3
1754 cx_a.update(|_| drop(project_a3));
1755
1756 // Client B reconnects. They re-join the room and the remaining shared project.
1757 server.allow_connections();
1758 client_b
1759 .authenticate_and_connect(false, &cx_b.to_async())
1760 .await
1761 .unwrap();
1762 executor.run_until_parked();
1763
1764 project_b1.read_with(cx_b, |project, cx| {
1765 assert!(!project.is_disconnected(cx));
1766 assert_eq!(
1767 project
1768 .worktree_for_id(worktree1_id, cx)
1769 .unwrap()
1770 .read(cx)
1771 .snapshot()
1772 .paths()
1773 .map(|p| p.to_str().unwrap())
1774 .collect::<Vec<_>>(),
1775 vec![
1776 "a.txt",
1777 "b.txt",
1778 "subdir2",
1779 "subdir2/f.txt",
1780 "subdir2/g.txt",
1781 "subdir2/h.txt",
1782 "subdir2/j.txt"
1783 ]
1784 );
1785 assert!(project.worktree_for_id(worktree2_id, cx).is_none());
1786 assert_eq!(
1787 project
1788 .worktree_for_id(worktree4_id, cx)
1789 .unwrap()
1790 .read(cx)
1791 .snapshot()
1792 .paths()
1793 .map(|p| p.to_str().unwrap())
1794 .collect::<Vec<_>>(),
1795 vec!["z.txt"]
1796 );
1797 });
1798
1799 project_b3.read_with(cx_b, |project, cx| assert!(project.is_disconnected(cx)));
1800
1801 buffer_a1.read_with(cx_a, |buffer, _| assert_eq!(buffer.text(), "WXaYZ"));
1802
1803 buffer_b1.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "WXaYZ"));
1804}
1805
1806#[gpui::test(iterations = 10)]
1807async fn test_active_call_events(
1808 executor: BackgroundExecutor,
1809 cx_a: &mut TestAppContext,
1810 cx_b: &mut TestAppContext,
1811) {
1812 let mut server = TestServer::start(executor.clone()).await;
1813 let client_a = server.create_client(cx_a, "user_a").await;
1814 let client_b = server.create_client(cx_b, "user_b").await;
1815 client_a.fs().insert_tree("/a", json!({})).await;
1816 client_b.fs().insert_tree("/b", json!({})).await;
1817
1818 let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
1819 let (project_b, _) = client_b.build_local_project("/b", cx_b).await;
1820
1821 server
1822 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
1823 .await;
1824 let active_call_a = cx_a.read(ActiveCall::global);
1825 let active_call_b = cx_b.read(ActiveCall::global);
1826
1827 let events_a = active_call_events(cx_a);
1828 let events_b = active_call_events(cx_b);
1829
1830 let project_a_id = active_call_a
1831 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
1832 .await
1833 .unwrap();
1834 executor.run_until_parked();
1835 assert_eq!(mem::take(&mut *events_a.borrow_mut()), vec![]);
1836 assert_eq!(
1837 mem::take(&mut *events_b.borrow_mut()),
1838 vec![room::Event::RemoteProjectShared {
1839 owner: Arc::new(User {
1840 id: client_a.user_id().unwrap(),
1841 github_login: "user_a".to_string(),
1842 avatar_uri: "avatar_a".into(),
1843 name: None,
1844 email: None,
1845 }),
1846 project_id: project_a_id,
1847 worktree_root_names: vec!["a".to_string()],
1848 }]
1849 );
1850
1851 let project_b_id = active_call_b
1852 .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
1853 .await
1854 .unwrap();
1855 executor.run_until_parked();
1856 assert_eq!(
1857 mem::take(&mut *events_a.borrow_mut()),
1858 vec![room::Event::RemoteProjectShared {
1859 owner: Arc::new(User {
1860 id: client_b.user_id().unwrap(),
1861 github_login: "user_b".to_string(),
1862 avatar_uri: "avatar_b".into(),
1863 name: None,
1864 email: None,
1865 }),
1866 project_id: project_b_id,
1867 worktree_root_names: vec!["b".to_string()]
1868 }]
1869 );
1870 assert_eq!(mem::take(&mut *events_b.borrow_mut()), vec![]);
1871
1872 // Sharing a project twice is idempotent.
1873 let project_b_id_2 = active_call_b
1874 .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
1875 .await
1876 .unwrap();
1877 assert_eq!(project_b_id_2, project_b_id);
1878 executor.run_until_parked();
1879 assert_eq!(mem::take(&mut *events_a.borrow_mut()), vec![]);
1880 assert_eq!(mem::take(&mut *events_b.borrow_mut()), vec![]);
1881
1882 // Unsharing a project should dispatch the RemoteProjectUnshared event.
1883 active_call_a
1884 .update(cx_a, |call, cx| call.hang_up(cx))
1885 .await
1886 .unwrap();
1887 executor.run_until_parked();
1888
1889 assert_eq!(
1890 mem::take(&mut *events_a.borrow_mut()),
1891 vec![room::Event::RoomLeft { channel_id: None }]
1892 );
1893 assert_eq!(
1894 mem::take(&mut *events_b.borrow_mut()),
1895 vec![room::Event::RemoteProjectUnshared {
1896 project_id: project_a_id,
1897 }]
1898 );
1899}
1900
1901fn active_call_events(cx: &mut TestAppContext) -> Rc<RefCell<Vec<room::Event>>> {
1902 let events = Rc::new(RefCell::new(Vec::new()));
1903 let active_call = cx.read(ActiveCall::global);
1904 cx.update({
1905 let events = events.clone();
1906 |cx| {
1907 cx.subscribe(&active_call, move |_, event, _| {
1908 events.borrow_mut().push(event.clone())
1909 })
1910 .detach()
1911 }
1912 });
1913 events
1914}
1915
1916#[gpui::test]
1917async fn test_mute_deafen(
1918 executor: BackgroundExecutor,
1919 cx_a: &mut TestAppContext,
1920 cx_b: &mut TestAppContext,
1921 cx_c: &mut TestAppContext,
1922) {
1923 let mut server = TestServer::start(executor.clone()).await;
1924 let client_a = server.create_client(cx_a, "user_a").await;
1925 let client_b = server.create_client(cx_b, "user_b").await;
1926 let client_c = server.create_client(cx_c, "user_c").await;
1927
1928 server
1929 .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
1930 .await;
1931
1932 let active_call_a = cx_a.read(ActiveCall::global);
1933 let active_call_b = cx_b.read(ActiveCall::global);
1934 let active_call_c = cx_c.read(ActiveCall::global);
1935
1936 // User A calls user B, B answers.
1937 active_call_a
1938 .update(cx_a, |call, cx| {
1939 call.invite(client_b.user_id().unwrap(), None, cx)
1940 })
1941 .await
1942 .unwrap();
1943 executor.run_until_parked();
1944 active_call_b
1945 .update(cx_b, |call, cx| call.accept_incoming(cx))
1946 .await
1947 .unwrap();
1948 executor.run_until_parked();
1949
1950 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
1951 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
1952
1953 room_a.read_with(cx_a, |room, _| assert!(!room.is_muted()));
1954 room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
1955
1956 // Users A and B are both unmuted.
1957 assert_eq!(
1958 participant_audio_state(&room_a, cx_a),
1959 &[ParticipantAudioState {
1960 user_id: client_b.user_id().unwrap(),
1961 is_muted: false,
1962 audio_tracks_playing: vec![true],
1963 }]
1964 );
1965 assert_eq!(
1966 participant_audio_state(&room_b, cx_b),
1967 &[ParticipantAudioState {
1968 user_id: client_a.user_id().unwrap(),
1969 is_muted: false,
1970 audio_tracks_playing: vec![true],
1971 }]
1972 );
1973
1974 // User A mutes
1975 room_a.update(cx_a, |room, cx| room.toggle_mute(cx));
1976 executor.run_until_parked();
1977
1978 // User A hears user B, but B doesn't hear A.
1979 room_a.read_with(cx_a, |room, _| assert!(room.is_muted()));
1980 room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
1981 assert_eq!(
1982 participant_audio_state(&room_a, cx_a),
1983 &[ParticipantAudioState {
1984 user_id: client_b.user_id().unwrap(),
1985 is_muted: false,
1986 audio_tracks_playing: vec![true],
1987 }]
1988 );
1989 assert_eq!(
1990 participant_audio_state(&room_b, cx_b),
1991 &[ParticipantAudioState {
1992 user_id: client_a.user_id().unwrap(),
1993 is_muted: true,
1994 audio_tracks_playing: vec![true],
1995 }]
1996 );
1997
1998 // User A deafens
1999 room_a.update(cx_a, |room, cx| room.toggle_deafen(cx));
2000 executor.run_until_parked();
2001
2002 // User A does not hear user B.
2003 room_a.read_with(cx_a, |room, _| assert!(room.is_muted()));
2004 room_b.read_with(cx_b, |room, _| assert!(!room.is_muted()));
2005 assert_eq!(
2006 participant_audio_state(&room_a, cx_a),
2007 &[ParticipantAudioState {
2008 user_id: client_b.user_id().unwrap(),
2009 is_muted: false,
2010 audio_tracks_playing: vec![false],
2011 }]
2012 );
2013 assert_eq!(
2014 participant_audio_state(&room_b, cx_b),
2015 &[ParticipantAudioState {
2016 user_id: client_a.user_id().unwrap(),
2017 is_muted: true,
2018 audio_tracks_playing: vec![true],
2019 }]
2020 );
2021
2022 // User B calls user C, C joins.
2023 active_call_b
2024 .update(cx_b, |call, cx| {
2025 call.invite(client_c.user_id().unwrap(), None, cx)
2026 })
2027 .await
2028 .unwrap();
2029 executor.run_until_parked();
2030 active_call_c
2031 .update(cx_c, |call, cx| call.accept_incoming(cx))
2032 .await
2033 .unwrap();
2034 executor.run_until_parked();
2035
2036 // User A does not hear users B or C.
2037 assert_eq!(
2038 participant_audio_state(&room_a, cx_a),
2039 &[
2040 ParticipantAudioState {
2041 user_id: client_b.user_id().unwrap(),
2042 is_muted: false,
2043 audio_tracks_playing: vec![false],
2044 },
2045 ParticipantAudioState {
2046 user_id: client_c.user_id().unwrap(),
2047 is_muted: false,
2048 audio_tracks_playing: vec![false],
2049 }
2050 ]
2051 );
2052 assert_eq!(
2053 participant_audio_state(&room_b, cx_b),
2054 &[
2055 ParticipantAudioState {
2056 user_id: client_a.user_id().unwrap(),
2057 is_muted: true,
2058 audio_tracks_playing: vec![true],
2059 },
2060 ParticipantAudioState {
2061 user_id: client_c.user_id().unwrap(),
2062 is_muted: false,
2063 audio_tracks_playing: vec![true],
2064 }
2065 ]
2066 );
2067
2068 #[derive(PartialEq, Eq, Debug)]
2069 struct ParticipantAudioState {
2070 user_id: u64,
2071 is_muted: bool,
2072 audio_tracks_playing: Vec<bool>,
2073 }
2074
2075 fn participant_audio_state(
2076 room: &Entity<Room>,
2077 cx: &TestAppContext,
2078 ) -> Vec<ParticipantAudioState> {
2079 room.read_with(cx, |room, _| {
2080 room.remote_participants()
2081 .iter()
2082 .map(|(user_id, participant)| ParticipantAudioState {
2083 user_id: *user_id,
2084 is_muted: participant.muted,
2085 audio_tracks_playing: participant
2086 .audio_tracks
2087 .values()
2088 .map({
2089 #[cfg(target_os = "macos")]
2090 {
2091 |track| track.is_playing()
2092 }
2093
2094 #[cfg(not(target_os = "macos"))]
2095 {
2096 |(track, _)| track.rtc_track().enabled()
2097 }
2098 })
2099 .collect(),
2100 })
2101 .collect::<Vec<_>>()
2102 })
2103 }
2104}
2105
2106#[gpui::test(iterations = 10)]
2107async fn test_room_location(
2108 executor: BackgroundExecutor,
2109 cx_a: &mut TestAppContext,
2110 cx_b: &mut TestAppContext,
2111) {
2112 let mut server = TestServer::start(executor.clone()).await;
2113 let client_a = server.create_client(cx_a, "user_a").await;
2114 let client_b = server.create_client(cx_b, "user_b").await;
2115 client_a.fs().insert_tree("/a", json!({})).await;
2116 client_b.fs().insert_tree("/b", json!({})).await;
2117
2118 let active_call_a = cx_a.read(ActiveCall::global);
2119 let active_call_b = cx_b.read(ActiveCall::global);
2120
2121 let a_notified = Rc::new(Cell::new(false));
2122 cx_a.update({
2123 let notified = a_notified.clone();
2124 |cx| {
2125 cx.observe(&active_call_a, move |_, _| notified.set(true))
2126 .detach()
2127 }
2128 });
2129
2130 let b_notified = Rc::new(Cell::new(false));
2131 cx_b.update({
2132 let b_notified = b_notified.clone();
2133 |cx| {
2134 cx.observe(&active_call_b, move |_, _| b_notified.set(true))
2135 .detach()
2136 }
2137 });
2138
2139 let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
2140 active_call_a
2141 .update(cx_a, |call, cx| call.set_location(Some(&project_a), cx))
2142 .await
2143 .unwrap();
2144 let (project_b, _) = client_b.build_local_project("/b", cx_b).await;
2145
2146 server
2147 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
2148 .await;
2149
2150 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
2151
2152 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
2153 executor.run_until_parked();
2154 assert!(a_notified.take());
2155 assert_eq!(
2156 participant_locations(&room_a, cx_a),
2157 vec![("user_b".to_string(), ParticipantLocation::External)]
2158 );
2159 assert!(b_notified.take());
2160 assert_eq!(
2161 participant_locations(&room_b, cx_b),
2162 vec![("user_a".to_string(), ParticipantLocation::UnsharedProject)]
2163 );
2164
2165 let project_a_id = active_call_a
2166 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
2167 .await
2168 .unwrap();
2169 executor.run_until_parked();
2170 assert!(a_notified.take());
2171 assert_eq!(
2172 participant_locations(&room_a, cx_a),
2173 vec![("user_b".to_string(), ParticipantLocation::External)]
2174 );
2175 assert!(b_notified.take());
2176 assert_eq!(
2177 participant_locations(&room_b, cx_b),
2178 vec![(
2179 "user_a".to_string(),
2180 ParticipantLocation::SharedProject {
2181 project_id: project_a_id
2182 }
2183 )]
2184 );
2185
2186 let project_b_id = active_call_b
2187 .update(cx_b, |call, cx| call.share_project(project_b.clone(), cx))
2188 .await
2189 .unwrap();
2190 executor.run_until_parked();
2191 assert!(a_notified.take());
2192 assert_eq!(
2193 participant_locations(&room_a, cx_a),
2194 vec![("user_b".to_string(), ParticipantLocation::External)]
2195 );
2196 assert!(b_notified.take());
2197 assert_eq!(
2198 participant_locations(&room_b, cx_b),
2199 vec![(
2200 "user_a".to_string(),
2201 ParticipantLocation::SharedProject {
2202 project_id: project_a_id
2203 }
2204 )]
2205 );
2206
2207 active_call_b
2208 .update(cx_b, |call, cx| call.set_location(Some(&project_b), cx))
2209 .await
2210 .unwrap();
2211 executor.run_until_parked();
2212 assert!(a_notified.take());
2213 assert_eq!(
2214 participant_locations(&room_a, cx_a),
2215 vec![(
2216 "user_b".to_string(),
2217 ParticipantLocation::SharedProject {
2218 project_id: project_b_id
2219 }
2220 )]
2221 );
2222 assert!(b_notified.take());
2223 assert_eq!(
2224 participant_locations(&room_b, cx_b),
2225 vec![(
2226 "user_a".to_string(),
2227 ParticipantLocation::SharedProject {
2228 project_id: project_a_id
2229 }
2230 )]
2231 );
2232
2233 active_call_b
2234 .update(cx_b, |call, cx| call.set_location(None, cx))
2235 .await
2236 .unwrap();
2237 executor.run_until_parked();
2238 assert!(a_notified.take());
2239 assert_eq!(
2240 participant_locations(&room_a, cx_a),
2241 vec![("user_b".to_string(), ParticipantLocation::External)]
2242 );
2243 assert!(b_notified.take());
2244 assert_eq!(
2245 participant_locations(&room_b, cx_b),
2246 vec![(
2247 "user_a".to_string(),
2248 ParticipantLocation::SharedProject {
2249 project_id: project_a_id
2250 }
2251 )]
2252 );
2253
2254 fn participant_locations(
2255 room: &Entity<Room>,
2256 cx: &TestAppContext,
2257 ) -> Vec<(String, ParticipantLocation)> {
2258 room.read_with(cx, |room, _| {
2259 room.remote_participants()
2260 .values()
2261 .map(|participant| {
2262 (
2263 participant.user.github_login.to_string(),
2264 participant.location,
2265 )
2266 })
2267 .collect()
2268 })
2269 }
2270}
2271
2272#[gpui::test(iterations = 10)]
2273async fn test_propagate_saves_and_fs_changes(
2274 executor: BackgroundExecutor,
2275 cx_a: &mut TestAppContext,
2276 cx_b: &mut TestAppContext,
2277 cx_c: &mut TestAppContext,
2278) {
2279 let mut server = TestServer::start(executor.clone()).await;
2280 let client_a = server.create_client(cx_a, "user_a").await;
2281 let client_b = server.create_client(cx_b, "user_b").await;
2282 let client_c = server.create_client(cx_c, "user_c").await;
2283
2284 server
2285 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
2286 .await;
2287 let active_call_a = cx_a.read(ActiveCall::global);
2288
2289 let rust = Arc::new(Language::new(
2290 LanguageConfig {
2291 name: "Rust".into(),
2292 matcher: LanguageMatcher {
2293 path_suffixes: vec!["rs".to_string()],
2294 ..Default::default()
2295 },
2296 ..Default::default()
2297 },
2298 Some(tree_sitter_rust::LANGUAGE.into()),
2299 ));
2300 let javascript = Arc::new(Language::new(
2301 LanguageConfig {
2302 name: "JavaScript".into(),
2303 matcher: LanguageMatcher {
2304 path_suffixes: vec!["js".to_string()],
2305 ..Default::default()
2306 },
2307 ..Default::default()
2308 },
2309 Some(tree_sitter_rust::LANGUAGE.into()),
2310 ));
2311 for client in [&client_a, &client_b, &client_c] {
2312 client.language_registry().add(rust.clone());
2313 client.language_registry().add(javascript.clone());
2314 }
2315
2316 client_a
2317 .fs()
2318 .insert_tree(
2319 "/a",
2320 json!({
2321 "file1.rs": "",
2322 "file2": ""
2323 }),
2324 )
2325 .await;
2326 let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
2327
2328 let worktree_a = project_a.read_with(cx_a, |p, cx| p.worktrees(cx).next().unwrap());
2329 let project_id = active_call_a
2330 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
2331 .await
2332 .unwrap();
2333
2334 // Join that worktree as clients B and C.
2335 let project_b = client_b.join_remote_project(project_id, cx_b).await;
2336 let project_c = client_c.join_remote_project(project_id, cx_c).await;
2337
2338 let worktree_b = project_b.read_with(cx_b, |p, cx| p.worktrees(cx).next().unwrap());
2339
2340 let worktree_c = project_c.read_with(cx_c, |p, cx| p.worktrees(cx).next().unwrap());
2341
2342 // Open and edit a buffer as both guests B and C.
2343 let buffer_b = project_b
2344 .update(cx_b, |p, cx| p.open_buffer((worktree_id, "file1.rs"), cx))
2345 .await
2346 .unwrap();
2347 let buffer_c = project_c
2348 .update(cx_c, |p, cx| p.open_buffer((worktree_id, "file1.rs"), cx))
2349 .await
2350 .unwrap();
2351
2352 buffer_b.read_with(cx_b, |buffer, _| {
2353 assert_eq!(buffer.language().unwrap().name(), "Rust".into());
2354 });
2355
2356 buffer_c.read_with(cx_c, |buffer, _| {
2357 assert_eq!(buffer.language().unwrap().name(), "Rust".into());
2358 });
2359 buffer_b.update(cx_b, |buf, cx| buf.edit([(0..0, "i-am-b, ")], None, cx));
2360 buffer_c.update(cx_c, |buf, cx| buf.edit([(0..0, "i-am-c, ")], None, cx));
2361
2362 // Open and edit that buffer as the host.
2363 let buffer_a = project_a
2364 .update(cx_a, |p, cx| p.open_buffer((worktree_id, "file1.rs"), cx))
2365 .await
2366 .unwrap();
2367
2368 executor.run_until_parked();
2369
2370 buffer_a.read_with(cx_a, |buf, _| assert_eq!(buf.text(), "i-am-c, i-am-b, "));
2371 buffer_a.update(cx_a, |buf, cx| {
2372 buf.edit([(buf.len()..buf.len(), "i-am-a")], None, cx)
2373 });
2374
2375 executor.run_until_parked();
2376
2377 buffer_a.read_with(cx_a, |buf, _| {
2378 assert_eq!(buf.text(), "i-am-c, i-am-b, i-am-a");
2379 });
2380
2381 buffer_b.read_with(cx_b, |buf, _| {
2382 assert_eq!(buf.text(), "i-am-c, i-am-b, i-am-a");
2383 });
2384
2385 buffer_c.read_with(cx_c, |buf, _| {
2386 assert_eq!(buf.text(), "i-am-c, i-am-b, i-am-a");
2387 });
2388
2389 // Edit the buffer as the host and concurrently save as guest B.
2390 let save_b = project_b.update(cx_b, |project, cx| {
2391 project.save_buffer(buffer_b.clone(), cx)
2392 });
2393 buffer_a.update(cx_a, |buf, cx| buf.edit([(0..0, "hi-a, ")], None, cx));
2394 save_b.await.unwrap();
2395 assert_eq!(
2396 client_a.fs().load("/a/file1.rs".as_ref()).await.unwrap(),
2397 "hi-a, i-am-c, i-am-b, i-am-a"
2398 );
2399
2400 executor.run_until_parked();
2401
2402 buffer_a.read_with(cx_a, |buf, _| assert!(!buf.is_dirty()));
2403
2404 buffer_b.read_with(cx_b, |buf, _| assert!(!buf.is_dirty()));
2405
2406 buffer_c.read_with(cx_c, |buf, _| assert!(!buf.is_dirty()));
2407
2408 // Make changes on host's file system, see those changes on guest worktrees.
2409 client_a
2410 .fs()
2411 .rename(
2412 "/a/file1.rs".as_ref(),
2413 "/a/file1.js".as_ref(),
2414 Default::default(),
2415 )
2416 .await
2417 .unwrap();
2418 client_a
2419 .fs()
2420 .rename("/a/file2".as_ref(), "/a/file3".as_ref(), Default::default())
2421 .await
2422 .unwrap();
2423 client_a.fs().insert_file("/a/file4", "4".into()).await;
2424 executor.run_until_parked();
2425
2426 worktree_a.read_with(cx_a, |tree, _| {
2427 assert_eq!(
2428 tree.paths()
2429 .map(|p| p.to_string_lossy())
2430 .collect::<Vec<_>>(),
2431 ["file1.js", "file3", "file4"]
2432 )
2433 });
2434
2435 worktree_b.read_with(cx_b, |tree, _| {
2436 assert_eq!(
2437 tree.paths()
2438 .map(|p| p.to_string_lossy())
2439 .collect::<Vec<_>>(),
2440 ["file1.js", "file3", "file4"]
2441 )
2442 });
2443
2444 worktree_c.read_with(cx_c, |tree, _| {
2445 assert_eq!(
2446 tree.paths()
2447 .map(|p| p.to_string_lossy())
2448 .collect::<Vec<_>>(),
2449 ["file1.js", "file3", "file4"]
2450 )
2451 });
2452
2453 // Ensure buffer files are updated as well.
2454
2455 buffer_a.read_with(cx_a, |buffer, _| {
2456 assert_eq!(buffer.file().unwrap().path().to_str(), Some("file1.js"));
2457 assert_eq!(buffer.language().unwrap().name(), "JavaScript".into());
2458 });
2459
2460 buffer_b.read_with(cx_b, |buffer, _| {
2461 assert_eq!(buffer.file().unwrap().path().to_str(), Some("file1.js"));
2462 assert_eq!(buffer.language().unwrap().name(), "JavaScript".into());
2463 });
2464
2465 buffer_c.read_with(cx_c, |buffer, _| {
2466 assert_eq!(buffer.file().unwrap().path().to_str(), Some("file1.js"));
2467 assert_eq!(buffer.language().unwrap().name(), "JavaScript".into());
2468 });
2469
2470 let new_buffer_a = project_a
2471 .update(cx_a, |p, cx| p.create_buffer(cx))
2472 .await
2473 .unwrap();
2474
2475 let new_buffer_id = new_buffer_a.read_with(cx_a, |buffer, _| buffer.remote_id());
2476 let new_buffer_b = project_b
2477 .update(cx_b, |p, cx| p.open_buffer_by_id(new_buffer_id, cx))
2478 .await
2479 .unwrap();
2480
2481 new_buffer_b.read_with(cx_b, |buffer, _| {
2482 assert!(buffer.file().is_none());
2483 });
2484
2485 new_buffer_a.update(cx_a, |buffer, cx| {
2486 buffer.edit([(0..0, "ok")], None, cx);
2487 });
2488 project_a
2489 .update(cx_a, |project, cx| {
2490 let path = ProjectPath {
2491 path: Arc::from(Path::new("file3.rs")),
2492 worktree_id: worktree_a.read(cx).id(),
2493 };
2494
2495 project.save_buffer_as(new_buffer_a.clone(), path, cx)
2496 })
2497 .await
2498 .unwrap();
2499
2500 executor.run_until_parked();
2501
2502 new_buffer_b.read_with(cx_b, |buffer_b, _| {
2503 assert_eq!(
2504 buffer_b.file().unwrap().path().as_ref(),
2505 Path::new("file3.rs")
2506 );
2507
2508 new_buffer_a.read_with(cx_a, |buffer_a, _| {
2509 assert_eq!(buffer_b.saved_mtime(), buffer_a.saved_mtime());
2510 assert_eq!(buffer_b.saved_version(), buffer_a.saved_version());
2511 });
2512 });
2513}
2514
2515#[gpui::test(iterations = 10)]
2516async fn test_git_diff_base_change(
2517 executor: BackgroundExecutor,
2518 cx_a: &mut TestAppContext,
2519 cx_b: &mut TestAppContext,
2520) {
2521 let mut server = TestServer::start(executor.clone()).await;
2522 let client_a = server.create_client(cx_a, "user_a").await;
2523 let client_b = server.create_client(cx_b, "user_b").await;
2524 server
2525 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
2526 .await;
2527 let active_call_a = cx_a.read(ActiveCall::global);
2528
2529 client_a
2530 .fs()
2531 .insert_tree(
2532 "/dir",
2533 json!({
2534 ".git": {},
2535 "sub": {
2536 ".git": {},
2537 "b.txt": "
2538 one
2539 two
2540 three
2541 ".unindent(),
2542 },
2543 "a.txt": "
2544 one
2545 two
2546 three
2547 ".unindent(),
2548 }),
2549 )
2550 .await;
2551
2552 let (project_local, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
2553 let project_id = active_call_a
2554 .update(cx_a, |call, cx| {
2555 call.share_project(project_local.clone(), cx)
2556 })
2557 .await
2558 .unwrap();
2559
2560 let project_remote = client_b.join_remote_project(project_id, cx_b).await;
2561
2562 let staged_text = "
2563 one
2564 three
2565 "
2566 .unindent();
2567
2568 let committed_text = "
2569 one
2570 TWO
2571 three
2572 "
2573 .unindent();
2574
2575 let new_committed_text = "
2576 one
2577 TWO_HUNDRED
2578 three
2579 "
2580 .unindent();
2581
2582 let new_staged_text = "
2583 one
2584 two
2585 "
2586 .unindent();
2587
2588 client_a.fs().set_index_for_repo(
2589 Path::new("/dir/.git"),
2590 &[("a.txt".into(), staged_text.clone())],
2591 );
2592 client_a.fs().set_head_for_repo(
2593 Path::new("/dir/.git"),
2594 &[("a.txt".into(), committed_text.clone())],
2595 );
2596
2597 // Create the buffer
2598 let buffer_local_a = project_local
2599 .update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
2600 .await
2601 .unwrap();
2602 let local_unstaged_diff_a = project_local
2603 .update(cx_a, |p, cx| {
2604 p.open_unstaged_diff(buffer_local_a.clone(), cx)
2605 })
2606 .await
2607 .unwrap();
2608
2609 // Wait for it to catch up to the new diff
2610 executor.run_until_parked();
2611 local_unstaged_diff_a.read_with(cx_a, |diff, cx| {
2612 let buffer = buffer_local_a.read(cx);
2613 assert_eq!(
2614 diff.base_text_string().as_deref(),
2615 Some(staged_text.as_str())
2616 );
2617 assert_hunks(
2618 diff.hunks_in_row_range(0..4, buffer, cx),
2619 buffer,
2620 &diff.base_text_string().unwrap(),
2621 &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
2622 );
2623 });
2624
2625 // Create remote buffer
2626 let remote_buffer_a = project_remote
2627 .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
2628 .await
2629 .unwrap();
2630 let remote_unstaged_diff_a = project_remote
2631 .update(cx_b, |p, cx| {
2632 p.open_unstaged_diff(remote_buffer_a.clone(), cx)
2633 })
2634 .await
2635 .unwrap();
2636
2637 // Wait remote buffer to catch up to the new diff
2638 executor.run_until_parked();
2639 remote_unstaged_diff_a.read_with(cx_b, |diff, cx| {
2640 let buffer = remote_buffer_a.read(cx);
2641 assert_eq!(
2642 diff.base_text_string().as_deref(),
2643 Some(staged_text.as_str())
2644 );
2645 assert_hunks(
2646 diff.hunks_in_row_range(0..4, buffer, cx),
2647 buffer,
2648 &diff.base_text_string().unwrap(),
2649 &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
2650 );
2651 });
2652
2653 // Open uncommitted changes on the guest, without opening them on the host first
2654 let remote_uncommitted_diff_a = project_remote
2655 .update(cx_b, |p, cx| {
2656 p.open_uncommitted_diff(remote_buffer_a.clone(), cx)
2657 })
2658 .await
2659 .unwrap();
2660 executor.run_until_parked();
2661 remote_uncommitted_diff_a.read_with(cx_b, |diff, cx| {
2662 let buffer = remote_buffer_a.read(cx);
2663 assert_eq!(
2664 diff.base_text_string().as_deref(),
2665 Some(committed_text.as_str())
2666 );
2667 assert_hunks(
2668 diff.hunks_in_row_range(0..4, buffer, cx),
2669 buffer,
2670 &diff.base_text_string().unwrap(),
2671 &[(
2672 1..2,
2673 "TWO\n",
2674 "two\n",
2675 DiffHunkStatus::modified(DiffHunkSecondaryStatus::HasSecondaryHunk),
2676 )],
2677 );
2678 });
2679
2680 // Update the index text of the open buffer
2681 client_a.fs().set_index_for_repo(
2682 Path::new("/dir/.git"),
2683 &[("a.txt".into(), new_staged_text.clone())],
2684 );
2685 client_a.fs().set_head_for_repo(
2686 Path::new("/dir/.git"),
2687 &[("a.txt".into(), new_committed_text.clone())],
2688 );
2689
2690 // Wait for buffer_local_a to receive it
2691 executor.run_until_parked();
2692 local_unstaged_diff_a.read_with(cx_a, |diff, cx| {
2693 let buffer = buffer_local_a.read(cx);
2694 assert_eq!(
2695 diff.base_text_string().as_deref(),
2696 Some(new_staged_text.as_str())
2697 );
2698 assert_hunks(
2699 diff.hunks_in_row_range(0..4, buffer, cx),
2700 buffer,
2701 &diff.base_text_string().unwrap(),
2702 &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
2703 );
2704 });
2705
2706 // Guest receives index text update
2707 remote_unstaged_diff_a.read_with(cx_b, |diff, cx| {
2708 let buffer = remote_buffer_a.read(cx);
2709 assert_eq!(
2710 diff.base_text_string().as_deref(),
2711 Some(new_staged_text.as_str())
2712 );
2713 assert_hunks(
2714 diff.hunks_in_row_range(0..4, buffer, cx),
2715 buffer,
2716 &diff.base_text_string().unwrap(),
2717 &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
2718 );
2719 });
2720
2721 remote_uncommitted_diff_a.read_with(cx_b, |diff, cx| {
2722 let buffer = remote_buffer_a.read(cx);
2723 assert_eq!(
2724 diff.base_text_string().as_deref(),
2725 Some(new_committed_text.as_str())
2726 );
2727 assert_hunks(
2728 diff.hunks_in_row_range(0..4, buffer, cx),
2729 buffer,
2730 &diff.base_text_string().unwrap(),
2731 &[(
2732 1..2,
2733 "TWO_HUNDRED\n",
2734 "two\n",
2735 DiffHunkStatus::modified(DiffHunkSecondaryStatus::OverlapsWithSecondaryHunk),
2736 )],
2737 );
2738 });
2739
2740 // Nested git dir
2741 let staged_text = "
2742 one
2743 three
2744 "
2745 .unindent();
2746
2747 let new_staged_text = "
2748 one
2749 two
2750 "
2751 .unindent();
2752
2753 client_a.fs().set_index_for_repo(
2754 Path::new("/dir/sub/.git"),
2755 &[("b.txt".into(), staged_text.clone())],
2756 );
2757
2758 // Create the buffer
2759 let buffer_local_b = project_local
2760 .update(cx_a, |p, cx| p.open_buffer((worktree_id, "sub/b.txt"), cx))
2761 .await
2762 .unwrap();
2763 let local_unstaged_diff_b = project_local
2764 .update(cx_a, |p, cx| {
2765 p.open_unstaged_diff(buffer_local_b.clone(), cx)
2766 })
2767 .await
2768 .unwrap();
2769
2770 // Wait for it to catch up to the new diff
2771 executor.run_until_parked();
2772 local_unstaged_diff_b.read_with(cx_a, |diff, cx| {
2773 let buffer = buffer_local_b.read(cx);
2774 assert_eq!(
2775 diff.base_text_string().as_deref(),
2776 Some(staged_text.as_str())
2777 );
2778 assert_hunks(
2779 diff.hunks_in_row_range(0..4, buffer, cx),
2780 buffer,
2781 &diff.base_text_string().unwrap(),
2782 &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
2783 );
2784 });
2785
2786 // Create remote buffer
2787 let remote_buffer_b = project_remote
2788 .update(cx_b, |p, cx| p.open_buffer((worktree_id, "sub/b.txt"), cx))
2789 .await
2790 .unwrap();
2791 let remote_unstaged_diff_b = project_remote
2792 .update(cx_b, |p, cx| {
2793 p.open_unstaged_diff(remote_buffer_b.clone(), cx)
2794 })
2795 .await
2796 .unwrap();
2797
2798 executor.run_until_parked();
2799 remote_unstaged_diff_b.read_with(cx_b, |diff, cx| {
2800 let buffer = remote_buffer_b.read(cx);
2801 assert_eq!(
2802 diff.base_text_string().as_deref(),
2803 Some(staged_text.as_str())
2804 );
2805 assert_hunks(
2806 diff.hunks_in_row_range(0..4, buffer, cx),
2807 buffer,
2808 &staged_text,
2809 &[(1..2, "", "two\n", DiffHunkStatus::added_none())],
2810 );
2811 });
2812
2813 // Updatet the staged text
2814 client_a.fs().set_index_for_repo(
2815 Path::new("/dir/sub/.git"),
2816 &[("b.txt".into(), new_staged_text.clone())],
2817 );
2818
2819 // Wait for buffer_local_b to receive it
2820 executor.run_until_parked();
2821 local_unstaged_diff_b.read_with(cx_a, |diff, cx| {
2822 let buffer = buffer_local_b.read(cx);
2823 assert_eq!(
2824 diff.base_text_string().as_deref(),
2825 Some(new_staged_text.as_str())
2826 );
2827 assert_hunks(
2828 diff.hunks_in_row_range(0..4, buffer, cx),
2829 buffer,
2830 &new_staged_text,
2831 &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
2832 );
2833 });
2834
2835 remote_unstaged_diff_b.read_with(cx_b, |diff, cx| {
2836 let buffer = remote_buffer_b.read(cx);
2837 assert_eq!(
2838 diff.base_text_string().as_deref(),
2839 Some(new_staged_text.as_str())
2840 );
2841 assert_hunks(
2842 diff.hunks_in_row_range(0..4, buffer, cx),
2843 buffer,
2844 &new_staged_text,
2845 &[(2..3, "", "three\n", DiffHunkStatus::added_none())],
2846 );
2847 });
2848}
2849
2850#[gpui::test(iterations = 10)]
2851async fn test_git_branch_name(
2852 executor: BackgroundExecutor,
2853 cx_a: &mut TestAppContext,
2854 cx_b: &mut TestAppContext,
2855 cx_c: &mut TestAppContext,
2856) {
2857 let mut server = TestServer::start(executor.clone()).await;
2858 let client_a = server.create_client(cx_a, "user_a").await;
2859 let client_b = server.create_client(cx_b, "user_b").await;
2860 let client_c = server.create_client(cx_c, "user_c").await;
2861 server
2862 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
2863 .await;
2864 let active_call_a = cx_a.read(ActiveCall::global);
2865
2866 client_a
2867 .fs()
2868 .insert_tree(
2869 "/dir",
2870 json!({
2871 ".git": {},
2872 }),
2873 )
2874 .await;
2875
2876 let (project_local, _worktree_id) = client_a.build_local_project("/dir", cx_a).await;
2877 let project_id = active_call_a
2878 .update(cx_a, |call, cx| {
2879 call.share_project(project_local.clone(), cx)
2880 })
2881 .await
2882 .unwrap();
2883
2884 let project_remote = client_b.join_remote_project(project_id, cx_b).await;
2885 client_a
2886 .fs()
2887 .set_branch_name(Path::new("/dir/.git"), Some("branch-1"));
2888
2889 // Wait for it to catch up to the new branch
2890 executor.run_until_parked();
2891
2892 #[track_caller]
2893 fn assert_branch(branch_name: Option<impl Into<String>>, project: &Project, cx: &App) {
2894 let branch_name = branch_name.map(Into::into);
2895 let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
2896 assert_eq!(worktrees.len(), 1);
2897 let worktree = worktrees[0].clone();
2898 let snapshot = worktree.read(cx).snapshot();
2899 let repo = snapshot.repositories().first().unwrap();
2900 assert_eq!(
2901 repo.branch().map(|branch| branch.name.to_string()),
2902 branch_name
2903 );
2904 }
2905
2906 // Smoke test branch reading
2907
2908 project_local.read_with(cx_a, |project, cx| {
2909 assert_branch(Some("branch-1"), project, cx)
2910 });
2911
2912 project_remote.read_with(cx_b, |project, cx| {
2913 assert_branch(Some("branch-1"), project, cx)
2914 });
2915
2916 client_a
2917 .fs()
2918 .set_branch_name(Path::new("/dir/.git"), Some("branch-2"));
2919
2920 // Wait for buffer_local_a to receive it
2921 executor.run_until_parked();
2922
2923 // Smoke test branch reading
2924
2925 project_local.read_with(cx_a, |project, cx| {
2926 assert_branch(Some("branch-2"), project, cx)
2927 });
2928
2929 project_remote.read_with(cx_b, |project, cx| {
2930 assert_branch(Some("branch-2"), project, cx)
2931 });
2932
2933 let project_remote_c = client_c.join_remote_project(project_id, cx_c).await;
2934 executor.run_until_parked();
2935
2936 project_remote_c.read_with(cx_c, |project, cx| {
2937 assert_branch(Some("branch-2"), project, cx)
2938 });
2939}
2940
2941#[gpui::test]
2942async fn test_git_status_sync(
2943 executor: BackgroundExecutor,
2944 cx_a: &mut TestAppContext,
2945 cx_b: &mut TestAppContext,
2946 cx_c: &mut TestAppContext,
2947) {
2948 let mut server = TestServer::start(executor.clone()).await;
2949 let client_a = server.create_client(cx_a, "user_a").await;
2950 let client_b = server.create_client(cx_b, "user_b").await;
2951 let client_c = server.create_client(cx_c, "user_c").await;
2952 server
2953 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
2954 .await;
2955 let active_call_a = cx_a.read(ActiveCall::global);
2956
2957 client_a
2958 .fs()
2959 .insert_tree(
2960 "/dir",
2961 json!({
2962 ".git": {},
2963 "a.txt": "a",
2964 "b.txt": "b",
2965 "c.txt": "c",
2966 }),
2967 )
2968 .await;
2969
2970 // Initially, a.txt is uncommitted, but present in the index,
2971 // and b.txt is unmerged.
2972 client_a.fs().set_head_for_repo(
2973 "/dir/.git".as_ref(),
2974 &[("b.txt".into(), "B".into()), ("c.txt".into(), "c".into())],
2975 );
2976 client_a.fs().set_index_for_repo(
2977 "/dir/.git".as_ref(),
2978 &[
2979 ("a.txt".into(), "".into()),
2980 ("b.txt".into(), "B".into()),
2981 ("c.txt".into(), "c".into()),
2982 ],
2983 );
2984 client_a.fs().set_unmerged_paths_for_repo(
2985 "/dir/.git".as_ref(),
2986 &[(
2987 "b.txt".into(),
2988 UnmergedStatus {
2989 first_head: UnmergedStatusCode::Updated,
2990 second_head: UnmergedStatusCode::Deleted,
2991 },
2992 )],
2993 );
2994
2995 const A_STATUS_START: FileStatus = FileStatus::Tracked(TrackedStatus {
2996 index_status: StatusCode::Added,
2997 worktree_status: StatusCode::Modified,
2998 });
2999 const B_STATUS_START: FileStatus = FileStatus::Unmerged(UnmergedStatus {
3000 first_head: UnmergedStatusCode::Updated,
3001 second_head: UnmergedStatusCode::Deleted,
3002 });
3003
3004 let (project_local, _worktree_id) = client_a.build_local_project("/dir", cx_a).await;
3005 let project_id = active_call_a
3006 .update(cx_a, |call, cx| {
3007 call.share_project(project_local.clone(), cx)
3008 })
3009 .await
3010 .unwrap();
3011
3012 let project_remote = client_b.join_remote_project(project_id, cx_b).await;
3013
3014 // Wait for it to catch up to the new status
3015 executor.run_until_parked();
3016
3017 #[track_caller]
3018 fn assert_status(
3019 file: impl AsRef<Path>,
3020 status: Option<FileStatus>,
3021 project: &Project,
3022 cx: &App,
3023 ) {
3024 let file = file.as_ref();
3025 let worktrees = project.visible_worktrees(cx).collect::<Vec<_>>();
3026 assert_eq!(worktrees.len(), 1);
3027 let worktree = worktrees[0].clone();
3028 let snapshot = worktree.read(cx).snapshot();
3029 assert_eq!(snapshot.status_for_file(file), status);
3030 }
3031
3032 project_local.read_with(cx_a, |project, cx| {
3033 assert_status("a.txt", Some(A_STATUS_START), project, cx);
3034 assert_status("b.txt", Some(B_STATUS_START), project, cx);
3035 assert_status("c.txt", None, project, cx);
3036 });
3037
3038 project_remote.read_with(cx_b, |project, cx| {
3039 assert_status("a.txt", Some(A_STATUS_START), project, cx);
3040 assert_status("b.txt", Some(B_STATUS_START), project, cx);
3041 assert_status("c.txt", None, project, cx);
3042 });
3043
3044 const A_STATUS_END: FileStatus = FileStatus::Tracked(TrackedStatus {
3045 index_status: StatusCode::Added,
3046 worktree_status: StatusCode::Unmodified,
3047 });
3048 const B_STATUS_END: FileStatus = FileStatus::Tracked(TrackedStatus {
3049 index_status: StatusCode::Deleted,
3050 worktree_status: StatusCode::Added,
3051 });
3052 const C_STATUS_END: FileStatus = FileStatus::Tracked(TrackedStatus {
3053 index_status: StatusCode::Unmodified,
3054 worktree_status: StatusCode::Modified,
3055 });
3056
3057 // Delete b.txt from the index, mark conflict as resolved,
3058 // and modify c.txt in the working copy.
3059 client_a.fs().set_index_for_repo(
3060 "/dir/.git".as_ref(),
3061 &[("a.txt".into(), "a".into()), ("c.txt".into(), "c".into())],
3062 );
3063 client_a
3064 .fs()
3065 .set_unmerged_paths_for_repo("/dir/.git".as_ref(), &[]);
3066 client_a
3067 .fs()
3068 .atomic_write("/dir/c.txt".into(), "CC".into())
3069 .await
3070 .unwrap();
3071
3072 // Wait for buffer_local_a to receive it
3073 executor.run_until_parked();
3074
3075 // Smoke test status reading
3076 project_local.read_with(cx_a, |project, cx| {
3077 assert_status("a.txt", Some(A_STATUS_END), project, cx);
3078 assert_status("b.txt", Some(B_STATUS_END), project, cx);
3079 assert_status("c.txt", Some(C_STATUS_END), project, cx);
3080 });
3081
3082 project_remote.read_with(cx_b, |project, cx| {
3083 assert_status("a.txt", Some(A_STATUS_END), project, cx);
3084 assert_status("b.txt", Some(B_STATUS_END), project, cx);
3085 assert_status("c.txt", Some(C_STATUS_END), project, cx);
3086 });
3087
3088 // And synchronization while joining
3089 let project_remote_c = client_c.join_remote_project(project_id, cx_c).await;
3090 executor.run_until_parked();
3091
3092 project_remote_c.read_with(cx_c, |project, cx| {
3093 assert_status("a.txt", Some(A_STATUS_END), project, cx);
3094 assert_status("b.txt", Some(B_STATUS_END), project, cx);
3095 assert_status("c.txt", Some(C_STATUS_END), project, cx);
3096 });
3097}
3098
3099#[gpui::test(iterations = 10)]
3100async fn test_fs_operations(
3101 executor: BackgroundExecutor,
3102 cx_a: &mut TestAppContext,
3103 cx_b: &mut TestAppContext,
3104) {
3105 let mut server = TestServer::start(executor.clone()).await;
3106 let client_a = server.create_client(cx_a, "user_a").await;
3107 let client_b = server.create_client(cx_b, "user_b").await;
3108 server
3109 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
3110 .await;
3111 let active_call_a = cx_a.read(ActiveCall::global);
3112
3113 client_a
3114 .fs()
3115 .insert_tree(
3116 "/dir",
3117 json!({
3118 "a.txt": "a-contents",
3119 "b.txt": "b-contents",
3120 }),
3121 )
3122 .await;
3123 let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
3124 let project_id = active_call_a
3125 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3126 .await
3127 .unwrap();
3128 let project_b = client_b.join_remote_project(project_id, cx_b).await;
3129
3130 let worktree_a = project_a.read_with(cx_a, |project, cx| project.worktrees(cx).next().unwrap());
3131 let worktree_b = project_b.read_with(cx_b, |project, cx| project.worktrees(cx).next().unwrap());
3132
3133 let entry = project_b
3134 .update(cx_b, |project, cx| {
3135 project.create_entry((worktree_id, "c.txt"), false, cx)
3136 })
3137 .await
3138 .unwrap()
3139 .to_included()
3140 .unwrap();
3141
3142 worktree_a.read_with(cx_a, |worktree, _| {
3143 assert_eq!(
3144 worktree
3145 .paths()
3146 .map(|p| p.to_string_lossy())
3147 .collect::<Vec<_>>(),
3148 ["a.txt", "b.txt", "c.txt"]
3149 );
3150 });
3151
3152 worktree_b.read_with(cx_b, |worktree, _| {
3153 assert_eq!(
3154 worktree
3155 .paths()
3156 .map(|p| p.to_string_lossy())
3157 .collect::<Vec<_>>(),
3158 ["a.txt", "b.txt", "c.txt"]
3159 );
3160 });
3161
3162 project_b
3163 .update(cx_b, |project, cx| {
3164 project.rename_entry(entry.id, Path::new("d.txt"), cx)
3165 })
3166 .await
3167 .unwrap()
3168 .to_included()
3169 .unwrap();
3170
3171 worktree_a.read_with(cx_a, |worktree, _| {
3172 assert_eq!(
3173 worktree
3174 .paths()
3175 .map(|p| p.to_string_lossy())
3176 .collect::<Vec<_>>(),
3177 ["a.txt", "b.txt", "d.txt"]
3178 );
3179 });
3180
3181 worktree_b.read_with(cx_b, |worktree, _| {
3182 assert_eq!(
3183 worktree
3184 .paths()
3185 .map(|p| p.to_string_lossy())
3186 .collect::<Vec<_>>(),
3187 ["a.txt", "b.txt", "d.txt"]
3188 );
3189 });
3190
3191 let dir_entry = project_b
3192 .update(cx_b, |project, cx| {
3193 project.create_entry((worktree_id, "DIR"), true, cx)
3194 })
3195 .await
3196 .unwrap()
3197 .to_included()
3198 .unwrap();
3199
3200 worktree_a.read_with(cx_a, |worktree, _| {
3201 assert_eq!(
3202 worktree
3203 .paths()
3204 .map(|p| p.to_string_lossy())
3205 .collect::<Vec<_>>(),
3206 ["DIR", "a.txt", "b.txt", "d.txt"]
3207 );
3208 });
3209
3210 worktree_b.read_with(cx_b, |worktree, _| {
3211 assert_eq!(
3212 worktree
3213 .paths()
3214 .map(|p| p.to_string_lossy())
3215 .collect::<Vec<_>>(),
3216 ["DIR", "a.txt", "b.txt", "d.txt"]
3217 );
3218 });
3219
3220 project_b
3221 .update(cx_b, |project, cx| {
3222 project.create_entry((worktree_id, "DIR/e.txt"), false, cx)
3223 })
3224 .await
3225 .unwrap()
3226 .to_included()
3227 .unwrap();
3228
3229 project_b
3230 .update(cx_b, |project, cx| {
3231 project.create_entry((worktree_id, "DIR/SUBDIR"), true, cx)
3232 })
3233 .await
3234 .unwrap()
3235 .to_included()
3236 .unwrap();
3237
3238 project_b
3239 .update(cx_b, |project, cx| {
3240 project.create_entry((worktree_id, "DIR/SUBDIR/f.txt"), false, cx)
3241 })
3242 .await
3243 .unwrap()
3244 .to_included()
3245 .unwrap();
3246
3247 worktree_a.read_with(cx_a, |worktree, _| {
3248 assert_eq!(
3249 worktree
3250 .paths()
3251 .map(|p| p.to_string_lossy())
3252 .collect::<Vec<_>>(),
3253 [
3254 "DIR",
3255 "DIR/SUBDIR",
3256 "DIR/SUBDIR/f.txt",
3257 "DIR/e.txt",
3258 "a.txt",
3259 "b.txt",
3260 "d.txt"
3261 ]
3262 );
3263 });
3264
3265 worktree_b.read_with(cx_b, |worktree, _| {
3266 assert_eq!(
3267 worktree
3268 .paths()
3269 .map(|p| p.to_string_lossy())
3270 .collect::<Vec<_>>(),
3271 [
3272 "DIR",
3273 "DIR/SUBDIR",
3274 "DIR/SUBDIR/f.txt",
3275 "DIR/e.txt",
3276 "a.txt",
3277 "b.txt",
3278 "d.txt"
3279 ]
3280 );
3281 });
3282
3283 project_b
3284 .update(cx_b, |project, cx| {
3285 project.copy_entry(entry.id, None, Path::new("f.txt"), cx)
3286 })
3287 .await
3288 .unwrap()
3289 .unwrap();
3290
3291 worktree_a.read_with(cx_a, |worktree, _| {
3292 assert_eq!(
3293 worktree
3294 .paths()
3295 .map(|p| p.to_string_lossy())
3296 .collect::<Vec<_>>(),
3297 [
3298 "DIR",
3299 "DIR/SUBDIR",
3300 "DIR/SUBDIR/f.txt",
3301 "DIR/e.txt",
3302 "a.txt",
3303 "b.txt",
3304 "d.txt",
3305 "f.txt"
3306 ]
3307 );
3308 });
3309
3310 worktree_b.read_with(cx_b, |worktree, _| {
3311 assert_eq!(
3312 worktree
3313 .paths()
3314 .map(|p| p.to_string_lossy())
3315 .collect::<Vec<_>>(),
3316 [
3317 "DIR",
3318 "DIR/SUBDIR",
3319 "DIR/SUBDIR/f.txt",
3320 "DIR/e.txt",
3321 "a.txt",
3322 "b.txt",
3323 "d.txt",
3324 "f.txt"
3325 ]
3326 );
3327 });
3328
3329 project_b
3330 .update(cx_b, |project, cx| {
3331 project.delete_entry(dir_entry.id, false, cx).unwrap()
3332 })
3333 .await
3334 .unwrap();
3335 executor.run_until_parked();
3336
3337 worktree_a.read_with(cx_a, |worktree, _| {
3338 assert_eq!(
3339 worktree
3340 .paths()
3341 .map(|p| p.to_string_lossy())
3342 .collect::<Vec<_>>(),
3343 ["a.txt", "b.txt", "d.txt", "f.txt"]
3344 );
3345 });
3346
3347 worktree_b.read_with(cx_b, |worktree, _| {
3348 assert_eq!(
3349 worktree
3350 .paths()
3351 .map(|p| p.to_string_lossy())
3352 .collect::<Vec<_>>(),
3353 ["a.txt", "b.txt", "d.txt", "f.txt"]
3354 );
3355 });
3356
3357 project_b
3358 .update(cx_b, |project, cx| {
3359 project.delete_entry(entry.id, false, cx).unwrap()
3360 })
3361 .await
3362 .unwrap();
3363
3364 worktree_a.read_with(cx_a, |worktree, _| {
3365 assert_eq!(
3366 worktree
3367 .paths()
3368 .map(|p| p.to_string_lossy())
3369 .collect::<Vec<_>>(),
3370 ["a.txt", "b.txt", "f.txt"]
3371 );
3372 });
3373
3374 worktree_b.read_with(cx_b, |worktree, _| {
3375 assert_eq!(
3376 worktree
3377 .paths()
3378 .map(|p| p.to_string_lossy())
3379 .collect::<Vec<_>>(),
3380 ["a.txt", "b.txt", "f.txt"]
3381 );
3382 });
3383}
3384
3385#[gpui::test(iterations = 10)]
3386async fn test_local_settings(
3387 executor: BackgroundExecutor,
3388 cx_a: &mut TestAppContext,
3389 cx_b: &mut TestAppContext,
3390) {
3391 let mut server = TestServer::start(executor.clone()).await;
3392 let client_a = server.create_client(cx_a, "user_a").await;
3393 let client_b = server.create_client(cx_b, "user_b").await;
3394 server
3395 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
3396 .await;
3397 let active_call_a = cx_a.read(ActiveCall::global);
3398
3399 // As client A, open a project that contains some local settings files
3400 client_a
3401 .fs()
3402 .insert_tree(
3403 "/dir",
3404 json!({
3405 ".zed": {
3406 "settings.json": r#"{ "tab_size": 2 }"#
3407 },
3408 "a": {
3409 ".zed": {
3410 "settings.json": r#"{ "tab_size": 8 }"#
3411 },
3412 "a.txt": "a-contents",
3413 },
3414 "b": {
3415 "b.txt": "b-contents",
3416 }
3417 }),
3418 )
3419 .await;
3420 let (project_a, _) = client_a.build_local_project("/dir", cx_a).await;
3421 executor.run_until_parked();
3422 let project_id = active_call_a
3423 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3424 .await
3425 .unwrap();
3426 executor.run_until_parked();
3427
3428 // As client B, join that project and observe the local settings.
3429 let project_b = client_b.join_remote_project(project_id, cx_b).await;
3430
3431 let worktree_b = project_b.read_with(cx_b, |project, cx| project.worktrees(cx).next().unwrap());
3432 executor.run_until_parked();
3433 cx_b.read(|cx| {
3434 let store = cx.global::<SettingsStore>();
3435 assert_eq!(
3436 store
3437 .local_settings(worktree_b.read(cx).id())
3438 .collect::<Vec<_>>(),
3439 &[
3440 (Path::new("").into(), r#"{"tab_size":2}"#.to_string()),
3441 (Path::new("a").into(), r#"{"tab_size":8}"#.to_string()),
3442 ]
3443 )
3444 });
3445
3446 // As client A, update a settings file. As Client B, see the changed settings.
3447 client_a
3448 .fs()
3449 .insert_file("/dir/.zed/settings.json", r#"{}"#.into())
3450 .await;
3451 executor.run_until_parked();
3452 cx_b.read(|cx| {
3453 let store = cx.global::<SettingsStore>();
3454 assert_eq!(
3455 store
3456 .local_settings(worktree_b.read(cx).id())
3457 .collect::<Vec<_>>(),
3458 &[
3459 (Path::new("").into(), r#"{}"#.to_string()),
3460 (Path::new("a").into(), r#"{"tab_size":8}"#.to_string()),
3461 ]
3462 )
3463 });
3464
3465 // As client A, create and remove some settings files. As client B, see the changed settings.
3466 client_a
3467 .fs()
3468 .remove_file("/dir/.zed/settings.json".as_ref(), Default::default())
3469 .await
3470 .unwrap();
3471 client_a
3472 .fs()
3473 .create_dir("/dir/b/.zed".as_ref())
3474 .await
3475 .unwrap();
3476 client_a
3477 .fs()
3478 .insert_file("/dir/b/.zed/settings.json", r#"{"tab_size": 4}"#.into())
3479 .await;
3480 executor.run_until_parked();
3481 cx_b.read(|cx| {
3482 let store = cx.global::<SettingsStore>();
3483 assert_eq!(
3484 store
3485 .local_settings(worktree_b.read(cx).id())
3486 .collect::<Vec<_>>(),
3487 &[
3488 (Path::new("a").into(), r#"{"tab_size":8}"#.to_string()),
3489 (Path::new("b").into(), r#"{"tab_size":4}"#.to_string()),
3490 ]
3491 )
3492 });
3493
3494 // As client B, disconnect.
3495 server.forbid_connections();
3496 server.disconnect_client(client_b.peer_id().unwrap());
3497
3498 // As client A, change and remove settings files while client B is disconnected.
3499 client_a
3500 .fs()
3501 .insert_file("/dir/a/.zed/settings.json", r#"{"hard_tabs":true}"#.into())
3502 .await;
3503 client_a
3504 .fs()
3505 .remove_file("/dir/b/.zed/settings.json".as_ref(), Default::default())
3506 .await
3507 .unwrap();
3508 executor.run_until_parked();
3509
3510 // As client B, reconnect and see the changed settings.
3511 server.allow_connections();
3512 executor.advance_clock(RECEIVE_TIMEOUT);
3513 cx_b.read(|cx| {
3514 let store = cx.global::<SettingsStore>();
3515 assert_eq!(
3516 store
3517 .local_settings(worktree_b.read(cx).id())
3518 .collect::<Vec<_>>(),
3519 &[(Path::new("a").into(), r#"{"hard_tabs":true}"#.to_string()),]
3520 )
3521 });
3522}
3523
3524#[gpui::test(iterations = 10)]
3525async fn test_buffer_conflict_after_save(
3526 executor: BackgroundExecutor,
3527 cx_a: &mut TestAppContext,
3528 cx_b: &mut TestAppContext,
3529) {
3530 let mut server = TestServer::start(executor.clone()).await;
3531 let client_a = server.create_client(cx_a, "user_a").await;
3532 let client_b = server.create_client(cx_b, "user_b").await;
3533 server
3534 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
3535 .await;
3536 let active_call_a = cx_a.read(ActiveCall::global);
3537
3538 client_a
3539 .fs()
3540 .insert_tree(
3541 "/dir",
3542 json!({
3543 "a.txt": "a-contents",
3544 }),
3545 )
3546 .await;
3547 let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
3548 let project_id = active_call_a
3549 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3550 .await
3551 .unwrap();
3552 let project_b = client_b.join_remote_project(project_id, cx_b).await;
3553
3554 // Open a buffer as client B
3555 let buffer_b = project_b
3556 .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
3557 .await
3558 .unwrap();
3559
3560 buffer_b.update(cx_b, |buf, cx| buf.edit([(0..0, "world ")], None, cx));
3561
3562 buffer_b.read_with(cx_b, |buf, _| {
3563 assert!(buf.is_dirty());
3564 assert!(!buf.has_conflict());
3565 });
3566
3567 project_b
3568 .update(cx_b, |project, cx| {
3569 project.save_buffer(buffer_b.clone(), cx)
3570 })
3571 .await
3572 .unwrap();
3573
3574 buffer_b.read_with(cx_b, |buffer_b, _| assert!(!buffer_b.is_dirty()));
3575
3576 buffer_b.read_with(cx_b, |buf, _| {
3577 assert!(!buf.has_conflict());
3578 });
3579
3580 buffer_b.update(cx_b, |buf, cx| buf.edit([(0..0, "hello ")], None, cx));
3581
3582 buffer_b.read_with(cx_b, |buf, _| {
3583 assert!(buf.is_dirty());
3584 assert!(!buf.has_conflict());
3585 });
3586}
3587
3588#[gpui::test(iterations = 10)]
3589async fn test_buffer_reloading(
3590 executor: BackgroundExecutor,
3591 cx_a: &mut TestAppContext,
3592 cx_b: &mut TestAppContext,
3593) {
3594 let mut server = TestServer::start(executor.clone()).await;
3595 let client_a = server.create_client(cx_a, "user_a").await;
3596 let client_b = server.create_client(cx_b, "user_b").await;
3597 server
3598 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
3599 .await;
3600 let active_call_a = cx_a.read(ActiveCall::global);
3601
3602 client_a
3603 .fs()
3604 .insert_tree(
3605 "/dir",
3606 json!({
3607 "a.txt": "a\nb\nc",
3608 }),
3609 )
3610 .await;
3611 let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
3612 let project_id = active_call_a
3613 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3614 .await
3615 .unwrap();
3616 let project_b = client_b.join_remote_project(project_id, cx_b).await;
3617
3618 // Open a buffer as client B
3619 let buffer_b = project_b
3620 .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
3621 .await
3622 .unwrap();
3623
3624 buffer_b.read_with(cx_b, |buf, _| {
3625 assert!(!buf.is_dirty());
3626 assert!(!buf.has_conflict());
3627 assert_eq!(buf.line_ending(), LineEnding::Unix);
3628 });
3629
3630 let new_contents = Rope::from("d\ne\nf");
3631 client_a
3632 .fs()
3633 .save("/dir/a.txt".as_ref(), &new_contents, LineEnding::Windows)
3634 .await
3635 .unwrap();
3636
3637 executor.run_until_parked();
3638
3639 buffer_b.read_with(cx_b, |buf, _| {
3640 assert_eq!(buf.text(), new_contents.to_string());
3641 assert!(!buf.is_dirty());
3642 assert!(!buf.has_conflict());
3643 assert_eq!(buf.line_ending(), LineEnding::Windows);
3644 });
3645}
3646
3647#[gpui::test(iterations = 10)]
3648async fn test_editing_while_guest_opens_buffer(
3649 executor: BackgroundExecutor,
3650 cx_a: &mut TestAppContext,
3651 cx_b: &mut TestAppContext,
3652) {
3653 let mut server = TestServer::start(executor.clone()).await;
3654 let client_a = server.create_client(cx_a, "user_a").await;
3655 let client_b = server.create_client(cx_b, "user_b").await;
3656 server
3657 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
3658 .await;
3659 let active_call_a = cx_a.read(ActiveCall::global);
3660
3661 client_a
3662 .fs()
3663 .insert_tree("/dir", json!({ "a.txt": "a-contents" }))
3664 .await;
3665 let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
3666 let project_id = active_call_a
3667 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3668 .await
3669 .unwrap();
3670 let project_b = client_b.join_remote_project(project_id, cx_b).await;
3671
3672 // Open a buffer as client A
3673 let buffer_a = project_a
3674 .update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
3675 .await
3676 .unwrap();
3677
3678 // Start opening the same buffer as client B
3679 let open_buffer = project_b.update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx));
3680 let buffer_b = cx_b.executor().spawn(open_buffer);
3681
3682 // Edit the buffer as client A while client B is still opening it.
3683 cx_b.executor().simulate_random_delay().await;
3684 buffer_a.update(cx_a, |buf, cx| buf.edit([(0..0, "X")], None, cx));
3685 cx_b.executor().simulate_random_delay().await;
3686 buffer_a.update(cx_a, |buf, cx| buf.edit([(1..1, "Y")], None, cx));
3687
3688 let text = buffer_a.read_with(cx_a, |buf, _| buf.text());
3689 let buffer_b = buffer_b.await.unwrap();
3690 executor.run_until_parked();
3691
3692 buffer_b.read_with(cx_b, |buf, _| assert_eq!(buf.text(), text));
3693}
3694
3695#[gpui::test(iterations = 10)]
3696async fn test_leaving_worktree_while_opening_buffer(
3697 executor: BackgroundExecutor,
3698 cx_a: &mut TestAppContext,
3699 cx_b: &mut TestAppContext,
3700) {
3701 let mut server = TestServer::start(executor.clone()).await;
3702 let client_a = server.create_client(cx_a, "user_a").await;
3703 let client_b = server.create_client(cx_b, "user_b").await;
3704 server
3705 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
3706 .await;
3707 let active_call_a = cx_a.read(ActiveCall::global);
3708
3709 client_a
3710 .fs()
3711 .insert_tree("/dir", json!({ "a.txt": "a-contents" }))
3712 .await;
3713 let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
3714 let project_id = active_call_a
3715 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3716 .await
3717 .unwrap();
3718 let project_b = client_b.join_remote_project(project_id, cx_b).await;
3719
3720 // See that a guest has joined as client A.
3721 executor.run_until_parked();
3722
3723 project_a.read_with(cx_a, |p, _| assert_eq!(p.collaborators().len(), 1));
3724
3725 // Begin opening a buffer as client B, but leave the project before the open completes.
3726 let open_buffer = project_b.update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx));
3727 let buffer_b = cx_b.executor().spawn(open_buffer);
3728 cx_b.update(|_| drop(project_b));
3729 drop(buffer_b);
3730
3731 // See that the guest has left.
3732 executor.run_until_parked();
3733
3734 project_a.read_with(cx_a, |p, _| assert!(p.collaborators().is_empty()));
3735}
3736
3737#[gpui::test(iterations = 10)]
3738async fn test_canceling_buffer_opening(
3739 executor: BackgroundExecutor,
3740 cx_a: &mut TestAppContext,
3741 cx_b: &mut TestAppContext,
3742) {
3743 let mut server = TestServer::start(executor.clone()).await;
3744 let client_a = server.create_client(cx_a, "user_a").await;
3745 let client_b = server.create_client(cx_b, "user_b").await;
3746 server
3747 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
3748 .await;
3749 let active_call_a = cx_a.read(ActiveCall::global);
3750
3751 client_a
3752 .fs()
3753 .insert_tree(
3754 "/dir",
3755 json!({
3756 "a.txt": "abc",
3757 }),
3758 )
3759 .await;
3760 let (project_a, worktree_id) = client_a.build_local_project("/dir", cx_a).await;
3761 let project_id = active_call_a
3762 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3763 .await
3764 .unwrap();
3765 let project_b = client_b.join_remote_project(project_id, cx_b).await;
3766
3767 let buffer_a = project_a
3768 .update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.txt"), cx))
3769 .await
3770 .unwrap();
3771
3772 // Open a buffer as client B but cancel after a random amount of time.
3773 let buffer_b = project_b.update(cx_b, |p, cx| {
3774 p.open_buffer_by_id(buffer_a.read_with(cx_a, |a, _| a.remote_id()), cx)
3775 });
3776 executor.simulate_random_delay().await;
3777 drop(buffer_b);
3778
3779 // Try opening the same buffer again as client B, and ensure we can
3780 // still do it despite the cancellation above.
3781 let buffer_b = project_b
3782 .update(cx_b, |p, cx| {
3783 p.open_buffer_by_id(buffer_a.read_with(cx_a, |a, _| a.remote_id()), cx)
3784 })
3785 .await
3786 .unwrap();
3787
3788 buffer_b.read_with(cx_b, |buf, _| assert_eq!(buf.text(), "abc"));
3789}
3790
3791#[gpui::test(iterations = 10)]
3792async fn test_leaving_project(
3793 executor: BackgroundExecutor,
3794 cx_a: &mut TestAppContext,
3795 cx_b: &mut TestAppContext,
3796 cx_c: &mut TestAppContext,
3797) {
3798 let mut server = TestServer::start(executor.clone()).await;
3799 let client_a = server.create_client(cx_a, "user_a").await;
3800 let client_b = server.create_client(cx_b, "user_b").await;
3801 let client_c = server.create_client(cx_c, "user_c").await;
3802 server
3803 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
3804 .await;
3805 let active_call_a = cx_a.read(ActiveCall::global);
3806
3807 client_a
3808 .fs()
3809 .insert_tree(
3810 "/a",
3811 json!({
3812 "a.txt": "a-contents",
3813 "b.txt": "b-contents",
3814 }),
3815 )
3816 .await;
3817 let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
3818 let project_id = active_call_a
3819 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
3820 .await
3821 .unwrap();
3822 let project_b1 = client_b.join_remote_project(project_id, cx_b).await;
3823 let project_c = client_c.join_remote_project(project_id, cx_c).await;
3824
3825 // Client A sees that a guest has joined.
3826 executor.run_until_parked();
3827
3828 project_a.read_with(cx_a, |project, _| {
3829 assert_eq!(project.collaborators().len(), 2);
3830 });
3831
3832 project_b1.read_with(cx_b, |project, _| {
3833 assert_eq!(project.collaborators().len(), 2);
3834 });
3835
3836 project_c.read_with(cx_c, |project, _| {
3837 assert_eq!(project.collaborators().len(), 2);
3838 });
3839
3840 // Client B opens a buffer.
3841 let buffer_b1 = project_b1
3842 .update(cx_b, |project, cx| {
3843 let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
3844 project.open_buffer((worktree_id, "a.txt"), cx)
3845 })
3846 .await
3847 .unwrap();
3848
3849 buffer_b1.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "a-contents"));
3850
3851 // Drop client B's project and ensure client A and client C observe client B leaving.
3852 cx_b.update(|_| drop(project_b1));
3853 executor.run_until_parked();
3854
3855 project_a.read_with(cx_a, |project, _| {
3856 assert_eq!(project.collaborators().len(), 1);
3857 });
3858
3859 project_c.read_with(cx_c, |project, _| {
3860 assert_eq!(project.collaborators().len(), 1);
3861 });
3862
3863 // Client B re-joins the project and can open buffers as before.
3864 let project_b2 = client_b.join_remote_project(project_id, cx_b).await;
3865 executor.run_until_parked();
3866
3867 project_a.read_with(cx_a, |project, _| {
3868 assert_eq!(project.collaborators().len(), 2);
3869 });
3870
3871 project_b2.read_with(cx_b, |project, _| {
3872 assert_eq!(project.collaborators().len(), 2);
3873 });
3874
3875 project_c.read_with(cx_c, |project, _| {
3876 assert_eq!(project.collaborators().len(), 2);
3877 });
3878
3879 let buffer_b2 = project_b2
3880 .update(cx_b, |project, cx| {
3881 let worktree_id = project.worktrees(cx).next().unwrap().read(cx).id();
3882 project.open_buffer((worktree_id, "a.txt"), cx)
3883 })
3884 .await
3885 .unwrap();
3886
3887 buffer_b2.read_with(cx_b, |buffer, _| assert_eq!(buffer.text(), "a-contents"));
3888
3889 project_a.read_with(cx_a, |project, _| {
3890 assert_eq!(project.collaborators().len(), 2);
3891 });
3892
3893 // Drop client B's connection and ensure client A and client C observe client B leaving.
3894 client_b.disconnect(&cx_b.to_async());
3895 executor.advance_clock(RECONNECT_TIMEOUT);
3896
3897 project_a.read_with(cx_a, |project, _| {
3898 assert_eq!(project.collaborators().len(), 1);
3899 });
3900
3901 project_b2.read_with(cx_b, |project, cx| {
3902 assert!(project.is_disconnected(cx));
3903 });
3904
3905 project_c.read_with(cx_c, |project, _| {
3906 assert_eq!(project.collaborators().len(), 1);
3907 });
3908
3909 // Client B can't join the project, unless they re-join the room.
3910 cx_b.spawn(|cx| {
3911 Project::in_room(
3912 project_id,
3913 client_b.app_state.client.clone(),
3914 client_b.user_store().clone(),
3915 client_b.language_registry().clone(),
3916 FakeFs::new(cx.background_executor().clone()),
3917 cx,
3918 )
3919 })
3920 .await
3921 .unwrap_err();
3922
3923 // Simulate connection loss for client C and ensure client A observes client C leaving the project.
3924 client_c.wait_for_current_user(cx_c).await;
3925 server.forbid_connections();
3926 server.disconnect_client(client_c.peer_id().unwrap());
3927 executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
3928 executor.run_until_parked();
3929
3930 project_a.read_with(cx_a, |project, _| {
3931 assert_eq!(project.collaborators().len(), 0);
3932 });
3933
3934 project_b2.read_with(cx_b, |project, cx| {
3935 assert!(project.is_disconnected(cx));
3936 });
3937
3938 project_c.read_with(cx_c, |project, cx| {
3939 assert!(project.is_disconnected(cx));
3940 });
3941}
3942
3943#[gpui::test(iterations = 10)]
3944async fn test_collaborating_with_diagnostics(
3945 executor: BackgroundExecutor,
3946 cx_a: &mut TestAppContext,
3947 cx_b: &mut TestAppContext,
3948 cx_c: &mut TestAppContext,
3949) {
3950 let mut server = TestServer::start(executor.clone()).await;
3951 let client_a = server.create_client(cx_a, "user_a").await;
3952 let client_b = server.create_client(cx_b, "user_b").await;
3953 let client_c = server.create_client(cx_c, "user_c").await;
3954 server
3955 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
3956 .await;
3957 let active_call_a = cx_a.read(ActiveCall::global);
3958
3959 client_a.language_registry().add(Arc::new(Language::new(
3960 LanguageConfig {
3961 name: "Rust".into(),
3962 matcher: LanguageMatcher {
3963 path_suffixes: vec!["rs".to_string()],
3964 ..Default::default()
3965 },
3966 ..Default::default()
3967 },
3968 Some(tree_sitter_rust::LANGUAGE.into()),
3969 )));
3970 let mut fake_language_servers = client_a
3971 .language_registry()
3972 .register_fake_lsp("Rust", Default::default());
3973
3974 // Share a project as client A
3975 client_a
3976 .fs()
3977 .insert_tree(
3978 "/a",
3979 json!({
3980 "a.rs": "let one = two",
3981 "other.rs": "",
3982 }),
3983 )
3984 .await;
3985 let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
3986
3987 // Cause the language server to start.
3988 let _buffer = project_a
3989 .update(cx_a, |project, cx| {
3990 project.open_local_buffer_with_lsp("/a/other.rs", cx)
3991 })
3992 .await
3993 .unwrap();
3994
3995 // Simulate a language server reporting errors for a file.
3996 let mut fake_language_server = fake_language_servers.next().await.unwrap();
3997 fake_language_server
3998 .receive_notification::<lsp::notification::DidOpenTextDocument>()
3999 .await;
4000 fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
4001 &lsp::PublishDiagnosticsParams {
4002 uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
4003 version: None,
4004 diagnostics: vec![lsp::Diagnostic {
4005 severity: Some(lsp::DiagnosticSeverity::WARNING),
4006 range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 7)),
4007 message: "message 0".to_string(),
4008 ..Default::default()
4009 }],
4010 },
4011 );
4012
4013 // Client A shares the project and, simultaneously, the language server
4014 // publishes a diagnostic. This is done to ensure that the server always
4015 // observes the latest diagnostics for a worktree.
4016 let project_id = active_call_a
4017 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
4018 .await
4019 .unwrap();
4020 fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
4021 &lsp::PublishDiagnosticsParams {
4022 uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
4023 version: None,
4024 diagnostics: vec![lsp::Diagnostic {
4025 severity: Some(lsp::DiagnosticSeverity::ERROR),
4026 range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 7)),
4027 message: "message 1".to_string(),
4028 ..Default::default()
4029 }],
4030 },
4031 );
4032
4033 // Join the worktree as client B.
4034 let project_b = client_b.join_remote_project(project_id, cx_b).await;
4035
4036 // Wait for server to see the diagnostics update.
4037 executor.run_until_parked();
4038
4039 // Ensure client B observes the new diagnostics.
4040
4041 project_b.read_with(cx_b, |project, cx| {
4042 assert_eq!(
4043 project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
4044 &[(
4045 ProjectPath {
4046 worktree_id,
4047 path: Arc::from(Path::new("a.rs")),
4048 },
4049 LanguageServerId(0),
4050 DiagnosticSummary {
4051 error_count: 1,
4052 warning_count: 0,
4053 },
4054 )]
4055 )
4056 });
4057
4058 // Join project as client C and observe the diagnostics.
4059 let project_c = client_c.join_remote_project(project_id, cx_c).await;
4060 executor.run_until_parked();
4061 let project_c_diagnostic_summaries =
4062 Rc::new(RefCell::new(project_c.read_with(cx_c, |project, cx| {
4063 project.diagnostic_summaries(false, cx).collect::<Vec<_>>()
4064 })));
4065 project_c.update(cx_c, |_, cx| {
4066 let summaries = project_c_diagnostic_summaries.clone();
4067 cx.subscribe(&project_c, {
4068 move |p, _, event, cx| {
4069 if let project::Event::DiskBasedDiagnosticsFinished { .. } = event {
4070 *summaries.borrow_mut() = p.diagnostic_summaries(false, cx).collect();
4071 }
4072 }
4073 })
4074 .detach();
4075 });
4076
4077 executor.run_until_parked();
4078 assert_eq!(
4079 project_c_diagnostic_summaries.borrow().as_slice(),
4080 &[(
4081 ProjectPath {
4082 worktree_id,
4083 path: Arc::from(Path::new("a.rs")),
4084 },
4085 LanguageServerId(0),
4086 DiagnosticSummary {
4087 error_count: 1,
4088 warning_count: 0,
4089 },
4090 )]
4091 );
4092
4093 // Simulate a language server reporting more errors for a file.
4094 fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
4095 &lsp::PublishDiagnosticsParams {
4096 uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
4097 version: None,
4098 diagnostics: vec![
4099 lsp::Diagnostic {
4100 severity: Some(lsp::DiagnosticSeverity::ERROR),
4101 range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 7)),
4102 message: "message 1".to_string(),
4103 ..Default::default()
4104 },
4105 lsp::Diagnostic {
4106 severity: Some(lsp::DiagnosticSeverity::WARNING),
4107 range: lsp::Range::new(lsp::Position::new(0, 10), lsp::Position::new(0, 13)),
4108 message: "message 2".to_string(),
4109 ..Default::default()
4110 },
4111 ],
4112 },
4113 );
4114
4115 // Clients B and C get the updated summaries
4116 executor.run_until_parked();
4117
4118 project_b.read_with(cx_b, |project, cx| {
4119 assert_eq!(
4120 project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
4121 [(
4122 ProjectPath {
4123 worktree_id,
4124 path: Arc::from(Path::new("a.rs")),
4125 },
4126 LanguageServerId(0),
4127 DiagnosticSummary {
4128 error_count: 1,
4129 warning_count: 1,
4130 },
4131 )]
4132 );
4133 });
4134
4135 project_c.read_with(cx_c, |project, cx| {
4136 assert_eq!(
4137 project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
4138 [(
4139 ProjectPath {
4140 worktree_id,
4141 path: Arc::from(Path::new("a.rs")),
4142 },
4143 LanguageServerId(0),
4144 DiagnosticSummary {
4145 error_count: 1,
4146 warning_count: 1,
4147 },
4148 )]
4149 );
4150 });
4151
4152 // Open the file with the errors on client B. They should be present.
4153 let open_buffer = project_b.update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.rs"), cx));
4154 let buffer_b = cx_b.executor().spawn(open_buffer).await.unwrap();
4155
4156 buffer_b.read_with(cx_b, |buffer, _| {
4157 assert_eq!(
4158 buffer
4159 .snapshot()
4160 .diagnostics_in_range::<_, Point>(0..buffer.len(), false)
4161 .collect::<Vec<_>>(),
4162 &[
4163 DiagnosticEntry {
4164 range: Point::new(0, 4)..Point::new(0, 7),
4165 diagnostic: Diagnostic {
4166 group_id: 2,
4167 message: "message 1".to_string(),
4168 severity: lsp::DiagnosticSeverity::ERROR,
4169 is_primary: true,
4170 ..Default::default()
4171 }
4172 },
4173 DiagnosticEntry {
4174 range: Point::new(0, 10)..Point::new(0, 13),
4175 diagnostic: Diagnostic {
4176 group_id: 3,
4177 severity: lsp::DiagnosticSeverity::WARNING,
4178 message: "message 2".to_string(),
4179 is_primary: true,
4180 ..Default::default()
4181 }
4182 }
4183 ]
4184 );
4185 });
4186
4187 // Simulate a language server reporting no errors for a file.
4188 fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
4189 &lsp::PublishDiagnosticsParams {
4190 uri: lsp::Url::from_file_path("/a/a.rs").unwrap(),
4191 version: None,
4192 diagnostics: vec![],
4193 },
4194 );
4195 executor.run_until_parked();
4196
4197 project_a.read_with(cx_a, |project, cx| {
4198 assert_eq!(
4199 project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
4200 []
4201 )
4202 });
4203
4204 project_b.read_with(cx_b, |project, cx| {
4205 assert_eq!(
4206 project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
4207 []
4208 )
4209 });
4210
4211 project_c.read_with(cx_c, |project, cx| {
4212 assert_eq!(
4213 project.diagnostic_summaries(false, cx).collect::<Vec<_>>(),
4214 []
4215 )
4216 });
4217}
4218
4219#[gpui::test(iterations = 10)]
4220async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
4221 executor: BackgroundExecutor,
4222 cx_a: &mut TestAppContext,
4223 cx_b: &mut TestAppContext,
4224) {
4225 let mut server = TestServer::start(executor.clone()).await;
4226 let client_a = server.create_client(cx_a, "user_a").await;
4227 let client_b = server.create_client(cx_b, "user_b").await;
4228 server
4229 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
4230 .await;
4231
4232 client_a.language_registry().add(rust_lang());
4233 let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
4234 "Rust",
4235 FakeLspAdapter {
4236 disk_based_diagnostics_progress_token: Some("the-disk-based-token".into()),
4237 disk_based_diagnostics_sources: vec!["the-disk-based-diagnostics-source".into()],
4238 ..Default::default()
4239 },
4240 );
4241
4242 let file_names = &["one.rs", "two.rs", "three.rs", "four.rs", "five.rs"];
4243 client_a
4244 .fs()
4245 .insert_tree(
4246 "/test",
4247 json!({
4248 "one.rs": "const ONE: usize = 1;",
4249 "two.rs": "const TWO: usize = 2;",
4250 "three.rs": "const THREE: usize = 3;",
4251 "four.rs": "const FOUR: usize = 3;",
4252 "five.rs": "const FIVE: usize = 3;",
4253 }),
4254 )
4255 .await;
4256
4257 let (project_a, worktree_id) = client_a.build_local_project("/test", cx_a).await;
4258
4259 // Share a project as client A
4260 let active_call_a = cx_a.read(ActiveCall::global);
4261 let project_id = active_call_a
4262 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
4263 .await
4264 .unwrap();
4265
4266 // Join the project as client B and open all three files.
4267 let project_b = client_b.join_remote_project(project_id, cx_b).await;
4268 let guest_buffers = futures::future::try_join_all(file_names.iter().map(|file_name| {
4269 project_b.update(cx_b, |p, cx| {
4270 p.open_buffer_with_lsp((worktree_id, file_name), cx)
4271 })
4272 }))
4273 .await
4274 .unwrap();
4275
4276 // Simulate a language server reporting errors for a file.
4277 let fake_language_server = fake_language_servers.next().await.unwrap();
4278 fake_language_server
4279 .request::<lsp::request::WorkDoneProgressCreate>(lsp::WorkDoneProgressCreateParams {
4280 token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
4281 })
4282 .await
4283 .unwrap();
4284 fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
4285 token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
4286 value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::Begin(
4287 lsp::WorkDoneProgressBegin {
4288 title: "Progress Began".into(),
4289 ..Default::default()
4290 },
4291 )),
4292 });
4293 for file_name in file_names {
4294 fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
4295 &lsp::PublishDiagnosticsParams {
4296 uri: lsp::Url::from_file_path(Path::new("/test").join(file_name)).unwrap(),
4297 version: None,
4298 diagnostics: vec![lsp::Diagnostic {
4299 severity: Some(lsp::DiagnosticSeverity::WARNING),
4300 source: Some("the-disk-based-diagnostics-source".into()),
4301 range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
4302 message: "message one".to_string(),
4303 ..Default::default()
4304 }],
4305 },
4306 );
4307 }
4308 fake_language_server.notify::<lsp::notification::Progress>(&lsp::ProgressParams {
4309 token: lsp::NumberOrString::String("the-disk-based-token".to_string()),
4310 value: lsp::ProgressParamsValue::WorkDone(lsp::WorkDoneProgress::End(
4311 lsp::WorkDoneProgressEnd { message: None },
4312 )),
4313 });
4314
4315 // When the "disk base diagnostics finished" message is received, the buffers'
4316 // diagnostics are expected to be present.
4317 let disk_based_diagnostics_finished = Arc::new(AtomicBool::new(false));
4318 project_b.update(cx_b, {
4319 let project_b = project_b.clone();
4320 let disk_based_diagnostics_finished = disk_based_diagnostics_finished.clone();
4321 move |_, cx| {
4322 cx.subscribe(&project_b, move |_, _, event, cx| {
4323 if let project::Event::DiskBasedDiagnosticsFinished { .. } = event {
4324 disk_based_diagnostics_finished.store(true, SeqCst);
4325 for (buffer, _) in &guest_buffers {
4326 assert_eq!(
4327 buffer
4328 .read(cx)
4329 .snapshot()
4330 .diagnostics_in_range::<_, usize>(0..5, false)
4331 .count(),
4332 1,
4333 "expected a diagnostic for buffer {:?}",
4334 buffer.read(cx).file().unwrap().path(),
4335 );
4336 }
4337 }
4338 })
4339 .detach();
4340 }
4341 });
4342
4343 executor.run_until_parked();
4344 assert!(disk_based_diagnostics_finished.load(SeqCst));
4345}
4346
4347#[gpui::test(iterations = 10)]
4348async fn test_reloading_buffer_manually(
4349 executor: BackgroundExecutor,
4350 cx_a: &mut TestAppContext,
4351 cx_b: &mut TestAppContext,
4352) {
4353 let mut server = TestServer::start(executor.clone()).await;
4354 let client_a = server.create_client(cx_a, "user_a").await;
4355 let client_b = server.create_client(cx_b, "user_b").await;
4356 server
4357 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
4358 .await;
4359 let active_call_a = cx_a.read(ActiveCall::global);
4360
4361 client_a
4362 .fs()
4363 .insert_tree("/a", json!({ "a.rs": "let one = 1;" }))
4364 .await;
4365 let (project_a, worktree_id) = client_a.build_local_project("/a", cx_a).await;
4366 let buffer_a = project_a
4367 .update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.rs"), cx))
4368 .await
4369 .unwrap();
4370 let project_id = active_call_a
4371 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
4372 .await
4373 .unwrap();
4374
4375 let project_b = client_b.join_remote_project(project_id, cx_b).await;
4376
4377 let open_buffer = project_b.update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.rs"), cx));
4378 let buffer_b = cx_b.executor().spawn(open_buffer).await.unwrap();
4379 buffer_b.update(cx_b, |buffer, cx| {
4380 buffer.edit([(4..7, "six")], None, cx);
4381 buffer.edit([(10..11, "6")], None, cx);
4382 assert_eq!(buffer.text(), "let six = 6;");
4383 assert!(buffer.is_dirty());
4384 assert!(!buffer.has_conflict());
4385 });
4386 executor.run_until_parked();
4387
4388 buffer_a.read_with(cx_a, |buffer, _| assert_eq!(buffer.text(), "let six = 6;"));
4389
4390 client_a
4391 .fs()
4392 .save(
4393 "/a/a.rs".as_ref(),
4394 &Rope::from("let seven = 7;"),
4395 LineEnding::Unix,
4396 )
4397 .await
4398 .unwrap();
4399 executor.run_until_parked();
4400
4401 buffer_a.read_with(cx_a, |buffer, _| assert!(buffer.has_conflict()));
4402
4403 buffer_b.read_with(cx_b, |buffer, _| assert!(buffer.has_conflict()));
4404
4405 project_b
4406 .update(cx_b, |project, cx| {
4407 project.reload_buffers(HashSet::from_iter([buffer_b.clone()]), true, cx)
4408 })
4409 .await
4410 .unwrap();
4411
4412 buffer_a.read_with(cx_a, |buffer, _| {
4413 assert_eq!(buffer.text(), "let seven = 7;");
4414 assert!(!buffer.is_dirty());
4415 assert!(!buffer.has_conflict());
4416 });
4417
4418 buffer_b.read_with(cx_b, |buffer, _| {
4419 assert_eq!(buffer.text(), "let seven = 7;");
4420 assert!(!buffer.is_dirty());
4421 assert!(!buffer.has_conflict());
4422 });
4423
4424 buffer_a.update(cx_a, |buffer, cx| {
4425 // Undoing on the host is a no-op when the reload was initiated by the guest.
4426 buffer.undo(cx);
4427 assert_eq!(buffer.text(), "let seven = 7;");
4428 assert!(!buffer.is_dirty());
4429 assert!(!buffer.has_conflict());
4430 });
4431 buffer_b.update(cx_b, |buffer, cx| {
4432 // Undoing on the guest rolls back the buffer to before it was reloaded but the conflict gets cleared.
4433 buffer.undo(cx);
4434 assert_eq!(buffer.text(), "let six = 6;");
4435 assert!(buffer.is_dirty());
4436 assert!(!buffer.has_conflict());
4437 });
4438}
4439
4440#[gpui::test(iterations = 10)]
4441async fn test_formatting_buffer(
4442 executor: BackgroundExecutor,
4443 cx_a: &mut TestAppContext,
4444 cx_b: &mut TestAppContext,
4445) {
4446 let mut server = TestServer::start(executor.clone()).await;
4447 let client_a = server.create_client(cx_a, "user_a").await;
4448 let client_b = server.create_client(cx_b, "user_b").await;
4449 server
4450 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
4451 .await;
4452 let active_call_a = cx_a.read(ActiveCall::global);
4453
4454 client_a.language_registry().add(rust_lang());
4455 let mut fake_language_servers = client_a
4456 .language_registry()
4457 .register_fake_lsp("Rust", FakeLspAdapter::default());
4458
4459 // Here we insert a fake tree with a directory that exists on disk. This is needed
4460 // because later we'll invoke a command, which requires passing a working directory
4461 // that points to a valid location on disk.
4462 let directory = env::current_dir().unwrap();
4463 client_a
4464 .fs()
4465 .insert_tree(&directory, json!({ "a.rs": "let one = \"two\"" }))
4466 .await;
4467 let (project_a, worktree_id) = client_a.build_local_project(&directory, cx_a).await;
4468 let project_id = active_call_a
4469 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
4470 .await
4471 .unwrap();
4472 let project_b = client_b.join_remote_project(project_id, cx_b).await;
4473
4474 let buffer_b = project_b
4475 .update(cx_b, |p, cx| p.open_buffer((worktree_id, "a.rs"), cx))
4476 .await
4477 .unwrap();
4478
4479 let _handle = project_b.update(cx_b, |project, cx| {
4480 project.register_buffer_with_language_servers(&buffer_b, cx)
4481 });
4482 let fake_language_server = fake_language_servers.next().await.unwrap();
4483 fake_language_server.handle_request::<lsp::request::Formatting, _, _>(|_, _| async move {
4484 Ok(Some(vec![
4485 lsp::TextEdit {
4486 range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 4)),
4487 new_text: "h".to_string(),
4488 },
4489 lsp::TextEdit {
4490 range: lsp::Range::new(lsp::Position::new(0, 7), lsp::Position::new(0, 7)),
4491 new_text: "y".to_string(),
4492 },
4493 ]))
4494 });
4495
4496 project_b
4497 .update(cx_b, |project, cx| {
4498 project.format(
4499 HashSet::from_iter([buffer_b.clone()]),
4500 LspFormatTarget::Buffers,
4501 true,
4502 FormatTrigger::Save,
4503 cx,
4504 )
4505 })
4506 .await
4507 .unwrap();
4508
4509 // The edits from the LSP are applied, and a final newline is added.
4510 assert_eq!(
4511 buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
4512 "let honey = \"two\"\n"
4513 );
4514
4515 // Ensure buffer can be formatted using an external command. Notice how the
4516 // host's configuration is honored as opposed to using the guest's settings.
4517 cx_a.update(|cx| {
4518 SettingsStore::update_global(cx, |store, cx| {
4519 store.update_user_settings::<AllLanguageSettings>(cx, |file| {
4520 file.defaults.formatter = Some(SelectedFormatter::List(FormatterList(
4521 vec![Formatter::External {
4522 command: "awk".into(),
4523 arguments: Some(vec!["{sub(/two/,\"{buffer_path}\")}1".to_string()].into()),
4524 }]
4525 .into(),
4526 )));
4527 });
4528 });
4529 });
4530
4531 executor.allow_parking();
4532 project_b
4533 .update(cx_b, |project, cx| {
4534 project.format(
4535 HashSet::from_iter([buffer_b.clone()]),
4536 LspFormatTarget::Buffers,
4537 true,
4538 FormatTrigger::Save,
4539 cx,
4540 )
4541 })
4542 .await
4543 .unwrap();
4544 assert_eq!(
4545 buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
4546 format!("let honey = \"{}/a.rs\"\n", directory.to_str().unwrap())
4547 );
4548}
4549
4550#[gpui::test(iterations = 10)]
4551async fn test_prettier_formatting_buffer(
4552 executor: BackgroundExecutor,
4553 cx_a: &mut TestAppContext,
4554 cx_b: &mut TestAppContext,
4555) {
4556 let mut server = TestServer::start(executor.clone()).await;
4557 let client_a = server.create_client(cx_a, "user_a").await;
4558 let client_b = server.create_client(cx_b, "user_b").await;
4559 server
4560 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
4561 .await;
4562 let active_call_a = cx_a.read(ActiveCall::global);
4563
4564 let test_plugin = "test_plugin";
4565
4566 client_a.language_registry().add(Arc::new(Language::new(
4567 LanguageConfig {
4568 name: "TypeScript".into(),
4569 matcher: LanguageMatcher {
4570 path_suffixes: vec!["ts".to_string()],
4571 ..Default::default()
4572 },
4573 ..Default::default()
4574 },
4575 Some(tree_sitter_typescript::LANGUAGE_TYPESCRIPT.into()),
4576 )));
4577 let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
4578 "TypeScript",
4579 FakeLspAdapter {
4580 prettier_plugins: vec![test_plugin],
4581 ..Default::default()
4582 },
4583 );
4584
4585 // Here we insert a fake tree with a directory that exists on disk. This is needed
4586 // because later we'll invoke a command, which requires passing a working directory
4587 // that points to a valid location on disk.
4588 let directory = env::current_dir().unwrap();
4589 let buffer_text = "let one = \"two\"";
4590 client_a
4591 .fs()
4592 .insert_tree(&directory, json!({ "a.ts": buffer_text }))
4593 .await;
4594 let (project_a, worktree_id) = client_a.build_local_project(&directory, cx_a).await;
4595 let prettier_format_suffix = project::TEST_PRETTIER_FORMAT_SUFFIX;
4596 let open_buffer = project_a.update(cx_a, |p, cx| p.open_buffer((worktree_id, "a.ts"), cx));
4597 let buffer_a = cx_a.executor().spawn(open_buffer).await.unwrap();
4598
4599 let project_id = active_call_a
4600 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
4601 .await
4602 .unwrap();
4603 let project_b = client_b.join_remote_project(project_id, cx_b).await;
4604 let (buffer_b, _) = project_b
4605 .update(cx_b, |p, cx| {
4606 p.open_buffer_with_lsp((worktree_id, "a.ts"), cx)
4607 })
4608 .await
4609 .unwrap();
4610
4611 cx_a.update(|cx| {
4612 SettingsStore::update_global(cx, |store, cx| {
4613 store.update_user_settings::<AllLanguageSettings>(cx, |file| {
4614 file.defaults.formatter = Some(SelectedFormatter::Auto);
4615 file.defaults.prettier = Some(PrettierSettings {
4616 allowed: true,
4617 ..PrettierSettings::default()
4618 });
4619 });
4620 });
4621 });
4622 cx_b.update(|cx| {
4623 SettingsStore::update_global(cx, |store, cx| {
4624 store.update_user_settings::<AllLanguageSettings>(cx, |file| {
4625 file.defaults.formatter = Some(SelectedFormatter::List(FormatterList(
4626 vec![Formatter::LanguageServer { name: None }].into(),
4627 )));
4628 file.defaults.prettier = Some(PrettierSettings {
4629 allowed: true,
4630 ..PrettierSettings::default()
4631 });
4632 });
4633 });
4634 });
4635 let fake_language_server = fake_language_servers.next().await.unwrap();
4636 fake_language_server.handle_request::<lsp::request::Formatting, _, _>(|_, _| async move {
4637 panic!(
4638 "Unexpected: prettier should be preferred since it's enabled and language supports it"
4639 )
4640 });
4641
4642 project_b
4643 .update(cx_b, |project, cx| {
4644 project.format(
4645 HashSet::from_iter([buffer_b.clone()]),
4646 LspFormatTarget::Buffers,
4647 true,
4648 FormatTrigger::Save,
4649 cx,
4650 )
4651 })
4652 .await
4653 .unwrap();
4654
4655 executor.run_until_parked();
4656 assert_eq!(
4657 buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
4658 buffer_text.to_string() + "\n" + prettier_format_suffix,
4659 "Prettier formatting was not applied to client buffer after client's request"
4660 );
4661
4662 project_a
4663 .update(cx_a, |project, cx| {
4664 project.format(
4665 HashSet::from_iter([buffer_a.clone()]),
4666 LspFormatTarget::Buffers,
4667 true,
4668 FormatTrigger::Manual,
4669 cx,
4670 )
4671 })
4672 .await
4673 .unwrap();
4674
4675 executor.run_until_parked();
4676 assert_eq!(
4677 buffer_b.read_with(cx_b, |buffer, _| buffer.text()),
4678 buffer_text.to_string() + "\n" + prettier_format_suffix + "\n" + prettier_format_suffix,
4679 "Prettier formatting was not applied to client buffer after host's request"
4680 );
4681}
4682
4683#[gpui::test(iterations = 10)]
4684async fn test_definition(
4685 executor: BackgroundExecutor,
4686 cx_a: &mut TestAppContext,
4687 cx_b: &mut TestAppContext,
4688) {
4689 let mut server = TestServer::start(executor.clone()).await;
4690 let client_a = server.create_client(cx_a, "user_a").await;
4691 let client_b = server.create_client(cx_b, "user_b").await;
4692 server
4693 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
4694 .await;
4695 let active_call_a = cx_a.read(ActiveCall::global);
4696
4697 let mut fake_language_servers = client_a
4698 .language_registry()
4699 .register_fake_lsp("Rust", Default::default());
4700 client_a.language_registry().add(rust_lang());
4701
4702 client_a
4703 .fs()
4704 .insert_tree(
4705 "/root",
4706 json!({
4707 "dir-1": {
4708 "a.rs": "const ONE: usize = b::TWO + b::THREE;",
4709 },
4710 "dir-2": {
4711 "b.rs": "const TWO: c::T2 = 2;\nconst THREE: usize = 3;",
4712 "c.rs": "type T2 = usize;",
4713 }
4714 }),
4715 )
4716 .await;
4717 let (project_a, worktree_id) = client_a.build_local_project("/root/dir-1", cx_a).await;
4718 let project_id = active_call_a
4719 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
4720 .await
4721 .unwrap();
4722 let project_b = client_b.join_remote_project(project_id, cx_b).await;
4723
4724 // Open the file on client B.
4725 let (buffer_b, _handle) = project_b
4726 .update(cx_b, |p, cx| {
4727 p.open_buffer_with_lsp((worktree_id, "a.rs"), cx)
4728 })
4729 .await
4730 .unwrap();
4731
4732 // Request the definition of a symbol as the guest.
4733 let fake_language_server = fake_language_servers.next().await.unwrap();
4734 fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
4735 Ok(Some(lsp::GotoDefinitionResponse::Scalar(
4736 lsp::Location::new(
4737 lsp::Url::from_file_path("/root/dir-2/b.rs").unwrap(),
4738 lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
4739 ),
4740 )))
4741 });
4742
4743 let definitions_1 = project_b
4744 .update(cx_b, |p, cx| p.definition(&buffer_b, 23, cx))
4745 .await
4746 .unwrap();
4747 cx_b.read(|cx| {
4748 assert_eq!(definitions_1.len(), 1);
4749 assert_eq!(project_b.read(cx).worktrees(cx).count(), 2);
4750 let target_buffer = definitions_1[0].target.buffer.read(cx);
4751 assert_eq!(
4752 target_buffer.text(),
4753 "const TWO: c::T2 = 2;\nconst THREE: usize = 3;"
4754 );
4755 assert_eq!(
4756 definitions_1[0].target.range.to_point(target_buffer),
4757 Point::new(0, 6)..Point::new(0, 9)
4758 );
4759 });
4760
4761 // Try getting more definitions for the same buffer, ensuring the buffer gets reused from
4762 // the previous call to `definition`.
4763 fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
4764 Ok(Some(lsp::GotoDefinitionResponse::Scalar(
4765 lsp::Location::new(
4766 lsp::Url::from_file_path("/root/dir-2/b.rs").unwrap(),
4767 lsp::Range::new(lsp::Position::new(1, 6), lsp::Position::new(1, 11)),
4768 ),
4769 )))
4770 });
4771
4772 let definitions_2 = project_b
4773 .update(cx_b, |p, cx| p.definition(&buffer_b, 33, cx))
4774 .await
4775 .unwrap();
4776 cx_b.read(|cx| {
4777 assert_eq!(definitions_2.len(), 1);
4778 assert_eq!(project_b.read(cx).worktrees(cx).count(), 2);
4779 let target_buffer = definitions_2[0].target.buffer.read(cx);
4780 assert_eq!(
4781 target_buffer.text(),
4782 "const TWO: c::T2 = 2;\nconst THREE: usize = 3;"
4783 );
4784 assert_eq!(
4785 definitions_2[0].target.range.to_point(target_buffer),
4786 Point::new(1, 6)..Point::new(1, 11)
4787 );
4788 });
4789 assert_eq!(
4790 definitions_1[0].target.buffer,
4791 definitions_2[0].target.buffer
4792 );
4793
4794 fake_language_server.handle_request::<lsp::request::GotoTypeDefinition, _, _>(
4795 |req, _| async move {
4796 assert_eq!(
4797 req.text_document_position_params.position,
4798 lsp::Position::new(0, 7)
4799 );
4800 Ok(Some(lsp::GotoDefinitionResponse::Scalar(
4801 lsp::Location::new(
4802 lsp::Url::from_file_path("/root/dir-2/c.rs").unwrap(),
4803 lsp::Range::new(lsp::Position::new(0, 5), lsp::Position::new(0, 7)),
4804 ),
4805 )))
4806 },
4807 );
4808
4809 let type_definitions = project_b
4810 .update(cx_b, |p, cx| p.type_definition(&buffer_b, 7, cx))
4811 .await
4812 .unwrap();
4813 cx_b.read(|cx| {
4814 assert_eq!(type_definitions.len(), 1);
4815 let target_buffer = type_definitions[0].target.buffer.read(cx);
4816 assert_eq!(target_buffer.text(), "type T2 = usize;");
4817 assert_eq!(
4818 type_definitions[0].target.range.to_point(target_buffer),
4819 Point::new(0, 5)..Point::new(0, 7)
4820 );
4821 });
4822}
4823
4824#[gpui::test(iterations = 10)]
4825async fn test_references(
4826 executor: BackgroundExecutor,
4827 cx_a: &mut TestAppContext,
4828 cx_b: &mut TestAppContext,
4829) {
4830 let mut server = TestServer::start(executor.clone()).await;
4831 let client_a = server.create_client(cx_a, "user_a").await;
4832 let client_b = server.create_client(cx_b, "user_b").await;
4833 server
4834 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
4835 .await;
4836 let active_call_a = cx_a.read(ActiveCall::global);
4837
4838 client_a.language_registry().add(rust_lang());
4839 let mut fake_language_servers = client_a.language_registry().register_fake_lsp(
4840 "Rust",
4841 FakeLspAdapter {
4842 name: "my-fake-lsp-adapter",
4843 capabilities: lsp::ServerCapabilities {
4844 references_provider: Some(lsp::OneOf::Left(true)),
4845 ..Default::default()
4846 },
4847 ..Default::default()
4848 },
4849 );
4850
4851 client_a
4852 .fs()
4853 .insert_tree(
4854 "/root",
4855 json!({
4856 "dir-1": {
4857 "one.rs": "const ONE: usize = 1;",
4858 "two.rs": "const TWO: usize = one::ONE + one::ONE;",
4859 },
4860 "dir-2": {
4861 "three.rs": "const THREE: usize = two::TWO + one::ONE;",
4862 }
4863 }),
4864 )
4865 .await;
4866 let (project_a, worktree_id) = client_a.build_local_project("/root/dir-1", cx_a).await;
4867 let project_id = active_call_a
4868 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
4869 .await
4870 .unwrap();
4871 let project_b = client_b.join_remote_project(project_id, cx_b).await;
4872
4873 // Open the file on client B.
4874 let (buffer_b, _handle) = project_b
4875 .update(cx_b, |p, cx| {
4876 p.open_buffer_with_lsp((worktree_id, "one.rs"), cx)
4877 })
4878 .await
4879 .unwrap();
4880
4881 // Request references to a symbol as the guest.
4882 let fake_language_server = fake_language_servers.next().await.unwrap();
4883 let (lsp_response_tx, rx) = mpsc::unbounded::<Result<Option<Vec<lsp::Location>>>>();
4884 fake_language_server.handle_request::<lsp::request::References, _, _>({
4885 let rx = Arc::new(Mutex::new(Some(rx)));
4886 move |params, _| {
4887 assert_eq!(
4888 params.text_document_position.text_document.uri.as_str(),
4889 "file:///root/dir-1/one.rs"
4890 );
4891 let rx = rx.clone();
4892 async move {
4893 let mut response_rx = rx.lock().take().unwrap();
4894 let result = response_rx.next().await.unwrap();
4895 *rx.lock() = Some(response_rx);
4896 result
4897 }
4898 }
4899 });
4900
4901 let references = project_b.update(cx_b, |p, cx| p.references(&buffer_b, 7, cx));
4902
4903 // User is informed that a request is pending.
4904 executor.run_until_parked();
4905 project_b.read_with(cx_b, |project, cx| {
4906 let status = project.language_server_statuses(cx).next().unwrap().1;
4907 assert_eq!(status.name, "my-fake-lsp-adapter");
4908 assert_eq!(
4909 status.pending_work.values().next().unwrap().message,
4910 Some("Finding references...".into())
4911 );
4912 });
4913
4914 // Cause the language server to respond.
4915 lsp_response_tx
4916 .unbounded_send(Ok(Some(vec![
4917 lsp::Location {
4918 uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(),
4919 range: lsp::Range::new(lsp::Position::new(0, 24), lsp::Position::new(0, 27)),
4920 },
4921 lsp::Location {
4922 uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(),
4923 range: lsp::Range::new(lsp::Position::new(0, 35), lsp::Position::new(0, 38)),
4924 },
4925 lsp::Location {
4926 uri: lsp::Url::from_file_path("/root/dir-2/three.rs").unwrap(),
4927 range: lsp::Range::new(lsp::Position::new(0, 37), lsp::Position::new(0, 40)),
4928 },
4929 ])))
4930 .unwrap();
4931
4932 let references = references.await.unwrap();
4933 executor.run_until_parked();
4934 project_b.read_with(cx_b, |project, cx| {
4935 // User is informed that a request is no longer pending.
4936 let status = project.language_server_statuses(cx).next().unwrap().1;
4937 assert!(status.pending_work.is_empty());
4938
4939 assert_eq!(references.len(), 3);
4940 assert_eq!(project.worktrees(cx).count(), 2);
4941
4942 let two_buffer = references[0].buffer.read(cx);
4943 let three_buffer = references[2].buffer.read(cx);
4944 assert_eq!(
4945 two_buffer.file().unwrap().path().as_ref(),
4946 Path::new("two.rs")
4947 );
4948 assert_eq!(references[1].buffer, references[0].buffer);
4949 assert_eq!(
4950 three_buffer.file().unwrap().full_path(cx),
4951 Path::new("/root/dir-2/three.rs")
4952 );
4953
4954 assert_eq!(references[0].range.to_offset(two_buffer), 24..27);
4955 assert_eq!(references[1].range.to_offset(two_buffer), 35..38);
4956 assert_eq!(references[2].range.to_offset(three_buffer), 37..40);
4957 });
4958
4959 let references = project_b.update(cx_b, |p, cx| p.references(&buffer_b, 7, cx));
4960
4961 // User is informed that a request is pending.
4962 executor.run_until_parked();
4963 project_b.read_with(cx_b, |project, cx| {
4964 let status = project.language_server_statuses(cx).next().unwrap().1;
4965 assert_eq!(status.name, "my-fake-lsp-adapter");
4966 assert_eq!(
4967 status.pending_work.values().next().unwrap().message,
4968 Some("Finding references...".into())
4969 );
4970 });
4971
4972 // Cause the LSP request to fail.
4973 lsp_response_tx
4974 .unbounded_send(Err(anyhow!("can't find references")))
4975 .unwrap();
4976 references.await.unwrap_err();
4977
4978 // User is informed that the request is no longer pending.
4979 executor.run_until_parked();
4980 project_b.read_with(cx_b, |project, cx| {
4981 let status = project.language_server_statuses(cx).next().unwrap().1;
4982 assert!(status.pending_work.is_empty());
4983 });
4984}
4985
4986#[gpui::test(iterations = 10)]
4987async fn test_project_search(
4988 executor: BackgroundExecutor,
4989 cx_a: &mut TestAppContext,
4990 cx_b: &mut TestAppContext,
4991) {
4992 let mut server = TestServer::start(executor.clone()).await;
4993 let client_a = server.create_client(cx_a, "user_a").await;
4994 let client_b = server.create_client(cx_b, "user_b").await;
4995 server
4996 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
4997 .await;
4998 let active_call_a = cx_a.read(ActiveCall::global);
4999
5000 client_a
5001 .fs()
5002 .insert_tree(
5003 "/root",
5004 json!({
5005 "dir-1": {
5006 "a": "hello world",
5007 "b": "goodnight moon",
5008 "c": "a world of goo",
5009 "d": "world champion of clown world",
5010 },
5011 "dir-2": {
5012 "e": "disney world is fun",
5013 }
5014 }),
5015 )
5016 .await;
5017 let (project_a, _) = client_a.build_local_project("/root/dir-1", cx_a).await;
5018 let (worktree_2, _) = project_a
5019 .update(cx_a, |p, cx| {
5020 p.find_or_create_worktree("/root/dir-2", true, cx)
5021 })
5022 .await
5023 .unwrap();
5024 worktree_2
5025 .read_with(cx_a, |tree, _| tree.as_local().unwrap().scan_complete())
5026 .await;
5027 let project_id = active_call_a
5028 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
5029 .await
5030 .unwrap();
5031
5032 let project_b = client_b.join_remote_project(project_id, cx_b).await;
5033
5034 // Perform a search as the guest.
5035 let mut results = HashMap::default();
5036 let search_rx = project_b.update(cx_b, |project, cx| {
5037 project.search(
5038 SearchQuery::text(
5039 "world",
5040 false,
5041 false,
5042 false,
5043 Default::default(),
5044 Default::default(),
5045 None,
5046 )
5047 .unwrap(),
5048 cx,
5049 )
5050 });
5051 while let Ok(result) = search_rx.recv().await {
5052 match result {
5053 SearchResult::Buffer { buffer, ranges } => {
5054 results.entry(buffer).or_insert(ranges);
5055 }
5056 SearchResult::LimitReached => {
5057 panic!("Unexpectedly reached search limit in tests. If you do want to assert limit-reached, change this panic call.")
5058 }
5059 };
5060 }
5061
5062 let mut ranges_by_path = results
5063 .into_iter()
5064 .map(|(buffer, ranges)| {
5065 buffer.read_with(cx_b, |buffer, cx| {
5066 let path = buffer.file().unwrap().full_path(cx);
5067 let offset_ranges = ranges
5068 .into_iter()
5069 .map(|range| range.to_offset(buffer))
5070 .collect::<Vec<_>>();
5071 (path, offset_ranges)
5072 })
5073 })
5074 .collect::<Vec<_>>();
5075 ranges_by_path.sort_by_key(|(path, _)| path.clone());
5076
5077 assert_eq!(
5078 ranges_by_path,
5079 &[
5080 (PathBuf::from("dir-1/a"), vec![6..11]),
5081 (PathBuf::from("dir-1/c"), vec![2..7]),
5082 (PathBuf::from("dir-1/d"), vec![0..5, 24..29]),
5083 (PathBuf::from("dir-2/e"), vec![7..12]),
5084 ]
5085 );
5086}
5087
5088#[gpui::test(iterations = 10)]
5089async fn test_document_highlights(
5090 executor: BackgroundExecutor,
5091 cx_a: &mut TestAppContext,
5092 cx_b: &mut TestAppContext,
5093) {
5094 let mut server = TestServer::start(executor.clone()).await;
5095 let client_a = server.create_client(cx_a, "user_a").await;
5096 let client_b = server.create_client(cx_b, "user_b").await;
5097 server
5098 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
5099 .await;
5100 let active_call_a = cx_a.read(ActiveCall::global);
5101
5102 client_a
5103 .fs()
5104 .insert_tree(
5105 "/root-1",
5106 json!({
5107 "main.rs": "fn double(number: i32) -> i32 { number + number }",
5108 }),
5109 )
5110 .await;
5111
5112 let mut fake_language_servers = client_a
5113 .language_registry()
5114 .register_fake_lsp("Rust", Default::default());
5115 client_a.language_registry().add(rust_lang());
5116
5117 let (project_a, worktree_id) = client_a.build_local_project("/root-1", cx_a).await;
5118 let project_id = active_call_a
5119 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
5120 .await
5121 .unwrap();
5122 let project_b = client_b.join_remote_project(project_id, cx_b).await;
5123
5124 // Open the file on client B.
5125 let (buffer_b, _handle) = project_b
5126 .update(cx_b, |p, cx| {
5127 p.open_buffer_with_lsp((worktree_id, "main.rs"), cx)
5128 })
5129 .await
5130 .unwrap();
5131
5132 // Request document highlights as the guest.
5133 let fake_language_server = fake_language_servers.next().await.unwrap();
5134 fake_language_server.handle_request::<lsp::request::DocumentHighlightRequest, _, _>(
5135 |params, _| async move {
5136 assert_eq!(
5137 params
5138 .text_document_position_params
5139 .text_document
5140 .uri
5141 .as_str(),
5142 "file:///root-1/main.rs"
5143 );
5144 assert_eq!(
5145 params.text_document_position_params.position,
5146 lsp::Position::new(0, 34)
5147 );
5148 Ok(Some(vec![
5149 lsp::DocumentHighlight {
5150 kind: Some(lsp::DocumentHighlightKind::WRITE),
5151 range: lsp::Range::new(lsp::Position::new(0, 10), lsp::Position::new(0, 16)),
5152 },
5153 lsp::DocumentHighlight {
5154 kind: Some(lsp::DocumentHighlightKind::READ),
5155 range: lsp::Range::new(lsp::Position::new(0, 32), lsp::Position::new(0, 38)),
5156 },
5157 lsp::DocumentHighlight {
5158 kind: Some(lsp::DocumentHighlightKind::READ),
5159 range: lsp::Range::new(lsp::Position::new(0, 41), lsp::Position::new(0, 47)),
5160 },
5161 ]))
5162 },
5163 );
5164
5165 let highlights = project_b
5166 .update(cx_b, |p, cx| p.document_highlights(&buffer_b, 34, cx))
5167 .await
5168 .unwrap();
5169
5170 buffer_b.read_with(cx_b, |buffer, _| {
5171 let snapshot = buffer.snapshot();
5172
5173 let highlights = highlights
5174 .into_iter()
5175 .map(|highlight| (highlight.kind, highlight.range.to_offset(&snapshot)))
5176 .collect::<Vec<_>>();
5177 assert_eq!(
5178 highlights,
5179 &[
5180 (lsp::DocumentHighlightKind::WRITE, 10..16),
5181 (lsp::DocumentHighlightKind::READ, 32..38),
5182 (lsp::DocumentHighlightKind::READ, 41..47)
5183 ]
5184 )
5185 });
5186}
5187
5188#[gpui::test(iterations = 10)]
5189async fn test_lsp_hover(
5190 executor: BackgroundExecutor,
5191 cx_a: &mut TestAppContext,
5192 cx_b: &mut TestAppContext,
5193) {
5194 let mut server = TestServer::start(executor.clone()).await;
5195 let client_a = server.create_client(cx_a, "user_a").await;
5196 let client_b = server.create_client(cx_b, "user_b").await;
5197 server
5198 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
5199 .await;
5200 let active_call_a = cx_a.read(ActiveCall::global);
5201
5202 client_a
5203 .fs()
5204 .insert_tree(
5205 "/root-1",
5206 json!({
5207 "main.rs": "use std::collections::HashMap;",
5208 }),
5209 )
5210 .await;
5211
5212 client_a.language_registry().add(rust_lang());
5213 let language_server_names = ["rust-analyzer", "CrabLang-ls"];
5214 let mut language_servers = [
5215 client_a.language_registry().register_fake_lsp(
5216 "Rust",
5217 FakeLspAdapter {
5218 name: "rust-analyzer",
5219 capabilities: lsp::ServerCapabilities {
5220 hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
5221 ..lsp::ServerCapabilities::default()
5222 },
5223 ..FakeLspAdapter::default()
5224 },
5225 ),
5226 client_a.language_registry().register_fake_lsp(
5227 "Rust",
5228 FakeLspAdapter {
5229 name: "CrabLang-ls",
5230 capabilities: lsp::ServerCapabilities {
5231 hover_provider: Some(lsp::HoverProviderCapability::Simple(true)),
5232 ..lsp::ServerCapabilities::default()
5233 },
5234 ..FakeLspAdapter::default()
5235 },
5236 ),
5237 ];
5238
5239 let (project_a, worktree_id) = client_a.build_local_project("/root-1", cx_a).await;
5240 let project_id = active_call_a
5241 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
5242 .await
5243 .unwrap();
5244 let project_b = client_b.join_remote_project(project_id, cx_b).await;
5245
5246 // Open the file as the guest
5247 let (buffer_b, _handle) = project_b
5248 .update(cx_b, |p, cx| {
5249 p.open_buffer_with_lsp((worktree_id, "main.rs"), cx)
5250 })
5251 .await
5252 .unwrap();
5253
5254 let mut servers_with_hover_requests = HashMap::default();
5255 for i in 0..language_server_names.len() {
5256 let new_server = language_servers[i].next().await.unwrap_or_else(|| {
5257 panic!(
5258 "Failed to get language server #{i} with name {}",
5259 &language_server_names[i]
5260 )
5261 });
5262 let new_server_name = new_server.server.name();
5263 assert!(
5264 !servers_with_hover_requests.contains_key(&new_server_name),
5265 "Unexpected: initialized server with the same name twice. Name: `{new_server_name}`"
5266 );
5267 match new_server_name.as_ref() {
5268 "CrabLang-ls" => {
5269 servers_with_hover_requests.insert(
5270 new_server_name.clone(),
5271 new_server.handle_request::<lsp::request::HoverRequest, _, _>(
5272 move |params, _| {
5273 assert_eq!(
5274 params
5275 .text_document_position_params
5276 .text_document
5277 .uri
5278 .as_str(),
5279 "file:///root-1/main.rs"
5280 );
5281 let name = new_server_name.clone();
5282 async move {
5283 Ok(Some(lsp::Hover {
5284 contents: lsp::HoverContents::Scalar(
5285 lsp::MarkedString::String(format!("{name} hover")),
5286 ),
5287 range: None,
5288 }))
5289 }
5290 },
5291 ),
5292 );
5293 }
5294 "rust-analyzer" => {
5295 servers_with_hover_requests.insert(
5296 new_server_name.clone(),
5297 new_server.handle_request::<lsp::request::HoverRequest, _, _>(
5298 |params, _| async move {
5299 assert_eq!(
5300 params
5301 .text_document_position_params
5302 .text_document
5303 .uri
5304 .as_str(),
5305 "file:///root-1/main.rs"
5306 );
5307 assert_eq!(
5308 params.text_document_position_params.position,
5309 lsp::Position::new(0, 22)
5310 );
5311 Ok(Some(lsp::Hover {
5312 contents: lsp::HoverContents::Array(vec![
5313 lsp::MarkedString::String("Test hover content.".to_string()),
5314 lsp::MarkedString::LanguageString(lsp::LanguageString {
5315 language: "Rust".to_string(),
5316 value: "let foo = 42;".to_string(),
5317 }),
5318 ]),
5319 range: Some(lsp::Range::new(
5320 lsp::Position::new(0, 22),
5321 lsp::Position::new(0, 29),
5322 )),
5323 }))
5324 },
5325 ),
5326 );
5327 }
5328 unexpected => panic!("Unexpected server name: {unexpected}"),
5329 }
5330 }
5331
5332 // Request hover information as the guest.
5333 let mut hovers = project_b
5334 .update(cx_b, |p, cx| p.hover(&buffer_b, 22, cx))
5335 .await;
5336 assert_eq!(
5337 hovers.len(),
5338 2,
5339 "Expected two hovers from both language servers, but got: {hovers:?}"
5340 );
5341
5342 let _: Vec<()> = futures::future::join_all(servers_with_hover_requests.into_values().map(
5343 |mut hover_request| async move {
5344 hover_request
5345 .next()
5346 .await
5347 .expect("All hover requests should have been triggered")
5348 },
5349 ))
5350 .await;
5351
5352 hovers.sort_by_key(|hover| hover.contents.len());
5353 let first_hover = hovers.first().cloned().unwrap();
5354 assert_eq!(
5355 first_hover.contents,
5356 vec![project::HoverBlock {
5357 text: "CrabLang-ls hover".to_string(),
5358 kind: HoverBlockKind::Markdown,
5359 },]
5360 );
5361 let second_hover = hovers.last().cloned().unwrap();
5362 assert_eq!(
5363 second_hover.contents,
5364 vec![
5365 project::HoverBlock {
5366 text: "Test hover content.".to_string(),
5367 kind: HoverBlockKind::Markdown,
5368 },
5369 project::HoverBlock {
5370 text: "let foo = 42;".to_string(),
5371 kind: HoverBlockKind::Code {
5372 language: "Rust".to_string()
5373 },
5374 }
5375 ]
5376 );
5377 buffer_b.read_with(cx_b, |buffer, _| {
5378 let snapshot = buffer.snapshot();
5379 assert_eq!(second_hover.range.unwrap().to_offset(&snapshot), 22..29);
5380 });
5381}
5382
5383#[gpui::test(iterations = 10)]
5384async fn test_project_symbols(
5385 executor: BackgroundExecutor,
5386 cx_a: &mut TestAppContext,
5387 cx_b: &mut TestAppContext,
5388) {
5389 let mut server = TestServer::start(executor.clone()).await;
5390 let client_a = server.create_client(cx_a, "user_a").await;
5391 let client_b = server.create_client(cx_b, "user_b").await;
5392 server
5393 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
5394 .await;
5395 let active_call_a = cx_a.read(ActiveCall::global);
5396
5397 client_a.language_registry().add(rust_lang());
5398 let mut fake_language_servers = client_a
5399 .language_registry()
5400 .register_fake_lsp("Rust", Default::default());
5401
5402 client_a
5403 .fs()
5404 .insert_tree(
5405 "/code",
5406 json!({
5407 "crate-1": {
5408 "one.rs": "const ONE: usize = 1;",
5409 },
5410 "crate-2": {
5411 "two.rs": "const TWO: usize = 2; const THREE: usize = 3;",
5412 },
5413 "private": {
5414 "passwords.txt": "the-password",
5415 }
5416 }),
5417 )
5418 .await;
5419 let (project_a, worktree_id) = client_a.build_local_project("/code/crate-1", cx_a).await;
5420 let project_id = active_call_a
5421 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
5422 .await
5423 .unwrap();
5424 let project_b = client_b.join_remote_project(project_id, cx_b).await;
5425
5426 // Cause the language server to start.
5427 let _buffer = project_b
5428 .update(cx_b, |p, cx| {
5429 p.open_buffer_with_lsp((worktree_id, "one.rs"), cx)
5430 })
5431 .await
5432 .unwrap();
5433
5434 let fake_language_server = fake_language_servers.next().await.unwrap();
5435 fake_language_server.handle_request::<lsp::WorkspaceSymbolRequest, _, _>(|_, _| async move {
5436 Ok(Some(lsp::WorkspaceSymbolResponse::Flat(vec![
5437 #[allow(deprecated)]
5438 lsp::SymbolInformation {
5439 name: "TWO".into(),
5440 location: lsp::Location {
5441 uri: lsp::Url::from_file_path("/code/crate-2/two.rs").unwrap(),
5442 range: lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
5443 },
5444 kind: lsp::SymbolKind::CONSTANT,
5445 tags: None,
5446 container_name: None,
5447 deprecated: None,
5448 },
5449 ])))
5450 });
5451
5452 // Request the definition of a symbol as the guest.
5453 let symbols = project_b
5454 .update(cx_b, |p, cx| p.symbols("two", cx))
5455 .await
5456 .unwrap();
5457 assert_eq!(symbols.len(), 1);
5458 assert_eq!(symbols[0].name, "TWO");
5459
5460 // Open one of the returned symbols.
5461 let buffer_b_2 = project_b
5462 .update(cx_b, |project, cx| {
5463 project.open_buffer_for_symbol(&symbols[0], cx)
5464 })
5465 .await
5466 .unwrap();
5467
5468 buffer_b_2.read_with(cx_b, |buffer, cx| {
5469 assert_eq!(
5470 buffer.file().unwrap().full_path(cx),
5471 Path::new("/code/crate-2/two.rs")
5472 );
5473 });
5474
5475 // Attempt to craft a symbol and violate host's privacy by opening an arbitrary file.
5476 let mut fake_symbol = symbols[0].clone();
5477 fake_symbol.path.path = Path::new("/code/secrets").into();
5478 let error = project_b
5479 .update(cx_b, |project, cx| {
5480 project.open_buffer_for_symbol(&fake_symbol, cx)
5481 })
5482 .await
5483 .unwrap_err();
5484 assert!(error.to_string().contains("invalid symbol signature"));
5485}
5486
5487#[gpui::test(iterations = 10)]
5488async fn test_open_buffer_while_getting_definition_pointing_to_it(
5489 executor: BackgroundExecutor,
5490 cx_a: &mut TestAppContext,
5491 cx_b: &mut TestAppContext,
5492 mut rng: StdRng,
5493) {
5494 let mut server = TestServer::start(executor.clone()).await;
5495 let client_a = server.create_client(cx_a, "user_a").await;
5496 let client_b = server.create_client(cx_b, "user_b").await;
5497 server
5498 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
5499 .await;
5500 let active_call_a = cx_a.read(ActiveCall::global);
5501
5502 client_a.language_registry().add(rust_lang());
5503 let mut fake_language_servers = client_a
5504 .language_registry()
5505 .register_fake_lsp("Rust", Default::default());
5506
5507 client_a
5508 .fs()
5509 .insert_tree(
5510 "/root",
5511 json!({
5512 "a.rs": "const ONE: usize = b::TWO;",
5513 "b.rs": "const TWO: usize = 2",
5514 }),
5515 )
5516 .await;
5517 let (project_a, worktree_id) = client_a.build_local_project("/root", cx_a).await;
5518 let project_id = active_call_a
5519 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
5520 .await
5521 .unwrap();
5522 let project_b = client_b.join_remote_project(project_id, cx_b).await;
5523
5524 let (buffer_b1, _lsp) = project_b
5525 .update(cx_b, |p, cx| {
5526 p.open_buffer_with_lsp((worktree_id, "a.rs"), cx)
5527 })
5528 .await
5529 .unwrap();
5530
5531 let fake_language_server = fake_language_servers.next().await.unwrap();
5532 fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
5533 Ok(Some(lsp::GotoDefinitionResponse::Scalar(
5534 lsp::Location::new(
5535 lsp::Url::from_file_path("/root/b.rs").unwrap(),
5536 lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
5537 ),
5538 )))
5539 });
5540
5541 let definitions;
5542 let buffer_b2;
5543 if rng.gen() {
5544 definitions = project_b.update(cx_b, |p, cx| p.definition(&buffer_b1, 23, cx));
5545 (buffer_b2, _) = project_b
5546 .update(cx_b, |p, cx| {
5547 p.open_buffer_with_lsp((worktree_id, "b.rs"), cx)
5548 })
5549 .await
5550 .unwrap();
5551 } else {
5552 (buffer_b2, _) = project_b
5553 .update(cx_b, |p, cx| {
5554 p.open_buffer_with_lsp((worktree_id, "b.rs"), cx)
5555 })
5556 .await
5557 .unwrap();
5558 definitions = project_b.update(cx_b, |p, cx| p.definition(&buffer_b1, 23, cx));
5559 }
5560
5561 let definitions = definitions.await.unwrap();
5562 assert_eq!(definitions.len(), 1);
5563 assert_eq!(definitions[0].target.buffer, buffer_b2);
5564}
5565
5566#[gpui::test(iterations = 10)]
5567async fn test_contacts(
5568 executor: BackgroundExecutor,
5569 cx_a: &mut TestAppContext,
5570 cx_b: &mut TestAppContext,
5571 cx_c: &mut TestAppContext,
5572 cx_d: &mut TestAppContext,
5573) {
5574 let mut server = TestServer::start(executor.clone()).await;
5575 let client_a = server.create_client(cx_a, "user_a").await;
5576 let client_b = server.create_client(cx_b, "user_b").await;
5577 let client_c = server.create_client(cx_c, "user_c").await;
5578 let client_d = server.create_client(cx_d, "user_d").await;
5579 server
5580 .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b), (&client_c, cx_c)])
5581 .await;
5582 let active_call_a = cx_a.read(ActiveCall::global);
5583 let active_call_b = cx_b.read(ActiveCall::global);
5584 let active_call_c = cx_c.read(ActiveCall::global);
5585 let _active_call_d = cx_d.read(ActiveCall::global);
5586
5587 executor.run_until_parked();
5588 assert_eq!(
5589 contacts(&client_a, cx_a),
5590 [
5591 ("user_b".to_string(), "online", "free"),
5592 ("user_c".to_string(), "online", "free")
5593 ]
5594 );
5595 assert_eq!(
5596 contacts(&client_b, cx_b),
5597 [
5598 ("user_a".to_string(), "online", "free"),
5599 ("user_c".to_string(), "online", "free")
5600 ]
5601 );
5602 assert_eq!(
5603 contacts(&client_c, cx_c),
5604 [
5605 ("user_a".to_string(), "online", "free"),
5606 ("user_b".to_string(), "online", "free")
5607 ]
5608 );
5609 assert_eq!(contacts(&client_d, cx_d), []);
5610
5611 server.disconnect_client(client_c.peer_id().unwrap());
5612 server.forbid_connections();
5613 executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
5614 assert_eq!(
5615 contacts(&client_a, cx_a),
5616 [
5617 ("user_b".to_string(), "online", "free"),
5618 ("user_c".to_string(), "offline", "free")
5619 ]
5620 );
5621 assert_eq!(
5622 contacts(&client_b, cx_b),
5623 [
5624 ("user_a".to_string(), "online", "free"),
5625 ("user_c".to_string(), "offline", "free")
5626 ]
5627 );
5628 assert_eq!(contacts(&client_c, cx_c), []);
5629 assert_eq!(contacts(&client_d, cx_d), []);
5630
5631 server.allow_connections();
5632 client_c
5633 .authenticate_and_connect(false, &cx_c.to_async())
5634 .await
5635 .unwrap();
5636
5637 executor.run_until_parked();
5638 assert_eq!(
5639 contacts(&client_a, cx_a),
5640 [
5641 ("user_b".to_string(), "online", "free"),
5642 ("user_c".to_string(), "online", "free")
5643 ]
5644 );
5645 assert_eq!(
5646 contacts(&client_b, cx_b),
5647 [
5648 ("user_a".to_string(), "online", "free"),
5649 ("user_c".to_string(), "online", "free")
5650 ]
5651 );
5652 assert_eq!(
5653 contacts(&client_c, cx_c),
5654 [
5655 ("user_a".to_string(), "online", "free"),
5656 ("user_b".to_string(), "online", "free")
5657 ]
5658 );
5659 assert_eq!(contacts(&client_d, cx_d), []);
5660
5661 active_call_a
5662 .update(cx_a, |call, cx| {
5663 call.invite(client_b.user_id().unwrap(), None, cx)
5664 })
5665 .await
5666 .unwrap();
5667 executor.run_until_parked();
5668 assert_eq!(
5669 contacts(&client_a, cx_a),
5670 [
5671 ("user_b".to_string(), "online", "busy"),
5672 ("user_c".to_string(), "online", "free")
5673 ]
5674 );
5675 assert_eq!(
5676 contacts(&client_b, cx_b),
5677 [
5678 ("user_a".to_string(), "online", "busy"),
5679 ("user_c".to_string(), "online", "free")
5680 ]
5681 );
5682 assert_eq!(
5683 contacts(&client_c, cx_c),
5684 [
5685 ("user_a".to_string(), "online", "busy"),
5686 ("user_b".to_string(), "online", "busy")
5687 ]
5688 );
5689 assert_eq!(contacts(&client_d, cx_d), []);
5690
5691 // Client B and client D become contacts while client B is being called.
5692 server
5693 .make_contacts(&mut [(&client_b, cx_b), (&client_d, cx_d)])
5694 .await;
5695 executor.run_until_parked();
5696 assert_eq!(
5697 contacts(&client_a, cx_a),
5698 [
5699 ("user_b".to_string(), "online", "busy"),
5700 ("user_c".to_string(), "online", "free")
5701 ]
5702 );
5703 assert_eq!(
5704 contacts(&client_b, cx_b),
5705 [
5706 ("user_a".to_string(), "online", "busy"),
5707 ("user_c".to_string(), "online", "free"),
5708 ("user_d".to_string(), "online", "free"),
5709 ]
5710 );
5711 assert_eq!(
5712 contacts(&client_c, cx_c),
5713 [
5714 ("user_a".to_string(), "online", "busy"),
5715 ("user_b".to_string(), "online", "busy")
5716 ]
5717 );
5718 assert_eq!(
5719 contacts(&client_d, cx_d),
5720 [("user_b".to_string(), "online", "busy")]
5721 );
5722
5723 active_call_b.update(cx_b, |call, cx| call.decline_incoming(cx).unwrap());
5724 executor.run_until_parked();
5725 assert_eq!(
5726 contacts(&client_a, cx_a),
5727 [
5728 ("user_b".to_string(), "online", "free"),
5729 ("user_c".to_string(), "online", "free")
5730 ]
5731 );
5732 assert_eq!(
5733 contacts(&client_b, cx_b),
5734 [
5735 ("user_a".to_string(), "online", "free"),
5736 ("user_c".to_string(), "online", "free"),
5737 ("user_d".to_string(), "online", "free")
5738 ]
5739 );
5740 assert_eq!(
5741 contacts(&client_c, cx_c),
5742 [
5743 ("user_a".to_string(), "online", "free"),
5744 ("user_b".to_string(), "online", "free")
5745 ]
5746 );
5747 assert_eq!(
5748 contacts(&client_d, cx_d),
5749 [("user_b".to_string(), "online", "free")]
5750 );
5751
5752 active_call_c
5753 .update(cx_c, |call, cx| {
5754 call.invite(client_a.user_id().unwrap(), None, cx)
5755 })
5756 .await
5757 .unwrap();
5758 executor.run_until_parked();
5759 assert_eq!(
5760 contacts(&client_a, cx_a),
5761 [
5762 ("user_b".to_string(), "online", "free"),
5763 ("user_c".to_string(), "online", "busy")
5764 ]
5765 );
5766 assert_eq!(
5767 contacts(&client_b, cx_b),
5768 [
5769 ("user_a".to_string(), "online", "busy"),
5770 ("user_c".to_string(), "online", "busy"),
5771 ("user_d".to_string(), "online", "free")
5772 ]
5773 );
5774 assert_eq!(
5775 contacts(&client_c, cx_c),
5776 [
5777 ("user_a".to_string(), "online", "busy"),
5778 ("user_b".to_string(), "online", "free")
5779 ]
5780 );
5781 assert_eq!(
5782 contacts(&client_d, cx_d),
5783 [("user_b".to_string(), "online", "free")]
5784 );
5785
5786 active_call_a
5787 .update(cx_a, |call, cx| call.accept_incoming(cx))
5788 .await
5789 .unwrap();
5790 executor.run_until_parked();
5791 assert_eq!(
5792 contacts(&client_a, cx_a),
5793 [
5794 ("user_b".to_string(), "online", "free"),
5795 ("user_c".to_string(), "online", "busy")
5796 ]
5797 );
5798 assert_eq!(
5799 contacts(&client_b, cx_b),
5800 [
5801 ("user_a".to_string(), "online", "busy"),
5802 ("user_c".to_string(), "online", "busy"),
5803 ("user_d".to_string(), "online", "free")
5804 ]
5805 );
5806 assert_eq!(
5807 contacts(&client_c, cx_c),
5808 [
5809 ("user_a".to_string(), "online", "busy"),
5810 ("user_b".to_string(), "online", "free")
5811 ]
5812 );
5813 assert_eq!(
5814 contacts(&client_d, cx_d),
5815 [("user_b".to_string(), "online", "free")]
5816 );
5817
5818 active_call_a
5819 .update(cx_a, |call, cx| {
5820 call.invite(client_b.user_id().unwrap(), None, cx)
5821 })
5822 .await
5823 .unwrap();
5824 executor.run_until_parked();
5825 assert_eq!(
5826 contacts(&client_a, cx_a),
5827 [
5828 ("user_b".to_string(), "online", "busy"),
5829 ("user_c".to_string(), "online", "busy")
5830 ]
5831 );
5832 assert_eq!(
5833 contacts(&client_b, cx_b),
5834 [
5835 ("user_a".to_string(), "online", "busy"),
5836 ("user_c".to_string(), "online", "busy"),
5837 ("user_d".to_string(), "online", "free")
5838 ]
5839 );
5840 assert_eq!(
5841 contacts(&client_c, cx_c),
5842 [
5843 ("user_a".to_string(), "online", "busy"),
5844 ("user_b".to_string(), "online", "busy")
5845 ]
5846 );
5847 assert_eq!(
5848 contacts(&client_d, cx_d),
5849 [("user_b".to_string(), "online", "busy")]
5850 );
5851
5852 active_call_a
5853 .update(cx_a, |call, cx| call.hang_up(cx))
5854 .await
5855 .unwrap();
5856 executor.run_until_parked();
5857 assert_eq!(
5858 contacts(&client_a, cx_a),
5859 [
5860 ("user_b".to_string(), "online", "free"),
5861 ("user_c".to_string(), "online", "free")
5862 ]
5863 );
5864 assert_eq!(
5865 contacts(&client_b, cx_b),
5866 [
5867 ("user_a".to_string(), "online", "free"),
5868 ("user_c".to_string(), "online", "free"),
5869 ("user_d".to_string(), "online", "free")
5870 ]
5871 );
5872 assert_eq!(
5873 contacts(&client_c, cx_c),
5874 [
5875 ("user_a".to_string(), "online", "free"),
5876 ("user_b".to_string(), "online", "free")
5877 ]
5878 );
5879 assert_eq!(
5880 contacts(&client_d, cx_d),
5881 [("user_b".to_string(), "online", "free")]
5882 );
5883
5884 active_call_a
5885 .update(cx_a, |call, cx| {
5886 call.invite(client_b.user_id().unwrap(), None, cx)
5887 })
5888 .await
5889 .unwrap();
5890 executor.run_until_parked();
5891 assert_eq!(
5892 contacts(&client_a, cx_a),
5893 [
5894 ("user_b".to_string(), "online", "busy"),
5895 ("user_c".to_string(), "online", "free")
5896 ]
5897 );
5898 assert_eq!(
5899 contacts(&client_b, cx_b),
5900 [
5901 ("user_a".to_string(), "online", "busy"),
5902 ("user_c".to_string(), "online", "free"),
5903 ("user_d".to_string(), "online", "free")
5904 ]
5905 );
5906 assert_eq!(
5907 contacts(&client_c, cx_c),
5908 [
5909 ("user_a".to_string(), "online", "busy"),
5910 ("user_b".to_string(), "online", "busy")
5911 ]
5912 );
5913 assert_eq!(
5914 contacts(&client_d, cx_d),
5915 [("user_b".to_string(), "online", "busy")]
5916 );
5917
5918 server.forbid_connections();
5919 server.disconnect_client(client_a.peer_id().unwrap());
5920 executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
5921 assert_eq!(contacts(&client_a, cx_a), []);
5922 assert_eq!(
5923 contacts(&client_b, cx_b),
5924 [
5925 ("user_a".to_string(), "offline", "free"),
5926 ("user_c".to_string(), "online", "free"),
5927 ("user_d".to_string(), "online", "free")
5928 ]
5929 );
5930 assert_eq!(
5931 contacts(&client_c, cx_c),
5932 [
5933 ("user_a".to_string(), "offline", "free"),
5934 ("user_b".to_string(), "online", "free")
5935 ]
5936 );
5937 assert_eq!(
5938 contacts(&client_d, cx_d),
5939 [("user_b".to_string(), "online", "free")]
5940 );
5941
5942 // Test removing a contact
5943 client_b
5944 .user_store()
5945 .update(cx_b, |store, cx| {
5946 store.remove_contact(client_c.user_id().unwrap(), cx)
5947 })
5948 .await
5949 .unwrap();
5950 executor.run_until_parked();
5951 assert_eq!(
5952 contacts(&client_b, cx_b),
5953 [
5954 ("user_a".to_string(), "offline", "free"),
5955 ("user_d".to_string(), "online", "free")
5956 ]
5957 );
5958 assert_eq!(
5959 contacts(&client_c, cx_c),
5960 [("user_a".to_string(), "offline", "free"),]
5961 );
5962
5963 fn contacts(
5964 client: &TestClient,
5965 cx: &TestAppContext,
5966 ) -> Vec<(String, &'static str, &'static str)> {
5967 client.user_store().read_with(cx, |store, _| {
5968 store
5969 .contacts()
5970 .iter()
5971 .map(|contact| {
5972 (
5973 contact.user.github_login.clone(),
5974 if contact.online { "online" } else { "offline" },
5975 if contact.busy { "busy" } else { "free" },
5976 )
5977 })
5978 .collect()
5979 })
5980 }
5981}
5982
5983#[gpui::test(iterations = 10)]
5984async fn test_contact_requests(
5985 executor: BackgroundExecutor,
5986 cx_a: &mut TestAppContext,
5987 cx_a2: &mut TestAppContext,
5988 cx_b: &mut TestAppContext,
5989 cx_b2: &mut TestAppContext,
5990 cx_c: &mut TestAppContext,
5991 cx_c2: &mut TestAppContext,
5992) {
5993 // Connect to a server as 3 clients.
5994 let mut server = TestServer::start(executor.clone()).await;
5995 let client_a = server.create_client(cx_a, "user_a").await;
5996 let client_a2 = server.create_client(cx_a2, "user_a").await;
5997 let client_b = server.create_client(cx_b, "user_b").await;
5998 let client_b2 = server.create_client(cx_b2, "user_b").await;
5999 let client_c = server.create_client(cx_c, "user_c").await;
6000 let client_c2 = server.create_client(cx_c2, "user_c").await;
6001
6002 assert_eq!(client_a.user_id().unwrap(), client_a2.user_id().unwrap());
6003 assert_eq!(client_b.user_id().unwrap(), client_b2.user_id().unwrap());
6004 assert_eq!(client_c.user_id().unwrap(), client_c2.user_id().unwrap());
6005
6006 // User A and User C request that user B become their contact.
6007 client_a
6008 .user_store()
6009 .update(cx_a, |store, cx| {
6010 store.request_contact(client_b.user_id().unwrap(), cx)
6011 })
6012 .await
6013 .unwrap();
6014 client_c
6015 .user_store()
6016 .update(cx_c, |store, cx| {
6017 store.request_contact(client_b.user_id().unwrap(), cx)
6018 })
6019 .await
6020 .unwrap();
6021 executor.run_until_parked();
6022
6023 // All users see the pending request appear in all their clients.
6024 assert_eq!(
6025 client_a.summarize_contacts(cx_a).outgoing_requests,
6026 &["user_b"]
6027 );
6028 assert_eq!(
6029 client_a2.summarize_contacts(cx_a2).outgoing_requests,
6030 &["user_b"]
6031 );
6032 assert_eq!(
6033 client_b.summarize_contacts(cx_b).incoming_requests,
6034 &["user_a", "user_c"]
6035 );
6036 assert_eq!(
6037 client_b2.summarize_contacts(cx_b2).incoming_requests,
6038 &["user_a", "user_c"]
6039 );
6040 assert_eq!(
6041 client_c.summarize_contacts(cx_c).outgoing_requests,
6042 &["user_b"]
6043 );
6044 assert_eq!(
6045 client_c2.summarize_contacts(cx_c2).outgoing_requests,
6046 &["user_b"]
6047 );
6048
6049 // Contact requests are present upon connecting (tested here via disconnect/reconnect)
6050 disconnect_and_reconnect(&client_a, cx_a).await;
6051 disconnect_and_reconnect(&client_b, cx_b).await;
6052 disconnect_and_reconnect(&client_c, cx_c).await;
6053 executor.run_until_parked();
6054 assert_eq!(
6055 client_a.summarize_contacts(cx_a).outgoing_requests,
6056 &["user_b"]
6057 );
6058 assert_eq!(
6059 client_b.summarize_contacts(cx_b).incoming_requests,
6060 &["user_a", "user_c"]
6061 );
6062 assert_eq!(
6063 client_c.summarize_contacts(cx_c).outgoing_requests,
6064 &["user_b"]
6065 );
6066
6067 // User B accepts the request from user A.
6068 client_b
6069 .user_store()
6070 .update(cx_b, |store, cx| {
6071 store.respond_to_contact_request(client_a.user_id().unwrap(), true, cx)
6072 })
6073 .await
6074 .unwrap();
6075
6076 executor.run_until_parked();
6077
6078 // User B sees user A as their contact now in all client, and the incoming request from them is removed.
6079 let contacts_b = client_b.summarize_contacts(cx_b);
6080 assert_eq!(contacts_b.current, &["user_a"]);
6081 assert_eq!(contacts_b.incoming_requests, &["user_c"]);
6082 let contacts_b2 = client_b2.summarize_contacts(cx_b2);
6083 assert_eq!(contacts_b2.current, &["user_a"]);
6084 assert_eq!(contacts_b2.incoming_requests, &["user_c"]);
6085
6086 // User A sees user B as their contact now in all clients, and the outgoing request to them is removed.
6087 let contacts_a = client_a.summarize_contacts(cx_a);
6088 assert_eq!(contacts_a.current, &["user_b"]);
6089 assert!(contacts_a.outgoing_requests.is_empty());
6090 let contacts_a2 = client_a2.summarize_contacts(cx_a2);
6091 assert_eq!(contacts_a2.current, &["user_b"]);
6092 assert!(contacts_a2.outgoing_requests.is_empty());
6093
6094 // Contacts are present upon connecting (tested here via disconnect/reconnect)
6095 disconnect_and_reconnect(&client_a, cx_a).await;
6096 disconnect_and_reconnect(&client_b, cx_b).await;
6097 disconnect_and_reconnect(&client_c, cx_c).await;
6098 executor.run_until_parked();
6099 assert_eq!(client_a.summarize_contacts(cx_a).current, &["user_b"]);
6100 assert_eq!(client_b.summarize_contacts(cx_b).current, &["user_a"]);
6101 assert_eq!(
6102 client_b.summarize_contacts(cx_b).incoming_requests,
6103 &["user_c"]
6104 );
6105 assert!(client_c.summarize_contacts(cx_c).current.is_empty());
6106 assert_eq!(
6107 client_c.summarize_contacts(cx_c).outgoing_requests,
6108 &["user_b"]
6109 );
6110
6111 // User B rejects the request from user C.
6112 client_b
6113 .user_store()
6114 .update(cx_b, |store, cx| {
6115 store.respond_to_contact_request(client_c.user_id().unwrap(), false, cx)
6116 })
6117 .await
6118 .unwrap();
6119
6120 executor.run_until_parked();
6121
6122 // User B doesn't see user C as their contact, and the incoming request from them is removed.
6123 let contacts_b = client_b.summarize_contacts(cx_b);
6124 assert_eq!(contacts_b.current, &["user_a"]);
6125 assert!(contacts_b.incoming_requests.is_empty());
6126 let contacts_b2 = client_b2.summarize_contacts(cx_b2);
6127 assert_eq!(contacts_b2.current, &["user_a"]);
6128 assert!(contacts_b2.incoming_requests.is_empty());
6129
6130 // User C doesn't see user B as their contact, and the outgoing request to them is removed.
6131 let contacts_c = client_c.summarize_contacts(cx_c);
6132 assert!(contacts_c.current.is_empty());
6133 assert!(contacts_c.outgoing_requests.is_empty());
6134 let contacts_c2 = client_c2.summarize_contacts(cx_c2);
6135 assert!(contacts_c2.current.is_empty());
6136 assert!(contacts_c2.outgoing_requests.is_empty());
6137
6138 // Incoming/outgoing requests are not present upon connecting (tested here via disconnect/reconnect)
6139 disconnect_and_reconnect(&client_a, cx_a).await;
6140 disconnect_and_reconnect(&client_b, cx_b).await;
6141 disconnect_and_reconnect(&client_c, cx_c).await;
6142 executor.run_until_parked();
6143 assert_eq!(client_a.summarize_contacts(cx_a).current, &["user_b"]);
6144 assert_eq!(client_b.summarize_contacts(cx_b).current, &["user_a"]);
6145 assert!(client_b
6146 .summarize_contacts(cx_b)
6147 .incoming_requests
6148 .is_empty());
6149 assert!(client_c.summarize_contacts(cx_c).current.is_empty());
6150 assert!(client_c
6151 .summarize_contacts(cx_c)
6152 .outgoing_requests
6153 .is_empty());
6154
6155 async fn disconnect_and_reconnect(client: &TestClient, cx: &mut TestAppContext) {
6156 client.disconnect(&cx.to_async());
6157 client.clear_contacts(cx).await;
6158 client
6159 .authenticate_and_connect(false, &cx.to_async())
6160 .await
6161 .unwrap();
6162 }
6163}
6164
6165// TODO: Re-enable this test once we can replace our swift Livekit SDK with the rust SDK
6166#[cfg(not(target_os = "macos"))]
6167#[gpui::test(iterations = 10)]
6168async fn test_join_call_after_screen_was_shared(
6169 executor: BackgroundExecutor,
6170 cx_a: &mut TestAppContext,
6171 cx_b: &mut TestAppContext,
6172) {
6173 let mut server = TestServer::start(executor.clone()).await;
6174
6175 let client_a = server.create_client(cx_a, "user_a").await;
6176 let client_b = server.create_client(cx_b, "user_b").await;
6177 server
6178 .make_contacts(&mut [(&client_a, cx_a), (&client_b, cx_b)])
6179 .await;
6180
6181 let active_call_a = cx_a.read(ActiveCall::global);
6182 let active_call_b = cx_b.read(ActiveCall::global);
6183
6184 // Call users B and C from client A.
6185 active_call_a
6186 .update(cx_a, |call, cx| {
6187 call.invite(client_b.user_id().unwrap(), None, cx)
6188 })
6189 .await
6190 .unwrap();
6191
6192 let room_a = active_call_a.read_with(cx_a, |call, _| call.room().unwrap().clone());
6193 executor.run_until_parked();
6194 assert_eq!(
6195 room_participants(&room_a, cx_a),
6196 RoomParticipants {
6197 remote: Default::default(),
6198 pending: vec!["user_b".to_string()]
6199 }
6200 );
6201
6202 // User B receives the call.
6203
6204 let mut incoming_call_b = active_call_b.read_with(cx_b, |call, _| call.incoming());
6205 let call_b = incoming_call_b.next().await.unwrap().unwrap();
6206 assert_eq!(call_b.calling_user.github_login, "user_a");
6207
6208 // User A shares their screen
6209 let display = gpui::TestScreenCaptureSource::new();
6210 cx_a.set_screen_capture_sources(vec![display]);
6211 active_call_a
6212 .update(cx_a, |call, cx| {
6213 call.room()
6214 .unwrap()
6215 .update(cx, |room, cx| room.share_screen(cx))
6216 })
6217 .await
6218 .unwrap();
6219
6220 client_b.user_store().update(cx_b, |user_store, _| {
6221 user_store.clear_cache();
6222 });
6223
6224 // User B joins the room
6225 active_call_b
6226 .update(cx_b, |call, cx| call.accept_incoming(cx))
6227 .await
6228 .unwrap();
6229
6230 let room_b = active_call_b.read_with(cx_b, |call, _| call.room().unwrap().clone());
6231 assert!(incoming_call_b.next().await.unwrap().is_none());
6232
6233 executor.run_until_parked();
6234 assert_eq!(
6235 room_participants(&room_a, cx_a),
6236 RoomParticipants {
6237 remote: vec!["user_b".to_string()],
6238 pending: vec![],
6239 }
6240 );
6241 assert_eq!(
6242 room_participants(&room_b, cx_b),
6243 RoomParticipants {
6244 remote: vec!["user_a".to_string()],
6245 pending: vec![],
6246 }
6247 );
6248
6249 // Ensure User B sees User A's screenshare.
6250
6251 room_b.read_with(cx_b, |room, _| {
6252 assert_eq!(
6253 room.remote_participants()
6254 .get(&client_a.user_id().unwrap())
6255 .unwrap()
6256 .video_tracks
6257 .len(),
6258 1
6259 );
6260 });
6261}
6262
6263#[gpui::test]
6264async fn test_right_click_menu_behind_collab_panel(cx: &mut TestAppContext) {
6265 let mut server = TestServer::start(cx.executor().clone()).await;
6266 let client_a = server.create_client(cx, "user_a").await;
6267 let (_workspace_a, cx) = client_a.build_test_workspace(cx).await;
6268
6269 cx.simulate_resize(size(px(300.), px(300.)));
6270
6271 cx.simulate_keystrokes("cmd-n cmd-n cmd-n");
6272 cx.update(|window, _cx| window.refresh());
6273
6274 let tab_bounds = cx.debug_bounds("TAB-2").unwrap();
6275 let new_tab_button_bounds = cx.debug_bounds("ICON-Plus").unwrap();
6276
6277 assert!(
6278 tab_bounds.intersects(&new_tab_button_bounds),
6279 "Tab should overlap with the new tab button, if this is failing check if there's been a redesign!"
6280 );
6281
6282 cx.simulate_event(MouseDownEvent {
6283 button: MouseButton::Right,
6284 position: new_tab_button_bounds.center(),
6285 modifiers: Modifiers::default(),
6286 click_count: 1,
6287 first_mouse: false,
6288 });
6289
6290 // regression test that the right click menu for tabs does not open.
6291 assert!(cx.debug_bounds("MENU_ITEM-Close").is_none());
6292
6293 let tab_bounds = cx.debug_bounds("TAB-1").unwrap();
6294 cx.simulate_event(MouseDownEvent {
6295 button: MouseButton::Right,
6296 position: tab_bounds.center(),
6297 modifiers: Modifiers::default(),
6298 click_count: 1,
6299 first_mouse: false,
6300 });
6301 assert!(cx.debug_bounds("MENU_ITEM-Close").is_some());
6302}
6303
6304#[gpui::test]
6305async fn test_pane_split_left(cx: &mut TestAppContext) {
6306 let (_, client) = TestServer::start1(cx).await;
6307 let (workspace, cx) = client.build_test_workspace(cx).await;
6308
6309 cx.simulate_keystrokes("cmd-n");
6310 workspace.update(cx, |workspace, cx| {
6311 assert!(workspace.items(cx).collect::<Vec<_>>().len() == 1);
6312 });
6313 cx.simulate_keystrokes("cmd-k left");
6314 workspace.update(cx, |workspace, cx| {
6315 assert!(workspace.items(cx).collect::<Vec<_>>().len() == 2);
6316 });
6317 cx.simulate_keystrokes("cmd-k");
6318 // sleep for longer than the timeout in keyboard shortcut handling
6319 // to verify that it doesn't fire in this case.
6320 cx.executor().advance_clock(Duration::from_secs(2));
6321 cx.simulate_keystrokes("left");
6322 workspace.update(cx, |workspace, cx| {
6323 assert!(workspace.items(cx).collect::<Vec<_>>().len() == 2);
6324 });
6325}
6326
6327#[gpui::test]
6328async fn test_join_after_restart(cx1: &mut TestAppContext, cx2: &mut TestAppContext) {
6329 let (mut server, client) = TestServer::start1(cx1).await;
6330 let channel1 = server.make_public_channel("channel1", &client, cx1).await;
6331 let channel2 = server.make_public_channel("channel2", &client, cx1).await;
6332
6333 join_channel(channel1, &client, cx1).await.unwrap();
6334 drop(client);
6335
6336 let client2 = server.create_client(cx2, "user_a").await;
6337 join_channel(channel2, &client2, cx2).await.unwrap();
6338}
6339
6340#[gpui::test]
6341async fn test_preview_tabs(cx: &mut TestAppContext) {
6342 let (_server, client) = TestServer::start1(cx).await;
6343 let (workspace, cx) = client.build_test_workspace(cx).await;
6344 let project = workspace.update(cx, |workspace, _| workspace.project().clone());
6345
6346 let worktree_id = project.update(cx, |project, cx| {
6347 project.worktrees(cx).next().unwrap().read(cx).id()
6348 });
6349
6350 let path_1 = ProjectPath {
6351 worktree_id,
6352 path: Path::new("1.txt").into(),
6353 };
6354 let path_2 = ProjectPath {
6355 worktree_id,
6356 path: Path::new("2.js").into(),
6357 };
6358 let path_3 = ProjectPath {
6359 worktree_id,
6360 path: Path::new("3.rs").into(),
6361 };
6362
6363 let pane = workspace.update(cx, |workspace, _| workspace.active_pane().clone());
6364
6365 let get_path = |pane: &Pane, idx: usize, cx: &App| {
6366 pane.item_for_index(idx).unwrap().project_path(cx).unwrap()
6367 };
6368
6369 // Opening item 3 as a "permanent" tab
6370 workspace
6371 .update_in(cx, |workspace, window, cx| {
6372 workspace.open_path(path_3.clone(), None, false, window, cx)
6373 })
6374 .await
6375 .unwrap();
6376
6377 pane.update(cx, |pane, cx| {
6378 assert_eq!(pane.items_len(), 1);
6379 assert_eq!(get_path(pane, 0, cx), path_3.clone());
6380 assert_eq!(pane.preview_item_id(), None);
6381
6382 assert!(!pane.can_navigate_backward());
6383 assert!(!pane.can_navigate_forward());
6384 });
6385
6386 // Open item 1 as preview
6387 workspace
6388 .update_in(cx, |workspace, window, cx| {
6389 workspace.open_path_preview(path_1.clone(), None, true, true, true, window, cx)
6390 })
6391 .await
6392 .unwrap();
6393
6394 pane.update(cx, |pane, cx| {
6395 assert_eq!(pane.items_len(), 2);
6396 assert_eq!(get_path(pane, 0, cx), path_3.clone());
6397 assert_eq!(get_path(pane, 1, cx), path_1.clone());
6398 assert_eq!(
6399 pane.preview_item_id(),
6400 Some(pane.items().nth(1).unwrap().item_id())
6401 );
6402
6403 assert!(pane.can_navigate_backward());
6404 assert!(!pane.can_navigate_forward());
6405 });
6406
6407 // Open item 2 as preview
6408 workspace
6409 .update_in(cx, |workspace, window, cx| {
6410 workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
6411 })
6412 .await
6413 .unwrap();
6414
6415 pane.update(cx, |pane, cx| {
6416 assert_eq!(pane.items_len(), 2);
6417 assert_eq!(get_path(pane, 0, cx), path_3.clone());
6418 assert_eq!(get_path(pane, 1, cx), path_2.clone());
6419 assert_eq!(
6420 pane.preview_item_id(),
6421 Some(pane.items().nth(1).unwrap().item_id())
6422 );
6423
6424 assert!(pane.can_navigate_backward());
6425 assert!(!pane.can_navigate_forward());
6426 });
6427
6428 // Going back should show item 1 as preview
6429 workspace
6430 .update_in(cx, |workspace, window, cx| {
6431 workspace.go_back(pane.downgrade(), window, cx)
6432 })
6433 .await
6434 .unwrap();
6435
6436 pane.update(cx, |pane, cx| {
6437 assert_eq!(pane.items_len(), 2);
6438 assert_eq!(get_path(pane, 0, cx), path_3.clone());
6439 assert_eq!(get_path(pane, 1, cx), path_1.clone());
6440 assert_eq!(
6441 pane.preview_item_id(),
6442 Some(pane.items().nth(1).unwrap().item_id())
6443 );
6444
6445 assert!(pane.can_navigate_backward());
6446 assert!(pane.can_navigate_forward());
6447 });
6448
6449 // Closing item 1
6450 pane.update_in(cx, |pane, window, cx| {
6451 pane.close_item_by_id(
6452 pane.active_item().unwrap().item_id(),
6453 workspace::SaveIntent::Skip,
6454 window,
6455 cx,
6456 )
6457 })
6458 .await
6459 .unwrap();
6460
6461 pane.update(cx, |pane, cx| {
6462 assert_eq!(pane.items_len(), 1);
6463 assert_eq!(get_path(pane, 0, cx), path_3.clone());
6464 assert_eq!(pane.preview_item_id(), None);
6465
6466 assert!(pane.can_navigate_backward());
6467 assert!(!pane.can_navigate_forward());
6468 });
6469
6470 // Going back should show item 1 as preview
6471 workspace
6472 .update_in(cx, |workspace, window, cx| {
6473 workspace.go_back(pane.downgrade(), window, cx)
6474 })
6475 .await
6476 .unwrap();
6477
6478 pane.update(cx, |pane, cx| {
6479 assert_eq!(pane.items_len(), 2);
6480 assert_eq!(get_path(pane, 0, cx), path_3.clone());
6481 assert_eq!(get_path(pane, 1, cx), path_1.clone());
6482 assert_eq!(
6483 pane.preview_item_id(),
6484 Some(pane.items().nth(1).unwrap().item_id())
6485 );
6486
6487 assert!(pane.can_navigate_backward());
6488 assert!(pane.can_navigate_forward());
6489 });
6490
6491 // Close permanent tab
6492 pane.update_in(cx, |pane, window, cx| {
6493 let id = pane.items().next().unwrap().item_id();
6494 pane.close_item_by_id(id, workspace::SaveIntent::Skip, window, cx)
6495 })
6496 .await
6497 .unwrap();
6498
6499 pane.update(cx, |pane, cx| {
6500 assert_eq!(pane.items_len(), 1);
6501 assert_eq!(get_path(pane, 0, cx), path_1.clone());
6502 assert_eq!(
6503 pane.preview_item_id(),
6504 Some(pane.items().next().unwrap().item_id())
6505 );
6506
6507 assert!(pane.can_navigate_backward());
6508 assert!(pane.can_navigate_forward());
6509 });
6510
6511 // Split pane to the right
6512 pane.update(cx, |pane, cx| {
6513 pane.split(workspace::SplitDirection::Right, cx);
6514 });
6515
6516 let right_pane = workspace.update(cx, |workspace, _| workspace.active_pane().clone());
6517
6518 pane.update(cx, |pane, cx| {
6519 assert_eq!(pane.items_len(), 1);
6520 assert_eq!(get_path(pane, 0, cx), path_1.clone());
6521 assert_eq!(
6522 pane.preview_item_id(),
6523 Some(pane.items().next().unwrap().item_id())
6524 );
6525
6526 assert!(pane.can_navigate_backward());
6527 assert!(pane.can_navigate_forward());
6528 });
6529
6530 right_pane.update(cx, |pane, cx| {
6531 assert_eq!(pane.items_len(), 1);
6532 assert_eq!(get_path(pane, 0, cx), path_1.clone());
6533 assert_eq!(pane.preview_item_id(), None);
6534
6535 assert!(!pane.can_navigate_backward());
6536 assert!(!pane.can_navigate_forward());
6537 });
6538
6539 // Open item 2 as preview in right pane
6540 workspace
6541 .update_in(cx, |workspace, window, cx| {
6542 workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
6543 })
6544 .await
6545 .unwrap();
6546
6547 pane.update(cx, |pane, cx| {
6548 assert_eq!(pane.items_len(), 1);
6549 assert_eq!(get_path(pane, 0, cx), path_1.clone());
6550 assert_eq!(
6551 pane.preview_item_id(),
6552 Some(pane.items().next().unwrap().item_id())
6553 );
6554
6555 assert!(pane.can_navigate_backward());
6556 assert!(pane.can_navigate_forward());
6557 });
6558
6559 right_pane.update(cx, |pane, cx| {
6560 assert_eq!(pane.items_len(), 2);
6561 assert_eq!(get_path(pane, 0, cx), path_1.clone());
6562 assert_eq!(get_path(pane, 1, cx), path_2.clone());
6563 assert_eq!(
6564 pane.preview_item_id(),
6565 Some(pane.items().nth(1).unwrap().item_id())
6566 );
6567
6568 assert!(pane.can_navigate_backward());
6569 assert!(!pane.can_navigate_forward());
6570 });
6571
6572 // Focus left pane
6573 workspace.update_in(cx, |workspace, window, cx| {
6574 workspace.activate_pane_in_direction(workspace::SplitDirection::Left, window, cx)
6575 });
6576
6577 // Open item 2 as preview in left pane
6578 workspace
6579 .update_in(cx, |workspace, window, cx| {
6580 workspace.open_path_preview(path_2.clone(), None, true, true, true, window, cx)
6581 })
6582 .await
6583 .unwrap();
6584
6585 pane.update(cx, |pane, cx| {
6586 assert_eq!(pane.items_len(), 1);
6587 assert_eq!(get_path(pane, 0, cx), path_2.clone());
6588 assert_eq!(
6589 pane.preview_item_id(),
6590 Some(pane.items().next().unwrap().item_id())
6591 );
6592
6593 assert!(pane.can_navigate_backward());
6594 assert!(!pane.can_navigate_forward());
6595 });
6596
6597 right_pane.update(cx, |pane, cx| {
6598 assert_eq!(pane.items_len(), 2);
6599 assert_eq!(get_path(pane, 0, cx), path_1.clone());
6600 assert_eq!(get_path(pane, 1, cx), path_2.clone());
6601 assert_eq!(
6602 pane.preview_item_id(),
6603 Some(pane.items().nth(1).unwrap().item_id())
6604 );
6605
6606 assert!(pane.can_navigate_backward());
6607 assert!(!pane.can_navigate_forward());
6608 });
6609}
6610
6611#[gpui::test(iterations = 10)]
6612async fn test_context_collaboration_with_reconnect(
6613 executor: BackgroundExecutor,
6614 cx_a: &mut TestAppContext,
6615 cx_b: &mut TestAppContext,
6616) {
6617 let mut server = TestServer::start(executor.clone()).await;
6618 let client_a = server.create_client(cx_a, "user_a").await;
6619 let client_b = server.create_client(cx_b, "user_b").await;
6620 server
6621 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
6622 .await;
6623 let active_call_a = cx_a.read(ActiveCall::global);
6624
6625 client_a.fs().insert_tree("/a", Default::default()).await;
6626 let (project_a, _) = client_a.build_local_project("/a", cx_a).await;
6627 let project_id = active_call_a
6628 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
6629 .await
6630 .unwrap();
6631 let project_b = client_b.join_remote_project(project_id, cx_b).await;
6632
6633 // Client A sees that a guest has joined.
6634 executor.run_until_parked();
6635
6636 project_a.read_with(cx_a, |project, _| {
6637 assert_eq!(project.collaborators().len(), 1);
6638 });
6639 project_b.read_with(cx_b, |project, _| {
6640 assert_eq!(project.collaborators().len(), 1);
6641 });
6642
6643 cx_a.update(context_server::init);
6644 cx_b.update(context_server::init);
6645 let prompt_builder = Arc::new(PromptBuilder::new(None).unwrap());
6646 let context_store_a = cx_a
6647 .update(|cx| {
6648 ContextStore::new(
6649 project_a.clone(),
6650 prompt_builder.clone(),
6651 Arc::new(SlashCommandWorkingSet::default()),
6652 cx,
6653 )
6654 })
6655 .await
6656 .unwrap();
6657 let context_store_b = cx_b
6658 .update(|cx| {
6659 ContextStore::new(
6660 project_b.clone(),
6661 prompt_builder.clone(),
6662 Arc::new(SlashCommandWorkingSet::default()),
6663 cx,
6664 )
6665 })
6666 .await
6667 .unwrap();
6668
6669 // Client A creates a new chats.
6670 let context_a = context_store_a.update(cx_a, |store, cx| store.create(cx));
6671 executor.run_until_parked();
6672
6673 // Client B retrieves host's contexts and joins one.
6674 let context_b = context_store_b
6675 .update(cx_b, |store, cx| {
6676 let host_contexts = store.host_contexts().to_vec();
6677 assert_eq!(host_contexts.len(), 1);
6678 store.open_remote_context(host_contexts[0].id.clone(), cx)
6679 })
6680 .await
6681 .unwrap();
6682
6683 // Host and guest make changes
6684 context_a.update(cx_a, |context, cx| {
6685 context.buffer().update(cx, |buffer, cx| {
6686 buffer.edit([(0..0, "Host change\n")], None, cx)
6687 })
6688 });
6689 context_b.update(cx_b, |context, cx| {
6690 context.buffer().update(cx, |buffer, cx| {
6691 buffer.edit([(0..0, "Guest change\n")], None, cx)
6692 })
6693 });
6694 executor.run_until_parked();
6695 assert_eq!(
6696 context_a.read_with(cx_a, |context, cx| context.buffer().read(cx).text()),
6697 "Guest change\nHost change\n"
6698 );
6699 assert_eq!(
6700 context_b.read_with(cx_b, |context, cx| context.buffer().read(cx).text()),
6701 "Guest change\nHost change\n"
6702 );
6703
6704 // Disconnect client A and make some changes while disconnected.
6705 server.disconnect_client(client_a.peer_id().unwrap());
6706 server.forbid_connections();
6707 context_a.update(cx_a, |context, cx| {
6708 context.buffer().update(cx, |buffer, cx| {
6709 buffer.edit([(0..0, "Host offline change\n")], None, cx)
6710 })
6711 });
6712 context_b.update(cx_b, |context, cx| {
6713 context.buffer().update(cx, |buffer, cx| {
6714 buffer.edit([(0..0, "Guest offline change\n")], None, cx)
6715 })
6716 });
6717 executor.run_until_parked();
6718 assert_eq!(
6719 context_a.read_with(cx_a, |context, cx| context.buffer().read(cx).text()),
6720 "Host offline change\nGuest change\nHost change\n"
6721 );
6722 assert_eq!(
6723 context_b.read_with(cx_b, |context, cx| context.buffer().read(cx).text()),
6724 "Guest offline change\nGuest change\nHost change\n"
6725 );
6726
6727 // Allow client A to reconnect and verify that contexts converge.
6728 server.allow_connections();
6729 executor.advance_clock(RECEIVE_TIMEOUT);
6730 assert_eq!(
6731 context_a.read_with(cx_a, |context, cx| context.buffer().read(cx).text()),
6732 "Guest offline change\nHost offline change\nGuest change\nHost change\n"
6733 );
6734 assert_eq!(
6735 context_b.read_with(cx_b, |context, cx| context.buffer().read(cx).text()),
6736 "Guest offline change\nHost offline change\nGuest change\nHost change\n"
6737 );
6738
6739 // Client A disconnects without being able to reconnect. Context B becomes readonly.
6740 server.forbid_connections();
6741 server.disconnect_client(client_a.peer_id().unwrap());
6742 executor.advance_clock(RECEIVE_TIMEOUT + RECONNECT_TIMEOUT);
6743 context_b.read_with(cx_b, |context, cx| {
6744 assert!(context.buffer().read(cx).read_only());
6745 });
6746}
6747
6748#[gpui::test]
6749async fn test_remote_git_branches(
6750 executor: BackgroundExecutor,
6751 cx_a: &mut TestAppContext,
6752 cx_b: &mut TestAppContext,
6753) {
6754 let mut server = TestServer::start(executor.clone()).await;
6755 let client_a = server.create_client(cx_a, "user_a").await;
6756 let client_b = server.create_client(cx_b, "user_b").await;
6757 server
6758 .create_room(&mut [(&client_a, cx_a), (&client_b, cx_b)])
6759 .await;
6760 let active_call_a = cx_a.read(ActiveCall::global);
6761
6762 client_a
6763 .fs()
6764 .insert_tree("/project", serde_json::json!({ ".git":{} }))
6765 .await;
6766 let branches = ["main", "dev", "feature-1"];
6767 client_a
6768 .fs()
6769 .insert_branches(Path::new("/project/.git"), &branches);
6770 let branches_set = branches
6771 .into_iter()
6772 .map(ToString::to_string)
6773 .collect::<HashSet<_>>();
6774
6775 let (project_a, _) = client_a.build_local_project("/project", cx_a).await;
6776
6777 let project_id = active_call_a
6778 .update(cx_a, |call, cx| call.share_project(project_a.clone(), cx))
6779 .await
6780 .unwrap();
6781 let project_b = client_b.join_remote_project(project_id, cx_b).await;
6782
6783 // Client A sees that a guest has joined and the repo has been populated
6784 executor.run_until_parked();
6785
6786 let repo_b = cx_b.update(|cx| project_b.read(cx).active_repository(cx).unwrap());
6787
6788 let branches_b = cx_b
6789 .update(|cx| repo_b.update(cx, |repository, _| repository.branches()))
6790 .await
6791 .unwrap()
6792 .unwrap();
6793
6794 let new_branch = branches[2];
6795
6796 let branches_b = branches_b
6797 .into_iter()
6798 .map(|branch| branch.name.to_string())
6799 .collect::<HashSet<_>>();
6800
6801 assert_eq!(branches_b, branches_set);
6802
6803 cx_b.update(|cx| repo_b.read(cx).change_branch(new_branch.to_string()))
6804 .await
6805 .unwrap()
6806 .unwrap();
6807
6808 executor.run_until_parked();
6809
6810 let host_branch = cx_a.update(|cx| {
6811 project_a.update(cx, |project, cx| {
6812 project
6813 .repositories(cx)
6814 .values()
6815 .next()
6816 .unwrap()
6817 .read(cx)
6818 .current_branch()
6819 .unwrap()
6820 .clone()
6821 })
6822 });
6823
6824 assert_eq!(host_branch.name, branches[2]);
6825
6826 // Also try creating a new branch
6827 cx_b.update(|cx| {
6828 repo_b
6829 .read(cx)
6830 .create_branch("totally-new-branch".to_string())
6831 })
6832 .await
6833 .unwrap()
6834 .unwrap();
6835
6836 cx_b.update(|cx| {
6837 repo_b
6838 .read(cx)
6839 .change_branch("totally-new-branch".to_string())
6840 })
6841 .await
6842 .unwrap()
6843 .unwrap();
6844
6845 executor.run_until_parked();
6846
6847 let host_branch = cx_a.update(|cx| {
6848 project_a.update(cx, |project, cx| {
6849 project
6850 .repositories(cx)
6851 .values()
6852 .next()
6853 .unwrap()
6854 .read(cx)
6855 .current_branch()
6856 .unwrap()
6857 .clone()
6858 })
6859 });
6860
6861 assert_eq!(host_branch.name, "totally-new-branch");
6862}