Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix renames over language server for SSH remoting (#17897)

Browse source 
Release Notes:

- ssh remoting: Fix rename over language server

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
Co-authored-by: Max <max@zed.dev>
This commit is contained in:
Conrad Irwin 2024-09-16 16:20:17 -06:00 • committed by GitHub
parent 01bb10f518
commit e66ea9e5d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
34 changed files with 505 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/language/src/buffer_tests.rs
View file

@ -275,7 +275,7 @@ fn test_edit_events(cx: &mut gpui::AppContext) {
|buffer, cx| {
let buffer_1_events = buffer_1_events.clone();
cx.subscribe(&buffer1, move |_, _, event, _| match event.clone() {
Event::Operation(op) => buffer1_ops.lock().push(op),
BufferEvent::Operation(op) => buffer1_ops.lock().push(op),
event => buffer_1_events.lock().push(event),
})
.detach();
@ -313,15 +313,15 @@ fn test_edit_events(cx: &mut gpui::AppContext) {
assert_eq!(
mem::take(&mut *buffer_1_events.lock()),
vec![
Event::Edited,
Event::DirtyChanged,
Event::Edited,
Event::Edited,
BufferEvent::Edited,
BufferEvent::DirtyChanged,
BufferEvent::Edited,
BufferEvent::Edited,
]
);
assert_eq!(
mem::take(&mut *buffer_2_events.lock()),
vec![Event::Edited, Event::DirtyChanged]
vec![BufferEvent::Edited, BufferEvent::DirtyChanged]
);
buffer1.update(cx, |buffer, cx| {
@ -336,11 +336,11 @@ fn test_edit_events(cx: &mut gpui::AppContext) {
});
assert_eq!(
mem::take(&mut *buffer_1_events.lock()),
vec![Event::Edited, Event::DirtyChanged,]
vec![BufferEvent::Edited, BufferEvent::DirtyChanged,]
);
assert_eq!(
mem::take(&mut *buffer_2_events.lock()),
vec![Event::Edited, Event::DirtyChanged]
vec![BufferEvent::Edited, BufferEvent::DirtyChanged]
);
}
@ -2411,7 +2411,7 @@ fn test_random_collaboration(cx: &mut AppContext, mut rng: StdRng) {
buffer.set_group_interval(Duration::from_millis(rng.gen_range(0..=200)));
let network = network.clone();
cx.subscribe(&cx.handle(), move |buffer, _, event, _| {
if let Event::Operation(op) = event {
if let BufferEvent::Operation(op) = event {
network
.lock()
.broadcast(buffer.replica_id(), vec![proto::serialize_operation(op)]);
@ -2539,7 +2539,7 @@ fn test_random_collaboration(cx: &mut AppContext, mut rng: StdRng) {
new_buffer.set_group_interval(Duration::from_millis(rng.gen_range(0..=200)));
let network = network.clone();
cx.subscribe(&cx.handle(), move |buffer, _, event, _| {
if let Event::Operation(op) = event {
if let BufferEvent::Operation(op) = event {
network.lock().broadcast(
buffer.replica_id(),
vec![proto::serialize_operation(op)],