Rename LSP function and simplify tests (#27313)
While working on a fix I found opportunities to improve readability, but it's a big rename diff, so I'm landing separately. Release Notes: - N/A
This commit is contained in:
João Marcos
GitHub
parent
f4d1e7901c
commit
9f0b09007b
20 changed files with 641 additions and 642 deletions
|
|
@ -1326,26 +1326,28 @@ pub mod tests {
|
|||
});
|
||||
let (_, editor, fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
|
||||
let lsp_request_count = Arc::new(AtomicU32::new(0));
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
|
||||
let task_lsp_request_count = Arc::clone(&lsp_request_count);
|
||||
async move {
|
||||
let i = task_lsp_request_count.fetch_add(1, Ordering::Release) + 1;
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(file_with_hints).unwrap(),
|
||||
);
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: lsp::Position::new(0, i),
|
||||
label: lsp::InlayHintLabel::String(i.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
});
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let task_lsp_request_count = Arc::clone(&lsp_request_count);
|
||||
async move {
|
||||
let i = task_lsp_request_count.fetch_add(1, Ordering::Release) + 1;
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(file_with_hints).unwrap(),
|
||||
);
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: lsp::Position::new(0, i),
|
||||
label: lsp::InlayHintLabel::String(i.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
},
|
||||
);
|
||||
})
|
||||
.await;
|
||||
cx.executor().run_until_parked();
|
||||
|
|
@ -1431,27 +1433,29 @@ pub mod tests {
|
|||
|
||||
let (_, editor, fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
|
||||
let lsp_request_count = Arc::new(AtomicU32::new(0));
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
|
||||
let task_lsp_request_count = Arc::clone(&lsp_request_count);
|
||||
async move {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(file_with_hints).unwrap(),
|
||||
);
|
||||
let current_call_id =
|
||||
Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: lsp::Position::new(0, current_call_id),
|
||||
label: lsp::InlayHintLabel::String(current_call_id.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
});
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let task_lsp_request_count = Arc::clone(&lsp_request_count);
|
||||
async move {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(file_with_hints).unwrap(),
|
||||
);
|
||||
let current_call_id =
|
||||
Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: lsp::Position::new(0, current_call_id),
|
||||
label: lsp::InlayHintLabel::String(current_call_id.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
},
|
||||
);
|
||||
})
|
||||
.await;
|
||||
cx.executor().run_until_parked();
|
||||
|
|
@ -1571,43 +1575,48 @@ pub mod tests {
|
|||
move |fake_server| {
|
||||
let rs_lsp_request_count = Arc::new(AtomicU32::new(0));
|
||||
let md_lsp_request_count = Arc::new(AtomicU32::new(0));
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let i = match name {
|
||||
"Rust" => {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(path!("/a/main.rs"))
|
||||
.unwrap(),
|
||||
);
|
||||
rs_lsp_request_count.fetch_add(1, Ordering::Release) + 1
|
||||
}
|
||||
"Markdown" => {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(path!("/a/other.md"))
|
||||
.unwrap(),
|
||||
);
|
||||
md_lsp_request_count.fetch_add(1, Ordering::Release) + 1
|
||||
}
|
||||
unexpected => panic!("Unexpected language: {unexpected}"),
|
||||
};
|
||||
fake_server
|
||||
.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let i = match name {
|
||||
"Rust" => {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(path!("/a/main.rs"))
|
||||
.unwrap(),
|
||||
);
|
||||
rs_lsp_request_count.fetch_add(1, Ordering::Release)
|
||||
+ 1
|
||||
}
|
||||
"Markdown" => {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(path!("/a/other.md"))
|
||||
.unwrap(),
|
||||
);
|
||||
md_lsp_request_count.fetch_add(1, Ordering::Release)
|
||||
+ 1
|
||||
}
|
||||
unexpected => {
|
||||
panic!("Unexpected language: {unexpected}")
|
||||
}
|
||||
};
|
||||
|
||||
async move {
|
||||
let query_start = params.range.start;
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: query_start,
|
||||
label: lsp::InlayHintLabel::String(i.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
},
|
||||
);
|
||||
async move {
|
||||
let query_start = params.range.start;
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: query_start,
|
||||
label: lsp::InlayHintLabel::String(i.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
},
|
||||
);
|
||||
}
|
||||
})),
|
||||
..Default::default()
|
||||
|
|
@ -1757,7 +1766,7 @@ pub mod tests {
|
|||
let lsp_request_count = lsp_request_count.clone();
|
||||
move |fake_server, file_with_hints| {
|
||||
let lsp_request_count = lsp_request_count.clone();
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
lsp_request_count.fetch_add(1, Ordering::Release);
|
||||
async move {
|
||||
|
|
@ -2087,7 +2096,7 @@ pub mod tests {
|
|||
let lsp_request_count = lsp_request_count.clone();
|
||||
move |fake_server, file_with_hints| {
|
||||
let lsp_request_count = lsp_request_count.clone();
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let lsp_request_count = lsp_request_count.clone();
|
||||
async move {
|
||||
|
|
@ -2244,7 +2253,7 @@ pub mod tests {
|
|||
move |fake_server| {
|
||||
let closure_lsp_request_ranges = Arc::clone(&lsp_request_ranges);
|
||||
let closure_lsp_request_count = Arc::clone(&lsp_request_count);
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let task_lsp_request_ranges =
|
||||
Arc::clone(&closure_lsp_request_ranges);
|
||||
|
|
@ -2625,7 +2634,7 @@ pub mod tests {
|
|||
let fake_server = fake_servers.next().await.unwrap();
|
||||
let closure_editor_edited = Arc::clone(&editor_edited);
|
||||
fake_server
|
||||
.handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
|
||||
.set_request_handler::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
|
||||
let task_editor_edited = Arc::clone(&closure_editor_edited);
|
||||
async move {
|
||||
let hint_text = if params.text_document.uri
|
||||
|
|
@ -2926,7 +2935,7 @@ pub mod tests {
|
|||
let fake_server = fake_servers.next().await.unwrap();
|
||||
let closure_editor_edited = Arc::clone(&editor_edited);
|
||||
fake_server
|
||||
.handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
|
||||
.set_request_handler::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
|
||||
let task_editor_edited = Arc::clone(&closure_editor_edited);
|
||||
async move {
|
||||
let hint_text = if params.text_document.uri
|
||||
|
|
@ -3094,7 +3103,7 @@ pub mod tests {
|
|||
},
|
||||
initializer: Some(Box::new(move |fake_server| {
|
||||
let lsp_request_count = Arc::new(AtomicU32::new(0));
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let i = lsp_request_count.fetch_add(1, Ordering::Release) + 1;
|
||||
async move {
|
||||
|
|
@ -3165,27 +3174,29 @@ pub mod tests {
|
|||
|
||||
let (_, editor, _fake_server) = prepare_test_objects(cx, |fake_server, file_with_hints| {
|
||||
let lsp_request_count = Arc::new(AtomicU32::new(0));
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
|
||||
let lsp_request_count = lsp_request_count.clone();
|
||||
async move {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(file_with_hints).unwrap(),
|
||||
);
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| {
|
||||
let lsp_request_count = lsp_request_count.clone();
|
||||
async move {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
lsp::Url::from_file_path(file_with_hints).unwrap(),
|
||||
);
|
||||
|
||||
let i = lsp_request_count.fetch_add(1, Ordering::SeqCst) + 1;
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: lsp::Position::new(0, i),
|
||||
label: lsp::InlayHintLabel::String(i.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
});
|
||||
let i = lsp_request_count.fetch_add(1, Ordering::SeqCst) + 1;
|
||||
Ok(Some(vec![lsp::InlayHint {
|
||||
position: lsp::Position::new(0, i),
|
||||
label: lsp::InlayHintLabel::String(i.to_string()),
|
||||
kind: None,
|
||||
text_edits: None,
|
||||
tooltip: None,
|
||||
padding_left: None,
|
||||
padding_right: None,
|
||||
data: None,
|
||||
}]))
|
||||
}
|
||||
},
|
||||
);
|
||||
})
|
||||
.await;
|
||||
|
||||
|
|
@ -3326,7 +3337,7 @@ pub mod tests {
|
|||
..Default::default()
|
||||
},
|
||||
initializer: Some(Box::new(move |fake_server| {
|
||||
fake_server.handle_request::<lsp::request::InlayHintRequest, _, _>(
|
||||
fake_server.set_request_handler::<lsp::request::InlayHintRequest, _, _>(
|
||||
move |params, _| async move {
|
||||
assert_eq!(
|
||||
params.text_document.uri,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue