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

chore: Bump lsp-types to 0.97.0 (#12928)

Browse source 
This also includes https://github.com/gluon-lang/lsp-types/pull/287,
which should significantly reduce the time it takes for us to
deserialize completion lists.


Release Notes:
- N/A
This commit is contained in:
Piotr Osiewicz 2024-06-13 13:48:12 +02:00 • committed by GitHub
parent 21764c38dd
commit 7798f64d1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
22 changed files with 344 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Cargo.lock generated
View file

@ -4049,6 +4049,15 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e" checksum = "7bad48618fdb549078c333a7a8528acb57af271d0433bdecd523eb620628364e"
[[package]]
name = "fluent-uri"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d"
dependencies = [
"bitflags 1.3.2",
]
[[package]] [[package]]
name = "flume" name = "flume"
version = "0.11.0" version = "0.11.0"
@ -6080,6 +6089,7 @@ dependencies = [
"log", "log",
"lsp-types", "lsp-types",
"parking_lot", "parking_lot",
"pct-str",
"postage", "postage",
"release_channel", "release_channel",
"serde", "serde",
@ -6091,14 +6101,14 @@ dependencies = [
[[package]] [[package]]
name = "lsp-types" name = "lsp-types"
version = "0.95.1" version = "0.97.0"
source = "git+https://github.com/zed-industries/lsp-types?branch=apply-snippet-edit#853c7881d200777e20799026651ca36727144646" source = "git+https://github.com/zed-industries/lsp-types?branch=zed-main#258db672ceab9e66c6da3883d37c4dcf1094c6ac"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"fluent-uri",
"serde", "serde",
"serde_json", "serde_json",
"serde_repr", "serde_repr",
"url",
] ]
[[package]] [[package]]
@ -7324,6 +7334,16 @@ dependencies = [
"hmac 0.12.1", "hmac 0.12.1",
] ]
[[package]]
name = "pct-str"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf1bdcc492c285a50bed60860dfa00b50baf1f60c73c7d6b435b01a2a11fd6ff"
dependencies = [
"thiserror",
"utf8-decode",
]
[[package]] [[package]]
name = "peeking_take_while" name = "peeking_take_while"
version = "0.1.2" version = "0.1.2"
@ -11500,6 +11520,12 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
[[package]]
name = "utf8-decode"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca61eb27fa339aa08826a29f03e87b99b4d8f0fc2255306fd266bb1b6a9de498"
[[package]] [[package]]
name = "utf8parse" name = "utf8parse"
version = "0.2.1" version = "0.2.1"

28
crates/collab/src/tests/editor_tests.rs
View file

@ -344,7 +344,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
.handle_request::<lsp::request::Completion, _, _>(|params, _| async move { .handle_request::<lsp::request::Completion, _, _>(|params, _| async move {
assert_eq!( assert_eq!(
params.text_document_position.text_document.uri, params.text_document_position.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
assert_eq!( assert_eq!(
params.text_document_position.position, params.text_document_position.position,
@ -461,7 +461,7 @@ async fn test_collaborating_with_completion(cx_a: &mut TestAppContext, cx_b: &mu
.handle_request::<lsp::request::Completion, _, _>(|params, _| async move { .handle_request::<lsp::request::Completion, _, _>(|params, _| async move {
assert_eq!( assert_eq!(
params.text_document_position.text_document.uri, params.text_document_position.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
assert_eq!( assert_eq!(
params.text_document_position.position, params.text_document_position.position,
@ -585,7 +585,7 @@ async fn test_collaborating_with_code_actions(
.handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move { .handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
assert_eq!(params.range.start, lsp::Position::new(0, 0)); assert_eq!(params.range.start, lsp::Position::new(0, 0));
assert_eq!(params.range.end, lsp::Position::new(0, 0)); assert_eq!(params.range.end, lsp::Position::new(0, 0));
@ -607,7 +607,7 @@ async fn test_collaborating_with_code_actions(
.handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move { .handle_request::<lsp::request::CodeActionRequest, _, _>(|params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
assert_eq!(params.range.start, lsp::Position::new(1, 31)); assert_eq!(params.range.start, lsp::Position::new(1, 31));
assert_eq!(params.range.end, lsp::Position::new(1, 31)); assert_eq!(params.range.end, lsp::Position::new(1, 31));
@ -619,7 +619,7 @@ async fn test_collaborating_with_code_actions(
changes: Some( changes: Some(
[ [
( (
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
vec![lsp::TextEdit::new( vec![lsp::TextEdit::new(
lsp::Range::new( lsp::Range::new(
lsp::Position::new(1, 22), lsp::Position::new(1, 22),
@ -629,7 +629,7 @@ async fn test_collaborating_with_code_actions(
)], )],
), ),
( (
lsp::Url::from_file_path("/a/other.rs").unwrap(), lsp::Uri::from_file_path("/a/other.rs").unwrap().into(),
vec![lsp::TextEdit::new( vec![lsp::TextEdit::new(
lsp::Range::new( lsp::Range::new(
lsp::Position::new(0, 0), lsp::Position::new(0, 0),
@ -689,7 +689,7 @@ async fn test_collaborating_with_code_actions(
changes: Some( changes: Some(
[ [
( (
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
vec![lsp::TextEdit::new( vec![lsp::TextEdit::new(
lsp::Range::new( lsp::Range::new(
lsp::Position::new(1, 22), lsp::Position::new(1, 22),
@ -699,7 +699,7 @@ async fn test_collaborating_with_code_actions(
)], )],
), ),
( (
lsp::Url::from_file_path("/a/other.rs").unwrap(), lsp::Uri::from_file_path("/a/other.rs").unwrap().into(),
vec![lsp::TextEdit::new( vec![lsp::TextEdit::new(
lsp::Range::new( lsp::Range::new(
lsp::Position::new(0, 0), lsp::Position::new(0, 0),
@ -897,14 +897,14 @@ async fn test_collaborating_with_renames(cx_a: &mut TestAppContext, cx_b: &mut T
changes: Some( changes: Some(
[ [
( (
lsp::Url::from_file_path("/dir/one.rs").unwrap(), lsp::Uri::from_file_path("/dir/one.rs").unwrap().into(),
vec![lsp::TextEdit::new( vec![lsp::TextEdit::new(
lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)), lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
"THREE".to_string(), "THREE".to_string(),
)], )],
), ),
( (
lsp::Url::from_file_path("/dir/two.rs").unwrap(), lsp::Uri::from_file_path("/dir/two.rs").unwrap().into(),
vec![ vec![
lsp::TextEdit::new( lsp::TextEdit::new(
lsp::Range::new( lsp::Range::new(
@ -1313,7 +1313,7 @@ async fn test_on_input_format_from_host_to_guest(
|params, _| async move { |params, _| async move {
assert_eq!( assert_eq!(
params.text_document_position.text_document.uri, params.text_document_position.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
assert_eq!( assert_eq!(
params.text_document_position.position, params.text_document_position.position,
@ -1441,7 +1441,7 @@ async fn test_on_input_format_from_guest_to_host(
.handle_request::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move { .handle_request::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move {
assert_eq!( assert_eq!(
params.text_document_position.text_document.uri, params.text_document_position.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
assert_eq!( assert_eq!(
params.text_document_position.position, params.text_document_position.position,
@ -1610,7 +1610,7 @@ async fn test_mutual_editor_inlay_hint_cache_update(
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
let edits_made = task_edits_made.load(atomic::Ordering::Acquire); let edits_made = task_edits_made.load(atomic::Ordering::Acquire);
Ok(Some(vec![lsp::InlayHint { Ok(Some(vec![lsp::InlayHint {
@ -1873,7 +1873,7 @@ async fn test_inlay_hint_refresh_is_forwarded(
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
let other_hints = task_other_hints.load(atomic::Ordering::Acquire); let other_hints = task_other_hints.load(atomic::Ordering::Acquire);
let character = if other_hints { 0 } else { 2 }; let character = if other_hints { 0 } else { 2 };

36
crates/collab/src/tests/integration_tests.rs
View file

@ -3897,7 +3897,7 @@ async fn test_collaborating_with_diagnostics(
.await; .await;
fake_language_server.notify::<lsp::notification::PublishDiagnostics>( fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/a/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
severity: Some(lsp::DiagnosticSeverity::WARNING), severity: Some(lsp::DiagnosticSeverity::WARNING),
@ -3917,7 +3917,7 @@ async fn test_collaborating_with_diagnostics(
.unwrap(); .unwrap();
fake_language_server.notify::<lsp::notification::PublishDiagnostics>( fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/a/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
severity: Some(lsp::DiagnosticSeverity::ERROR), severity: Some(lsp::DiagnosticSeverity::ERROR),
@ -3991,7 +3991,7 @@ async fn test_collaborating_with_diagnostics(
// Simulate a language server reporting more errors for a file. // Simulate a language server reporting more errors for a file.
fake_language_server.notify::<lsp::notification::PublishDiagnostics>( fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/a/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![ diagnostics: vec![
lsp::Diagnostic { lsp::Diagnostic {
@ -4085,7 +4085,7 @@ async fn test_collaborating_with_diagnostics(
// Simulate a language server reporting no errors for a file. // Simulate a language server reporting no errors for a file.
fake_language_server.notify::<lsp::notification::PublishDiagnostics>( fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/a/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/a/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![], diagnostics: vec![],
}, },
@ -4189,7 +4189,9 @@ async fn test_collaborating_with_lsp_progress_updates_and_diagnostics_ordering(
for file_name in file_names { for file_name in file_names {
fake_language_server.notify::<lsp::notification::PublishDiagnostics>( fake_language_server.notify::<lsp::notification::PublishDiagnostics>(
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path(Path::new("/test").join(file_name)).unwrap(), uri: lsp::Uri::from_file_path(Path::new("/test").join(file_name))
.unwrap()
.into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
severity: Some(lsp::DiagnosticSeverity::WARNING), severity: Some(lsp::DiagnosticSeverity::WARNING),
@ -4607,7 +4609,7 @@ async fn test_definition(
fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move { fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
Ok(Some(lsp::GotoDefinitionResponse::Scalar( Ok(Some(lsp::GotoDefinitionResponse::Scalar(
lsp::Location::new( lsp::Location::new(
lsp::Url::from_file_path("/root/dir-2/b.rs").unwrap(), lsp::Uri::from_file_path("/root/dir-2/b.rs").unwrap().into(),
lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)), lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
), ),
))) )))
@ -4636,7 +4638,7 @@ async fn test_definition(
fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move { fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
Ok(Some(lsp::GotoDefinitionResponse::Scalar( Ok(Some(lsp::GotoDefinitionResponse::Scalar(
lsp::Location::new( lsp::Location::new(
lsp::Url::from_file_path("/root/dir-2/b.rs").unwrap(), lsp::Uri::from_file_path("/root/dir-2/b.rs").unwrap().into(),
lsp::Range::new(lsp::Position::new(1, 6), lsp::Position::new(1, 11)), lsp::Range::new(lsp::Position::new(1, 6), lsp::Position::new(1, 11)),
), ),
))) )))
@ -4672,7 +4674,7 @@ async fn test_definition(
); );
Ok(Some(lsp::GotoDefinitionResponse::Scalar( Ok(Some(lsp::GotoDefinitionResponse::Scalar(
lsp::Location::new( lsp::Location::new(
lsp::Url::from_file_path("/root/dir-2/c.rs").unwrap(), lsp::Uri::from_file_path("/root/dir-2/c.rs").unwrap().into(),
lsp::Range::new(lsp::Position::new(0, 5), lsp::Position::new(0, 7)), lsp::Range::new(lsp::Position::new(0, 5), lsp::Position::new(0, 7)),
), ),
))) )))
@ -4784,15 +4786,21 @@ async fn test_references(
lsp_response_tx lsp_response_tx
.unbounded_send(Ok(Some(vec![ .unbounded_send(Ok(Some(vec![
lsp::Location { lsp::Location {
uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(), uri: lsp::Uri::from_file_path("/root/dir-1/two.rs")
.unwrap()
.into(),
range: lsp::Range::new(lsp::Position::new(0, 24), lsp::Position::new(0, 27)), range: lsp::Range::new(lsp::Position::new(0, 24), lsp::Position::new(0, 27)),
}, },
lsp::Location { lsp::Location {
uri: lsp::Url::from_file_path("/root/dir-1/two.rs").unwrap(), uri: lsp::Uri::from_file_path("/root/dir-1/two.rs")
.unwrap()
.into(),
range: lsp::Range::new(lsp::Position::new(0, 35), lsp::Position::new(0, 38)), range: lsp::Range::new(lsp::Position::new(0, 35), lsp::Position::new(0, 38)),
}, },
lsp::Location { lsp::Location {
uri: lsp::Url::from_file_path("/root/dir-2/three.rs").unwrap(), uri: lsp::Uri::from_file_path("/root/dir-2/three.rs")
.unwrap()
.into(),
range: lsp::Range::new(lsp::Position::new(0, 37), lsp::Position::new(0, 40)), range: lsp::Range::new(lsp::Position::new(0, 37), lsp::Position::new(0, 40)),
}, },
]))) ])))
@ -5292,7 +5300,9 @@ async fn test_project_symbols(
lsp::SymbolInformation { lsp::SymbolInformation {
name: "TWO".into(), name: "TWO".into(),
location: lsp::Location { location: lsp::Location {
uri: lsp::Url::from_file_path("/code/crate-2/two.rs").unwrap(), uri: lsp::Uri::from_file_path("/code/crate-2/two.rs")
.unwrap()
.into(),
range: lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)), range: lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
}, },
kind: lsp::SymbolKind::CONSTANT, kind: lsp::SymbolKind::CONSTANT,
@ -5382,7 +5392,7 @@ async fn test_open_buffer_while_getting_definition_pointing_to_it(
fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move { fake_language_server.handle_request::<lsp::request::GotoDefinition, _, _>(|_, _| async move {
Ok(Some(lsp::GotoDefinitionResponse::Scalar( Ok(Some(lsp::GotoDefinitionResponse::Scalar(
lsp::Location::new( lsp::Location::new(
lsp::Url::from_file_path("/root/b.rs").unwrap(), lsp::Uri::from_file_path("/root/b.rs").unwrap().into(),
lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)), lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
), ),
))) )))

2
crates/collab/src/tests/random_project_collaboration_tests.rs
View file

@ -1099,7 +1099,7 @@ impl RandomizedTest for ProjectCollaborationTest {
files files
.into_iter() .into_iter()
.map(|file| lsp::Location { .map(|file| lsp::Location {
uri: lsp::Url::from_file_path(file).unwrap(), uri: lsp::Uri::from_file_path(file).unwrap().into(),
range: Default::default(), range: Default::default(),
}) })
.collect(), .collect(),

24
crates/copilot/src/copilot.rs
View file

@ -188,7 +188,7 @@ impl Status {
} }
struct RegisteredBuffer { struct RegisteredBuffer {
uri: lsp::Url, uri: lsp::RawUri,
language_id: String, language_id: String,
snapshot: BufferSnapshot, snapshot: BufferSnapshot,
snapshot_version: i32, snapshot_version: i32,
@ -644,7 +644,7 @@ impl Copilot {
registered_buffers registered_buffers
.entry(buffer.entity_id()) .entry(buffer.entity_id())
.or_insert_with(|| { .or_insert_with(|| {
let uri: lsp::Url = uri_for_buffer(buffer, cx); let uri = uri_for_buffer(buffer, cx);
let language_id = id_for_language(buffer.read(cx).language()); let language_id = id_for_language(buffer.read(cx).language());
let snapshot = buffer.read(cx).snapshot(); let snapshot = buffer.read(cx).snapshot();
server server
@ -959,9 +959,9 @@ fn id_for_language(language: Option<&Arc<Language>>) -> String {
.unwrap_or_else(|| "plaintext".to_string()) .unwrap_or_else(|| "plaintext".to_string())
} }
fn uri_for_buffer(buffer: &Model<Buffer>, cx: &AppContext) -> lsp::Url { fn uri_for_buffer(buffer: &Model<Buffer>, cx: &AppContext) -> lsp::RawUri {
if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) { if let Some(file) = buffer.read(cx).file().and_then(|file| file.as_local()) {
lsp::Url::from_file_path(file.abs_path(cx)).unwrap() lsp::Uri::from_file_path(file.abs_path(cx)).unwrap().into()
} else { } else {
format!("buffer://{}", buffer.entity_id()).parse().unwrap() format!("buffer://{}", buffer.entity_id()).parse().unwrap()
} }
@ -1042,6 +1042,8 @@ async fn get_copilot_lsp(http: Arc<dyn HttpClient>) -> anyhow::Result<PathBuf> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::str::FromStr;
use super::*; use super::*;
use gpui::TestAppContext; use gpui::TestAppContext;
@ -1050,9 +1052,8 @@ mod tests {
let (copilot, mut lsp) = Copilot::fake(cx); let (copilot, mut lsp) = Copilot::fake(cx);
let buffer_1 = cx.new_model(|cx| Buffer::local("Hello", cx)); let buffer_1 = cx.new_model(|cx| Buffer::local("Hello", cx));
let buffer_1_uri: lsp::Url = format!("buffer://{}", buffer_1.entity_id().as_u64()) let buffer_1_uri =
.parse() lsp::RawUri::from_str(&format!("buffer://{}", buffer_1.entity_id().as_u64())).unwrap();
.unwrap();
copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_1, cx)); copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_1, cx));
assert_eq!( assert_eq!(
lsp.receive_notification::<lsp::notification::DidOpenTextDocument>() lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
@ -1068,9 +1069,8 @@ mod tests {
); );
let buffer_2 = cx.new_model(|cx| Buffer::local("Goodbye", cx)); let buffer_2 = cx.new_model(|cx| Buffer::local("Goodbye", cx));
let buffer_2_uri: lsp::Url = format!("buffer://{}", buffer_2.entity_id().as_u64()) let buffer_2_uri =
.parse() lsp::RawUri::from_str(&format!("buffer://{}", buffer_2.entity_id().as_u64())).unwrap();
.unwrap();
copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_2, cx)); copilot.update(cx, |copilot, cx| copilot.register_buffer(&buffer_2, cx));
assert_eq!( assert_eq!(
lsp.receive_notification::<lsp::notification::DidOpenTextDocument>() lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
@ -1119,7 +1119,9 @@ mod tests {
text_document: lsp::TextDocumentIdentifier::new(buffer_1_uri), text_document: lsp::TextDocumentIdentifier::new(buffer_1_uri),
} }
); );
let buffer_1_uri = lsp::Url::from_file_path("/root/child/buffer-1").unwrap(); let buffer_1_uri: lsp::RawUri = lsp::Uri::from_file_path("/root/child/buffer-1")
.unwrap()
.into();
assert_eq!( assert_eq!(
lsp.receive_notification::<lsp::notification::DidOpenTextDocument>() lsp.receive_notification::<lsp::notification::DidOpenTextDocument>()
.await, .await,

5
crates/copilot/src/copilot_completion_provider.rs
View file

@ -1121,7 +1121,10 @@ mod tests {
cx.handle_request::<lsp::request::Completion, _, _>(move |url, params, _| { cx.handle_request::<lsp::request::Completion, _, _>(move |url, params, _| {
let completions = completions.clone(); let completions = completions.clone();
async move { async move {
assert_eq!(params.text_document_position.text_document.uri, url.clone()); assert_eq!(
params.text_document_position.text_document.uri,
url.clone().into()
);
assert_eq!( assert_eq!(
params.text_document_position.position, params.text_document_position.position,
complete_from_position complete_from_position

2
crates/copilot/src/request.rs
View file

@ -102,7 +102,7 @@ pub struct GetCompletionsDocument {
pub tab_size: u32, pub tab_size: u32,
pub indent_size: u32, pub indent_size: u32,
pub insert_spaces: bool, pub insert_spaces: bool,
pub uri: lsp::Url, pub uri: lsp::RawUri,
pub relative_path: String, pub relative_path: String,
pub position: lsp::Position, pub position: lsp::Position,
pub version: usize, pub version: usize,

2
crates/editor/src/editor.rs
View file

@ -8920,7 +8920,7 @@ impl Editor {
}); });
language_server_name.map(|language_server_name| { language_server_name.map(|language_server_name| {
project.open_local_buffer_via_lsp( project.open_local_buffer_via_lsp(
lsp_location.uri.clone(), lsp::Uri::from(lsp_location.uri.clone()),
server_id, server_id,
language_server_name, language_server_name,
cx, cx,

27
crates/editor/src/editor_tests.rs
View file

@ -5823,7 +5823,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
assert_eq!(params.options.tab_size, 4); assert_eq!(params.options.tab_size, 4);
Ok(Some(vec![lsp::TextEdit::new( Ok(Some(vec![lsp::TextEdit::new(
@ -5849,7 +5849,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
fake_server.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { fake_server.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
futures::future::pending::<()>().await; futures::future::pending::<()>().await;
unreachable!() unreachable!()
@ -5898,7 +5898,7 @@ async fn test_document_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
assert_eq!(params.options.tab_size, 8); assert_eq!(params.options.tab_size, 8);
Ok(Some(vec![])) Ok(Some(vec![]))
@ -6101,7 +6101,7 @@ async fn test_multibuffer_format_during_save(cx: &mut gpui::TestAppContext) {
.on_request::<lsp::request::Formatting, _, _>(move |params, _| async move { .on_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
Ok(Some(vec![lsp::TextEdit::new( Ok(Some(vec![lsp::TextEdit::new(
lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)), lsp::Range::new(lsp::Position::new(0, 3), lsp::Position::new(1, 0)),
format!("[{} formatted]", params.text_document.uri), format!("[{} formatted]", params.text_document.uri.as_str()),
)])) )]))
}) })
.detach(); .detach();
@ -6175,7 +6175,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
assert_eq!(params.options.tab_size, 4); assert_eq!(params.options.tab_size, 4);
Ok(Some(vec![lsp::TextEdit::new( Ok(Some(vec![lsp::TextEdit::new(
@ -6201,7 +6201,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
move |params, _| async move { move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
futures::future::pending::<()>().await; futures::future::pending::<()>().await;
unreachable!() unreachable!()
@ -6251,7 +6251,7 @@ async fn test_range_format_during_save(cx: &mut gpui::TestAppContext) {
.handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::RangeFormatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
assert_eq!(params.options.tab_size, 8); assert_eq!(params.options.tab_size, 8);
Ok(Some(vec![])) Ok(Some(vec![]))
@ -6325,7 +6325,7 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { .handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
assert_eq!(params.options.tab_size, 4); assert_eq!(params.options.tab_size, 4);
Ok(Some(vec![lsp::TextEdit::new( Ok(Some(vec![lsp::TextEdit::new(
@ -6347,7 +6347,7 @@ async fn test_document_format_manual_trigger(cx: &mut gpui::TestAppContext) {
fake_server.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move { fake_server.handle_request::<lsp::request::Formatting, _, _>(move |params, _| async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/file.rs").unwrap() lsp::Uri::from_file_path("/file.rs").unwrap().into()
); );
futures::future::pending::<()>().await; futures::future::pending::<()>().await;
unreachable!() unreachable!()
@ -7990,7 +7990,7 @@ async fn go_to_prev_overlapping_diagnostic(
.update_diagnostics( .update_diagnostics(
LanguageServerId(0), LanguageServerId(0),
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/root/file").unwrap(), uri: lsp::Uri::from_file_path("/root/file").unwrap().into(),
version: None, version: None,
diagnostics: vec![ diagnostics: vec![
lsp::Diagnostic { lsp::Diagnostic {
@ -8362,7 +8362,7 @@ async fn test_on_type_formatting_not_triggered(cx: &mut gpui::TestAppContext) {
fake_server.handle_request::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move { fake_server.handle_request::<lsp::request::OnTypeFormatting, _, _>(|params, _| async move {
assert_eq!( assert_eq!(
params.text_document_position.text_document.uri, params.text_document_position.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
assert_eq!( assert_eq!(
params.text_document_position.position, params.text_document_position.position,
@ -12113,7 +12113,10 @@ pub fn handle_completion_request(
let completions = completions.clone(); let completions = completions.clone();
counter.fetch_add(1, atomic::Ordering::Release); counter.fetch_add(1, atomic::Ordering::Release);
async move { async move {
assert_eq!(params.text_document_position.text_document.uri, url.clone()); assert_eq!(
params.text_document_position.text_document.uri,
url.clone().into()
);
assert_eq!( assert_eq!(
params.text_document_position.position, params.text_document_position.position,
complete_from_position complete_from_position

14
crates/editor/src/hover_links.rs
View file

@ -741,7 +741,7 @@ mod tests {
Ok(Some(lsp::GotoTypeDefinitionResponse::Link(vec![ Ok(Some(lsp::GotoTypeDefinitionResponse::Link(vec![
lsp::LocationLink { lsp::LocationLink {
origin_selection_range: Some(symbol_range), origin_selection_range: Some(symbol_range),
target_uri: url.clone(), target_uri: url.clone().into(),
target_range, target_range,
target_selection_range: target_range, target_selection_range: target_range,
}, },
@ -813,7 +813,7 @@ mod tests {
Ok(Some(lsp::GotoDefinitionResponse::Link(vec![ Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
lsp::LocationLink { lsp::LocationLink {
origin_selection_range: Some(symbol_range), origin_selection_range: Some(symbol_range),
target_uri: url.clone(), target_uri: url.clone().into(),
target_range, target_range,
target_selection_range: target_range, target_selection_range: target_range,
}, },
@ -839,7 +839,7 @@ mod tests {
Ok(Some(lsp::GotoDefinitionResponse::Link(vec![ Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
lsp::LocationLink { lsp::LocationLink {
origin_selection_range: Some(symbol_range), origin_selection_range: Some(symbol_range),
target_uri: url.clone(), target_uri: url.clone().into(),
target_range, target_range,
target_selection_range: target_range, target_selection_range: target_range,
}, },
@ -902,7 +902,7 @@ mod tests {
Ok(Some(lsp::GotoDefinitionResponse::Link(vec![ Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
lsp::LocationLink { lsp::LocationLink {
origin_selection_range: Some(symbol_range), origin_selection_range: Some(symbol_range),
target_uri: url, target_uri: url.into(),
target_range, target_range,
target_selection_range: target_range, target_selection_range: target_range,
}, },
@ -978,7 +978,7 @@ mod tests {
Ok(Some(lsp::GotoDefinitionResponse::Link(vec![ Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
lsp::LocationLink { lsp::LocationLink {
origin_selection_range: None, origin_selection_range: None,
target_uri: url, target_uri: url.into(),
target_range, target_range,
target_selection_range: target_range, target_selection_range: target_range,
}, },
@ -1006,7 +1006,7 @@ mod tests {
Ok(Some(lsp::GotoDefinitionResponse::Link(vec![ Ok(Some(lsp::GotoDefinitionResponse::Link(vec![
lsp::LocationLink { lsp::LocationLink {
origin_selection_range: None, origin_selection_range: None,
target_uri: url, target_uri: url.into(),
target_range, target_range,
target_selection_range: target_range, target_selection_range: target_range,
}, },
@ -1086,7 +1086,7 @@ mod tests {
let hint_label = ": TestStruct"; let hint_label = ": TestStruct";
cx.lsp cx.lsp
.handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| { .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
let expected_uri = expected_uri.clone(); let expected_uri = expected_uri.clone().into();
async move { async move {
assert_eq!(params.text_document.uri, expected_uri); assert_eq!(params.text_document.uri, expected_uri);
Ok(Some(vec![lsp::InlayHint { Ok(Some(vec![lsp::InlayHint {

6
crates/editor/src/hover_popover.rs
View file

@ -1376,7 +1376,7 @@ mod tests {
let closure_uri = uri.clone(); let closure_uri = uri.clone();
cx.lsp cx.lsp
.handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| { .handle_request::<lsp::request::InlayHintRequest, _, _>(move |params, _| {
let task_uri = closure_uri.clone(); let task_uri = closure_uri.clone().into();
async move { async move {
assert_eq!(params.text_document.uri, task_uri); assert_eq!(params.text_document.uri, task_uri);
Ok(Some(vec![lsp::InlayHint { Ok(Some(vec![lsp::InlayHint {
@ -1467,7 +1467,7 @@ mod tests {
lsp::InlayHintLabelPart { lsp::InlayHintLabelPart {
value: new_type_label.to_string(), value: new_type_label.to_string(),
location: Some(lsp::Location { location: Some(lsp::Location {
uri: task_uri.clone(), uri: task_uri.clone().into(),
range: new_type_target_range, range: new_type_target_range,
}), }),
tooltip: Some(lsp::InlayHintLabelPartTooltip::String(format!( tooltip: Some(lsp::InlayHintLabelPartTooltip::String(format!(
@ -1482,7 +1482,7 @@ mod tests {
lsp::InlayHintLabelPart { lsp::InlayHintLabelPart {
value: struct_label.to_string(), value: struct_label.to_string(),
location: Some(lsp::Location { location: Some(lsp::Location {
uri: task_uri, uri: task_uri.into(),
range: struct_target_range, range: struct_target_range,
}), }),
tooltip: Some(lsp::InlayHintLabelPartTooltip::MarkupContent( tooltip: Some(lsp::InlayHintLabelPartTooltip::MarkupContent(

26
crates/editor/src/inlay_hint_cache.rs
View file

@ -1307,7 +1307,7 @@ pub mod tests {
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path(file_with_hints).unwrap(), lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
); );
let current_call_id = let current_call_id =
Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
@ -1439,7 +1439,7 @@ pub mod tests {
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path(file_with_hints).unwrap(), lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
); );
let current_call_id = let current_call_id =
Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
@ -1613,7 +1613,7 @@ pub mod tests {
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
Ok(Some(vec![lsp::InlayHint { Ok(Some(vec![lsp::InlayHint {
@ -1666,7 +1666,7 @@ pub mod tests {
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/other.md").unwrap(), lsp::Uri::from_file_path("/a/other.md").unwrap().into(),
); );
let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
Ok(Some(vec![lsp::InlayHint { Ok(Some(vec![lsp::InlayHint {
@ -1790,7 +1790,7 @@ pub mod tests {
Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst); Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst);
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path(file_with_hints).unwrap(), lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
); );
Ok(Some(vec![ Ok(Some(vec![
lsp::InlayHint { lsp::InlayHint {
@ -2136,7 +2136,7 @@ pub mod tests {
let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1; let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path(file_with_hints).unwrap(), lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
); );
Ok(Some(vec![lsp::InlayHint { Ok(Some(vec![lsp::InlayHint {
position: lsp::Position::new(0, i), position: lsp::Position::new(0, i),
@ -2305,7 +2305,7 @@ pub mod tests {
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
task_lsp_request_ranges.lock().push(params.range); task_lsp_request_ranges.lock().push(params.range);
@ -2673,11 +2673,11 @@ pub mod tests {
let task_editor_edited = Arc::clone(&closure_editor_edited); let task_editor_edited = Arc::clone(&closure_editor_edited);
async move { async move {
let hint_text = if params.text_document.uri let hint_text = if params.text_document.uri
== lsp::Url::from_file_path("/a/main.rs").unwrap() == lsp::Uri::from_file_path("/a/main.rs").unwrap().into()
{ {
"main hint" "main hint"
} else if params.text_document.uri } else if params.text_document.uri
== lsp::Url::from_file_path("/a/other.rs").unwrap() == lsp::Uri::from_file_path("/a/other.rs").unwrap().into()
{ {
"other hint" "other hint"
} else { } else {
@ -2981,11 +2981,11 @@ pub mod tests {
let task_editor_edited = Arc::clone(&closure_editor_edited); let task_editor_edited = Arc::clone(&closure_editor_edited);
async move { async move {
let hint_text = if params.text_document.uri let hint_text = if params.text_document.uri
== lsp::Url::from_file_path("/a/main.rs").unwrap() == lsp::Uri::from_file_path("/a/main.rs").unwrap().into()
{ {
"main hint" "main hint"
} else if params.text_document.uri } else if params.text_document.uri
== lsp::Url::from_file_path("/a/other.rs").unwrap() == lsp::Uri::from_file_path("/a/other.rs").unwrap().into()
{ {
"other hint" "other hint"
} else { } else {
@ -3177,7 +3177,7 @@ pub mod tests {
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path("/a/main.rs").unwrap(), lsp::Uri::from_file_path("/a/main.rs").unwrap().into(),
); );
let query_start = params.range.start; let query_start = params.range.start;
let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::Release) + 1; let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::Release) + 1;
@ -3244,7 +3244,7 @@ pub mod tests {
async move { async move {
assert_eq!( assert_eq!(
params.text_document.uri, params.text_document.uri,
lsp::Url::from_file_path(file_with_hints).unwrap(), lsp::Uri::from_file_path(file_with_hints).unwrap().into(),
); );
let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1; let i = Arc::clone(&task_lsp_request_count).fetch_add(1, Ordering::SeqCst) + 1;

6
crates/editor/src/test/editor_lsp_test_context.rs
View file

@ -27,7 +27,7 @@ pub struct EditorLspTestContext {
pub cx: EditorTestContext, pub cx: EditorTestContext,
pub lsp: lsp::FakeLanguageServer, pub lsp: lsp::FakeLanguageServer,
pub workspace: View<Workspace>, pub workspace: View<Workspace>,
pub buffer_lsp_url: lsp::Url, pub buffer_lsp_url: lsp::Uri,
} }
impl EditorLspTestContext { impl EditorLspTestContext {
@ -113,7 +113,7 @@ impl EditorLspTestContext {
}, },
lsp, lsp,
workspace, workspace,
buffer_lsp_url: lsp::Url::from_file_path(format!("/root/dir/{file_name}")).unwrap(), buffer_lsp_url: lsp::Uri::from_file_path(format!("/root/dir/{file_name}")).unwrap(),
} }
} }
@ -299,7 +299,7 @@ impl EditorLspTestContext {
where where
T: 'static + request::Request, T: 'static + request::Request,
T::Params: 'static + Send, T::Params: 'static + Send,
F: 'static + Send + FnMut(lsp::Url, T::Params, gpui::AsyncAppContext) -> Fut, F: 'static + Send + FnMut(lsp::Uri, T::Params, gpui::AsyncAppContext) -> Fut,
Fut: 'static + Send + Future<Output = Result<T::Result>>, Fut: 'static + Send + Future<Output = Result<T::Result>>,
{ {
let url = self.buffer_lsp_url.clone(); let url = self.buffer_lsp_url.clone();

2
crates/languages/src/rust.rs
View file

@ -533,7 +533,7 @@ mod tests {
#[gpui::test] #[gpui::test]
async fn test_process_rust_diagnostics() { async fn test_process_rust_diagnostics() {
let mut params = lsp::PublishDiagnosticsParams { let mut params = lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/a").unwrap(), uri: lsp::Uri::from_file_path("/a").unwrap().into(),
version: None, version: None,
diagnostics: vec![ diagnostics: vec![
// no newlines // no newlines

3
crates/lsp/Cargo.toml
View file

@ -22,8 +22,9 @@ collections.workspace = true
futures.workspace = true futures.workspace = true
gpui.workspace = true gpui.workspace = true
log.workspace = true log.workspace = true
lsp-types = { git = "https://github.com/zed-industries/lsp-types", branch = "apply-snippet-edit" } lsp-types = { git = "https://github.com/zed-industries/lsp-types", branch = "zed-main" }
parking_lot.workspace = true parking_lot.workspace = true
pct-str = "2.0"
postage.workspace = true postage.workspace = true
serde.workspace = true serde.workspace = true
serde_json.workspace = true serde_json.workspace = true

73
crates/lsp/src/lsp.rs
View file

@ -3,7 +3,9 @@ mod input_handler;
pub use lsp_types::request::*; pub use lsp_types::request::*;
pub use lsp_types::*; pub use lsp_types::*;
use anyhow::{anyhow, Context, Result}; pub use lsp_types::Uri as RawUri;
use anyhow::{anyhow, bail, Context, Result};
use collections::HashMap; use collections::HashMap;
use futures::{channel::oneshot, io::BufWriter, select, AsyncRead, AsyncWrite, Future, FutureExt}; use futures::{channel::oneshot, io::BufWriter, select, AsyncRead, AsyncWrite, Future, FutureExt};
use gpui::{AppContext, AsyncAppContext, BackgroundExecutor, Task}; use gpui::{AppContext, AsyncAppContext, BackgroundExecutor, Task};
@ -21,11 +23,13 @@ use smol::{
use smol::process::windows::CommandExt; use smol::process::windows::CommandExt;
use std::{ use std::{
borrow::Cow,
ffi::OsString, ffi::OsString,
fmt, fmt,
io::Write, io::Write,
path::PathBuf, path::PathBuf,
pin::Pin, pin::Pin,
str::FromStr,
sync::{ sync::{
atomic::{AtomicI32, Ordering::SeqCst}, atomic::{AtomicI32, Ordering::SeqCst},
Arc, Weak, Arc, Weak,
@ -54,6 +58,61 @@ pub enum IoKind {
StdErr, StdErr,
} }
#[derive(Clone, Debug, Hash, PartialEq)]
pub struct Uri(lsp_types::Uri);
const FILE_SCHEME: &str = "file://";
impl Uri {
pub fn from_file_path<P: AsRef<Path>>(path: P) -> Result<Self> {
let mut uri = FILE_SCHEME.to_owned();
for part in path.as_ref().components() {
let part: Cow<_> = match part {
std::path::Component::Prefix(prefix) => prefix.as_os_str().to_string_lossy(),
std::path::Component::RootDir => "/".into(),
std::path::Component::CurDir => ".".into(),
std::path::Component::ParentDir => "..".into(),
std::path::Component::Normal(component) => {
let as_str = component.to_string_lossy();
pct_str::PctString::encode(as_str.chars(), pct_str::URIReserved)
.to_string()
.into()
}
};
if !uri.ends_with('/') {
uri.push('/');
}
uri.push_str(&part);
}
Ok(lsp_types::Uri::from_str(&uri)?.into())
}
pub fn to_file_path(self) -> Result<PathBuf> {
if self
.0
.scheme()
.map_or(true, |scheme| !scheme.eq_lowercase("file"))
{
bail!("file path does not have a file scheme");
}
Ok(self.0.path().as_str().into())
}
}
impl PartialEq<lsp_types::Uri> for Uri {
fn eq(&self, other: &lsp_types::Uri) -> bool {
self.0.eq(other)
}
}
impl From<lsp_types::Uri> for Uri {
fn from(uri: lsp_types::Uri) -> Self {
Self(uri)
}
}
impl From<Uri> for lsp_types::Uri {
fn from(uri: Uri) -> Self {
uri.0
}
}
/// Represents a launchable language server. This can either be a standalone binary or the path /// Represents a launchable language server. This can either be a standalone binary or the path
/// to a runtime with arguments to instruct it to launch the actual language server file. /// to a runtime with arguments to instruct it to launch the actual language server file.
#[derive(Debug, Clone, Deserialize)] #[derive(Debug, Clone, Deserialize)]
@ -523,12 +582,12 @@ impl LanguageServer {
options: Option<Value>, options: Option<Value>,
cx: &AppContext, cx: &AppContext,
) -> Task<Result<Arc<Self>>> { ) -> Task<Result<Arc<Self>>> {
let root_uri = Url::from_file_path(&self.working_dir).unwrap(); let root_uri = Uri::from_file_path(&self.working_dir).unwrap();
#[allow(deprecated)] #[allow(deprecated)]
let params = InitializeParams { let params = InitializeParams {
process_id: None, process_id: None,
root_path: None, root_path: None,
root_uri: Some(root_uri.clone()), root_uri: Some(root_uri.clone().into()),
initialization_options: options, initialization_options: options,
capabilities: ClientCapabilities { capabilities: ClientCapabilities {
workspace: Some(WorkspaceClientCapabilities { workspace: Some(WorkspaceClientCapabilities {
@ -657,10 +716,11 @@ impl LanguageServer {
..Default::default() ..Default::default()
}), }),
general: None, general: None,
notebook_document: None,
}, },
trace: None, trace: None,
workspace_folders: Some(vec![WorkspaceFolder { workspace_folders: Some(vec![WorkspaceFolder {
uri: root_uri, uri: root_uri.into(),
name: Default::default(), name: Default::default(),
}]), }]),
client_info: release_channel::ReleaseChannel::try_global(cx).map(|release_channel| { client_info: release_channel::ReleaseChannel::try_global(cx).map(|release_channel| {
@ -1318,7 +1378,6 @@ impl FakeLanguageServer {
mod tests { mod tests {
use super::*; use super::*;
use gpui::{SemanticVersion, TestAppContext}; use gpui::{SemanticVersion, TestAppContext};
use std::str::FromStr;
#[ctor::ctor] #[ctor::ctor]
fn init_logger() { fn init_logger() {
@ -1361,7 +1420,7 @@ mod tests {
server server
.notify::<notification::DidOpenTextDocument>(DidOpenTextDocumentParams { .notify::<notification::DidOpenTextDocument>(DidOpenTextDocumentParams {
text_document: TextDocumentItem::new( text_document: TextDocumentItem::new(
Url::from_str("file://a/b").unwrap(), RawUri::from_str("file://a/b").unwrap(),
"rust".to_string(), "rust".to_string(),
0, 0,
"".to_string(), "".to_string(),
@ -1382,7 +1441,7 @@ mod tests {
message: "ok".to_string(), message: "ok".to_string(),
}); });
fake.notify::<notification::PublishDiagnostics>(PublishDiagnosticsParams { fake.notify::<notification::PublishDiagnostics>(PublishDiagnosticsParams {
uri: Url::from_str("file://b/c").unwrap(), uri: RawUri::from_str("file://b/c").unwrap(),
version: Some(5), version: Some(5),
diagnostics: vec![], diagnostics: vec![],
}); });

35
crates/project/src/lsp_command.rs
View file

@ -185,7 +185,7 @@ impl LspCommand for PrepareRename {
) -> lsp::TextDocumentPositionParams { ) -> lsp::TextDocumentPositionParams {
lsp::TextDocumentPositionParams { lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
} }
@ -309,7 +309,7 @@ impl LspCommand for PerformRename {
lsp::RenameParams { lsp::RenameParams {
text_document_position: lsp::TextDocumentPositionParams { text_document_position: lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
}, },
@ -428,7 +428,7 @@ impl LspCommand for GetDefinition {
lsp::GotoDefinitionParams { lsp::GotoDefinitionParams {
text_document_position_params: lsp::TextDocumentPositionParams { text_document_position_params: lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
}, },
@ -521,7 +521,7 @@ impl LspCommand for GetImplementation {
lsp::GotoImplementationParams { lsp::GotoImplementationParams {
text_document_position_params: lsp::TextDocumentPositionParams { text_document_position_params: lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
}, },
@ -622,7 +622,7 @@ impl LspCommand for GetTypeDefinition {
lsp::GotoTypeDefinitionParams { lsp::GotoTypeDefinitionParams {
text_document_position_params: lsp::TextDocumentPositionParams { text_document_position_params: lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
}, },
@ -818,7 +818,7 @@ async fn location_links_from_lsp(
let target_buffer_handle = project let target_buffer_handle = project
.update(&mut cx, |this, cx| { .update(&mut cx, |this, cx| {
this.open_local_buffer_via_lsp( this.open_local_buffer_via_lsp(
target_uri, target_uri.into(),
language_server.server_id(), language_server.server_id(),
lsp_adapter.name.clone(), lsp_adapter.name.clone(),
cx, cx,
@ -925,7 +925,7 @@ impl LspCommand for GetReferences {
lsp::ReferenceParams { lsp::ReferenceParams {
text_document_position: lsp::TextDocumentPositionParams { text_document_position: lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
}, },
@ -954,7 +954,7 @@ impl LspCommand for GetReferences {
let target_buffer_handle = project let target_buffer_handle = project
.update(&mut cx, |this, cx| { .update(&mut cx, |this, cx| {
this.open_local_buffer_via_lsp( this.open_local_buffer_via_lsp(
lsp_location.uri, lsp_location.uri.into(),
language_server.server_id(), language_server.server_id(),
lsp_adapter.name.clone(), lsp_adapter.name.clone(),
cx, cx,
@ -1092,7 +1092,7 @@ impl LspCommand for GetDocumentHighlights {
lsp::DocumentHighlightParams { lsp::DocumentHighlightParams {
text_document_position_params: lsp::TextDocumentPositionParams { text_document_position_params: lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
}, },
@ -1239,7 +1239,7 @@ impl LspCommand for GetHover {
lsp::HoverParams { lsp::HoverParams {
text_document_position_params: lsp::TextDocumentPositionParams { text_document_position_params: lsp::TextDocumentPositionParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
}, },
@ -1461,7 +1461,7 @@ impl LspCommand for GetCompletions {
) -> lsp::CompletionParams { ) -> lsp::CompletionParams {
lsp::CompletionParams { lsp::CompletionParams {
text_document_position: lsp::TextDocumentPositionParams::new( text_document_position: lsp::TextDocumentPositionParams::new(
lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path(path).unwrap()), lsp::TextDocumentIdentifier::new(lsp::Uri::from_file_path(path).unwrap().into()),
point_to_lsp(self.position), point_to_lsp(self.position),
), ),
context: Default::default(), context: Default::default(),
@ -1760,7 +1760,7 @@ impl LspCommand for GetCodeActions {
lsp::CodeActionParams { lsp::CodeActionParams {
text_document: lsp::TextDocumentIdentifier::new( text_document: lsp::TextDocumentIdentifier::new(
lsp::Url::from_file_path(path).unwrap(), lsp::Uri::from_file_path(path).unwrap().into(),
), ),
range: range_to_lsp(self.range.to_point_utf16(buffer)), range: range_to_lsp(self.range.to_point_utf16(buffer)),
work_done_progress_params: Default::default(), work_done_progress_params: Default::default(),
@ -1932,7 +1932,7 @@ impl LspCommand for OnTypeFormatting {
) -> lsp::DocumentOnTypeFormattingParams { ) -> lsp::DocumentOnTypeFormattingParams {
lsp::DocumentOnTypeFormattingParams { lsp::DocumentOnTypeFormattingParams {
text_document_position: lsp::TextDocumentPositionParams::new( text_document_position: lsp::TextDocumentPositionParams::new(
lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path(path).unwrap()), lsp::TextDocumentIdentifier::new(lsp::Uri::from_file_path(path).unwrap().into()),
point_to_lsp(self.position), point_to_lsp(self.position),
), ),
ch: self.trigger.clone(), ch: self.trigger.clone(),
@ -2274,8 +2274,9 @@ impl InlayHints {
Some(((uri, range), server_id)) => Some(( Some(((uri, range), server_id)) => Some((
LanguageServerId(server_id as usize), LanguageServerId(server_id as usize),
lsp::Location { lsp::Location {
uri: lsp::Url::parse(&uri) uri: lsp::Uri::from_file_path(&uri)
.context("invalid uri in hint part {part:?}")?, .context("invalid uri in hint part {part:?}")?
.into(),
range: lsp::Range::new( range: lsp::Range::new(
point_to_lsp(PointUtf16::new( point_to_lsp(PointUtf16::new(
range.start.row, range.start.row,
@ -2435,7 +2436,7 @@ impl LspCommand for InlayHints {
) -> lsp::InlayHintParams { ) -> lsp::InlayHintParams {
lsp::InlayHintParams { lsp::InlayHintParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
range: range_to_lsp(self.range.to_point_utf16(buffer)), range: range_to_lsp(self.range.to_point_utf16(buffer)),
work_done_progress_params: Default::default(), work_done_progress_params: Default::default(),
@ -2591,7 +2592,7 @@ impl LspCommand for LinkedEditingRange {
let position = self.position.to_point_utf16(&buffer.snapshot()); let position = self.position.to_point_utf16(&buffer.snapshot());
lsp::LinkedEditingRangeParams { lsp::LinkedEditingRangeParams {
text_document_position_params: lsp::TextDocumentPositionParams::new( text_document_position_params: lsp::TextDocumentPositionParams::new(
lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path(path).unwrap()), lsp::TextDocumentIdentifier::new(lsp::Uri::from_file_path(path).unwrap().into()),
point_to_lsp(position), point_to_lsp(position),
), ),
work_done_progress_params: Default::default(), work_done_progress_params: Default::default(),

2
crates/project/src/lsp_ext_command.rs
View file

@ -58,7 +58,7 @@ impl LspCommand for ExpandMacro {
) -> ExpandMacroParams { ) -> ExpandMacroParams {
ExpandMacroParams { ExpandMacroParams {
text_document: lsp::TextDocumentIdentifier { text_document: lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(path).unwrap(), uri: lsp::Uri::from_file_path(path).unwrap().into(),
}, },
position: point_to_lsp(self.position), position: point_to_lsp(self.position),
} }

75
crates/project/src/project.rs
View file

@ -61,7 +61,7 @@ use lsp::{
DiagnosticSeverity, DiagnosticTag, DidChangeWatchedFilesRegistrationOptions, DiagnosticSeverity, DiagnosticTag, DidChangeWatchedFilesRegistrationOptions,
DocumentHighlightKind, Edit, FileSystemWatcher, LanguageServer, LanguageServerBinary, DocumentHighlightKind, Edit, FileSystemWatcher, LanguageServer, LanguageServerBinary,
LanguageServerId, LspRequestFuture, MessageActionItem, OneOf, ServerCapabilities, LanguageServerId, LspRequestFuture, MessageActionItem, OneOf, ServerCapabilities,
ServerHealthStatus, ServerStatus, TextEdit, ServerHealthStatus, ServerStatus, TextEdit, Uri,
}; };
use lsp_command::*; use lsp_command::*;
use node_runtime::NodeRuntime; use node_runtime::NodeRuntime;
@ -2158,7 +2158,7 @@ impl Project {
/// LanguageServerName is owned, because it is inserted into a map /// LanguageServerName is owned, because it is inserted into a map
pub fn open_local_buffer_via_lsp( pub fn open_local_buffer_via_lsp(
&mut self, &mut self,
abs_path: lsp::Url, abs_path: lsp::Uri,
language_server_id: LanguageServerId, language_server_id: LanguageServerId,
language_server_name: LanguageServerName, language_server_name: LanguageServerName,
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
@ -2458,13 +2458,15 @@ impl Project {
cx.observe_release(buffer, |this, buffer, cx| { cx.observe_release(buffer, |this, buffer, cx| {
if let Some(file) = File::from_dyn(buffer.file()) { if let Some(file) = File::from_dyn(buffer.file()) {
if file.is_local() { if file.is_local() {
let uri = lsp::Url::from_file_path(file.abs_path(cx)).unwrap(); let uri = lsp::Uri::from_file_path(file.abs_path(cx)).unwrap();
for server in this.language_servers_for_buffer(buffer, cx) { for server in this.language_servers_for_buffer(buffer, cx) {
server server
.1 .1
.notify::<lsp::notification::DidCloseTextDocument>( .notify::<lsp::notification::DidCloseTextDocument>(
lsp::DidCloseTextDocumentParams { lsp::DidCloseTextDocumentParams {
text_document: lsp::TextDocumentIdentifier::new(uri.clone()), text_document: lsp::TextDocumentIdentifier::new(
uri.clone().into(),
),
}, },
) )
.log_err(); .log_err();
@ -2496,8 +2498,8 @@ impl Project {
} }
let abs_path = file.abs_path(cx); let abs_path = file.abs_path(cx);
let uri = lsp::Url::from_file_path(&abs_path) let uri = lsp::Uri::from_file_path(&abs_path)
.unwrap_or_else(|()| panic!("Failed to register file {abs_path:?}")); .unwrap_or_else(|_| panic!("Failed to register file {abs_path:?}"));
let initial_snapshot = buffer.text_snapshot(); let initial_snapshot = buffer.text_snapshot();
let language = buffer.language().cloned(); let language = buffer.language().cloned();
let worktree_id = file.worktree_id(cx); let worktree_id = file.worktree_id(cx);
@ -2533,7 +2535,7 @@ impl Project {
.notify::<lsp::notification::DidOpenTextDocument>( .notify::<lsp::notification::DidOpenTextDocument>(
lsp::DidOpenTextDocumentParams { lsp::DidOpenTextDocumentParams {
text_document: lsp::TextDocumentItem::new( text_document: lsp::TextDocumentItem::new(
uri.clone(), uri.clone().into(),
adapter.language_id(&language), adapter.language_id(&language),
0, 0,
initial_snapshot.text(), initial_snapshot.text(),
@ -2591,12 +2593,14 @@ impl Project {
} }
self.buffer_snapshots.remove(&buffer.remote_id()); self.buffer_snapshots.remove(&buffer.remote_id());
let file_url = lsp::Url::from_file_path(old_path).unwrap(); let file_url = lsp::Uri::from_file_path(old_path).unwrap();
for (_, language_server) in self.language_servers_for_buffer(buffer, cx) { for (_, language_server) in self.language_servers_for_buffer(buffer, cx) {
language_server language_server
.notify::<lsp::notification::DidCloseTextDocument>( .notify::<lsp::notification::DidCloseTextDocument>(
lsp::DidCloseTextDocumentParams { lsp::DidCloseTextDocumentParams {
text_document: lsp::TextDocumentIdentifier::new(file_url.clone()), text_document: lsp::TextDocumentIdentifier::new(
file_url.clone().into(),
),
}, },
) )
.log_err(); .log_err();
@ -2755,7 +2759,7 @@ impl Project {
let buffer = buffer.read(cx); let buffer = buffer.read(cx);
let file = File::from_dyn(buffer.file())?; let file = File::from_dyn(buffer.file())?;
let abs_path = file.as_local()?.abs_path(cx); let abs_path = file.as_local()?.abs_path(cx);
let uri = lsp::Url::from_file_path(abs_path).unwrap(); let uri = lsp::Uri::from_file_path(abs_path).unwrap();
let next_snapshot = buffer.text_snapshot(); let next_snapshot = buffer.text_snapshot();
let language_servers: Vec<_> = self let language_servers: Vec<_> = self
@ -2836,7 +2840,7 @@ impl Project {
.notify::<lsp::notification::DidChangeTextDocument>( .notify::<lsp::notification::DidChangeTextDocument>(
lsp::DidChangeTextDocumentParams { lsp::DidChangeTextDocumentParams {
text_document: lsp::VersionedTextDocumentIdentifier::new( text_document: lsp::VersionedTextDocumentIdentifier::new(
uri.clone(), uri.clone().into(),
next_version, next_version,
), ),
content_changes, content_changes,
@ -2851,7 +2855,7 @@ impl Project {
let worktree_id = file.worktree_id(cx); let worktree_id = file.worktree_id(cx);
let abs_path = file.as_local()?.abs_path(cx); let abs_path = file.as_local()?.abs_path(cx);
let text_document = lsp::TextDocumentIdentifier { let text_document = lsp::TextDocumentIdentifier {
uri: lsp::Url::from_file_path(abs_path).unwrap(), uri: lsp::Uri::from_file_path(abs_path).unwrap().into(),
}; };
for (_, _, server) in self.language_servers_for_worktree(worktree_id) { for (_, _, server) in self.language_servers_for_worktree(worktree_id) {
@ -3891,11 +3895,11 @@ impl Project {
let snapshot = versions.last().unwrap(); let snapshot = versions.last().unwrap();
let version = snapshot.version; let version = snapshot.version;
let initial_snapshot = &snapshot.snapshot; let initial_snapshot = &snapshot.snapshot;
let uri = lsp::Url::from_file_path(file.abs_path(cx)).unwrap(); let uri = lsp::Uri::from_file_path(file.abs_path(cx)).unwrap();
language_server.notify::<lsp::notification::DidOpenTextDocument>( language_server.notify::<lsp::notification::DidOpenTextDocument>(
lsp::DidOpenTextDocumentParams { lsp::DidOpenTextDocumentParams {
text_document: lsp::TextDocumentItem::new( text_document: lsp::TextDocumentItem::new(
uri, uri.into(),
adapter.language_id(&language), adapter.language_id(&language),
version, version,
initial_snapshot.text(), initial_snapshot.text(),
@ -4497,10 +4501,13 @@ impl Project {
lsp::OneOf::Left(workspace_folder) => &workspace_folder.uri, lsp::OneOf::Left(workspace_folder) => &workspace_folder.uri,
lsp::OneOf::Right(base_uri) => base_uri, lsp::OneOf::Right(base_uri) => base_uri,
}; };
base_uri.to_file_path().ok().and_then(|file_path| { lsp::Uri::from(base_uri.clone())
(file_path.to_str() == Some(abs_path)) .to_file_path()
.then_some(rp.pattern.as_str()) .ok()
}) .and_then(|file_path| {
(file_path.to_str() == Some(abs_path))
.then_some(rp.pattern.as_str())
})
} }
}; };
if let Some(relative_glob_pattern) = relative_glob_pattern { if let Some(relative_glob_pattern) = relative_glob_pattern {
@ -4589,10 +4596,9 @@ impl Project {
disk_based_sources: &[String], disk_based_sources: &[String],
cx: &mut ModelContext<Self>, cx: &mut ModelContext<Self>,
) -> Result<()> { ) -> Result<()> {
let abs_path = params let abs_path = Uri::from(params.uri.clone())
.uri
.to_file_path() .to_file_path()
.map_err(|_| anyhow!("URI is not a file"))?; .map_err(|_| anyhow!("URI `{}` is not a file", params.uri.as_str()))?;
let mut diagnostics = Vec::default(); let mut diagnostics = Vec::default();
let mut primary_diagnostic_group_ids = HashMap::default(); let mut primary_diagnostic_group_ids = HashMap::default();
let mut sources_by_group_id = HashMap::default(); let mut sources_by_group_id = HashMap::default();
@ -5273,9 +5279,9 @@ impl Project {
tab_size: NonZeroU32, tab_size: NonZeroU32,
cx: &mut AsyncAppContext, cx: &mut AsyncAppContext,
) -> Result<Vec<(Range<Anchor>, String)>> { ) -> Result<Vec<(Range<Anchor>, String)>> {
let uri = lsp::Url::from_file_path(abs_path) let uri = lsp::Uri::from_file_path(abs_path)
.map_err(|_| anyhow!("failed to convert abs path to uri"))?; .map_err(|_| anyhow!("failed to convert abs path to uri"))?;
let text_document = lsp::TextDocumentIdentifier::new(uri); let text_document = lsp::TextDocumentIdentifier::new(uri.into());
let capabilities = &language_server.capabilities(); let capabilities = &language_server.capabilities();
let formatting_provider = capabilities.document_formatting_provider.as_ref(); let formatting_provider = capabilities.document_formatting_provider.as_ref();
@ -5580,7 +5586,8 @@ impl Project {
lsp_symbols lsp_symbols
.into_iter() .into_iter()
.filter_map(|(symbol_name, symbol_kind, symbol_location)| { .filter_map(|(symbol_name, symbol_kind, symbol_location)| {
let abs_path = symbol_location.uri.to_file_path().ok()?; let abs_path: lsp::Uri = symbol_location.uri.into();
let abs_path = abs_path.to_file_path().ok()?;
let source_worktree = source_worktree.upgrade()?; let source_worktree = source_worktree.upgrade()?;
let source_worktree_id = source_worktree.read(cx).id(); let source_worktree_id = source_worktree.read(cx).id();
@ -5682,7 +5689,7 @@ impl Project {
}; };
let symbol_abs_path = resolve_path(&worktree_abs_path, &symbol.path.path); let symbol_abs_path = resolve_path(&worktree_abs_path, &symbol.path.path);
let symbol_uri = if let Ok(uri) = lsp::Url::from_file_path(symbol_abs_path) { let symbol_uri = if let Ok(uri) = lsp::Uri::from_file_path(symbol_abs_path) {
uri uri
} else { } else {
return Task::ready(Err(anyhow!("invalid symbol path"))); return Task::ready(Err(anyhow!("invalid symbol path")));
@ -6602,8 +6609,7 @@ impl Project {
for operation in operations { for operation in operations {
match operation { match operation {
lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Create(op)) => { lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Create(op)) => {
let abs_path = op let abs_path = Uri::from(op.uri)
.uri
.to_file_path() .to_file_path()
.map_err(|_| anyhow!("can't convert URI to path"))?; .map_err(|_| anyhow!("can't convert URI to path"))?;
@ -6627,12 +6633,10 @@ impl Project {
} }
lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Rename(op)) => { lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Rename(op)) => {
let source_abs_path = op let source_abs_path = Uri::from(op.old_uri)
.old_uri
.to_file_path() .to_file_path()
.map_err(|_| anyhow!("can't convert URI to path"))?; .map_err(|_| anyhow!("can't convert URI to path"))?;
let target_abs_path = op let target_abs_path = Uri::from(op.new_uri)
.new_uri
.to_file_path() .to_file_path()
.map_err(|_| anyhow!("can't convert URI to path"))?; .map_err(|_| anyhow!("can't convert URI to path"))?;
fs.rename( fs.rename(
@ -6649,8 +6653,7 @@ impl Project {
} }
lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Delete(op)) => { lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Delete(op)) => {
let abs_path = op let abs_path: PathBuf = Uri::from(op.uri)
.uri
.to_file_path() .to_file_path()
.map_err(|_| anyhow!("can't convert URI to path"))?; .map_err(|_| anyhow!("can't convert URI to path"))?;
let options = op let options = op
@ -6671,7 +6674,7 @@ impl Project {
let buffer_to_edit = this let buffer_to_edit = this
.update(cx, |this, cx| { .update(cx, |this, cx| {
this.open_local_buffer_via_lsp( this.open_local_buffer_via_lsp(
op.text_document.uri.clone(), op.text_document.uri.clone().into(),
language_server.server_id(), language_server.server_id(),
lsp_adapter.name.clone(), lsp_adapter.name.clone(),
cx, cx,
@ -8004,7 +8007,9 @@ impl Project {
PathChange::AddedOrUpdated => lsp::FileChangeType::CHANGED, PathChange::AddedOrUpdated => lsp::FileChangeType::CHANGED,
}; };
Some(lsp::FileEvent { Some(lsp::FileEvent {
uri: lsp::Url::from_file_path(abs_path.join(path)).unwrap(), uri: lsp::Uri::from_file_path(abs_path.join(path))
.unwrap()
.into(),
typ, typ,
}) })
}) })

131
crates/project/src/project_tests.rs
View file

@ -7,7 +7,6 @@ use language::{
tree_sitter_rust, tree_sitter_typescript, Diagnostic, FakeLspAdapter, LanguageConfig, tree_sitter_rust, tree_sitter_typescript, Diagnostic, FakeLspAdapter, LanguageConfig,
LanguageMatcher, LineEnding, OffsetRangeExt, Point, ToPoint, LanguageMatcher, LineEnding, OffsetRangeExt, Point, ToPoint,
}; };
use lsp::Url;
use parking_lot::Mutex; use parking_lot::Mutex;
use pretty_assertions::assert_eq; use pretty_assertions::assert_eq;
use serde_json::json; use serde_json::json;
@ -379,7 +378,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/test.rs").unwrap(), uri: lsp::Uri::from_file_path("/the-root/test.rs")
.unwrap()
.into(),
version: 0, version: 0,
text: "const A: i32 = 1;".to_string(), text: "const A: i32 = 1;".to_string(),
language_id: "rust".to_string(), language_id: "rust".to_string(),
@ -405,7 +406,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::VersionedTextDocumentIdentifier::new( lsp::VersionedTextDocumentIdentifier::new(
lsp::Url::from_file_path("/the-root/test.rs").unwrap(), lsp::Uri::from_file_path("/the-root/test.rs")
.unwrap()
.into(),
1 1
) )
); );
@ -426,7 +429,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/package.json").unwrap(), uri: lsp::Uri::from_file_path("/the-root/package.json")
.unwrap()
.into(),
version: 0, version: 0,
text: "{\"a\": 1}".to_string(), text: "{\"a\": 1}".to_string(),
language_id: "json".to_string(), language_id: "json".to_string(),
@ -465,7 +470,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::VersionedTextDocumentIdentifier::new( lsp::VersionedTextDocumentIdentifier::new(
lsp::Url::from_file_path("/the-root/test2.rs").unwrap(), lsp::Uri::from_file_path("/the-root/test2.rs")
.unwrap()
.into(),
1 1
) )
); );
@ -480,14 +487,22 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.receive_notification::<lsp::notification::DidSaveTextDocument>() .receive_notification::<lsp::notification::DidSaveTextDocument>()
.await .await
.text_document, .text_document,
lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path("/the-root/Cargo.toml").unwrap()) lsp::TextDocumentIdentifier::new(
lsp::Uri::from_file_path("/the-root/Cargo.toml")
.unwrap()
.into()
)
); );
assert_eq!( assert_eq!(
fake_json_server fake_json_server
.receive_notification::<lsp::notification::DidSaveTextDocument>() .receive_notification::<lsp::notification::DidSaveTextDocument>()
.await .await
.text_document, .text_document,
lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path("/the-root/Cargo.toml").unwrap()) lsp::TextDocumentIdentifier::new(
lsp::Uri::from_file_path("/the-root/Cargo.toml")
.unwrap()
.into()
)
); );
// Renames are reported only to servers matching the buffer's language. // Renames are reported only to servers matching the buffer's language.
@ -503,7 +518,11 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.receive_notification::<lsp::notification::DidCloseTextDocument>() .receive_notification::<lsp::notification::DidCloseTextDocument>()
.await .await
.text_document, .text_document,
lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path("/the-root/test2.rs").unwrap()), lsp::TextDocumentIdentifier::new(
lsp::Uri::from_file_path("/the-root/test2.rs")
.unwrap()
.into()
),
); );
assert_eq!( assert_eq!(
fake_rust_server fake_rust_server
@ -511,7 +530,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/test3.rs").unwrap(), uri: lsp::Uri::from_file_path("/the-root/test3.rs")
.unwrap()
.into(),
version: 0, version: 0,
text: rust_buffer2.update(cx, |buffer, _| buffer.text()), text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
language_id: "rust".to_string(), language_id: "rust".to_string(),
@ -553,7 +574,11 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.receive_notification::<lsp::notification::DidCloseTextDocument>() .receive_notification::<lsp::notification::DidCloseTextDocument>()
.await .await
.text_document, .text_document,
lsp::TextDocumentIdentifier::new(lsp::Url::from_file_path("/the-root/test3.rs").unwrap(),), lsp::TextDocumentIdentifier::new(
lsp::Uri::from_file_path("/the-root/test3.rs")
.unwrap()
.into(),
),
); );
assert_eq!( assert_eq!(
fake_json_server fake_json_server
@ -561,7 +586,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/test3.json").unwrap(), uri: lsp::Uri::from_file_path("/the-root/test3.json")
.unwrap()
.into(),
version: 0, version: 0,
text: rust_buffer2.update(cx, |buffer, _| buffer.text()), text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
language_id: "json".to_string(), language_id: "json".to_string(),
@ -587,7 +614,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::VersionedTextDocumentIdentifier::new( lsp::VersionedTextDocumentIdentifier::new(
lsp::Url::from_file_path("/the-root/test3.json").unwrap(), lsp::Uri::from_file_path("/the-root/test3.json")
.unwrap()
.into(),
1 1
) )
); );
@ -616,7 +645,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
.await .await
.text_document, .text_document,
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/test.rs").unwrap(), uri: lsp::Uri::from_file_path("/the-root/test.rs")
.unwrap()
.into(),
version: 0, version: 0,
text: rust_buffer.update(cx, |buffer, _| buffer.text()), text: rust_buffer.update(cx, |buffer, _| buffer.text()),
language_id: "rust".to_string(), language_id: "rust".to_string(),
@ -637,13 +668,17 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
], ],
[ [
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/package.json").unwrap(), uri: lsp::Uri::from_file_path("/the-root/package.json")
.unwrap()
.into(),
version: 0, version: 0,
text: json_buffer.update(cx, |buffer, _| buffer.text()), text: json_buffer.update(cx, |buffer, _| buffer.text()),
language_id: "json".to_string(), language_id: "json".to_string(),
}, },
lsp::TextDocumentItem { lsp::TextDocumentItem {
uri: lsp::Url::from_file_path("/the-root/test3.json").unwrap(), uri: lsp::Uri::from_file_path("/the-root/test3.json")
.unwrap()
.into(),
version: 0, version: 0,
text: rust_buffer2.update(cx, |buffer, _| buffer.text()), text: rust_buffer2.update(cx, |buffer, _| buffer.text()),
language_id: "json".to_string(), language_id: "json".to_string(),
@ -655,7 +690,9 @@ async fn test_managing_language_servers(cx: &mut gpui::TestAppContext) {
cx.update(|_| drop(json_buffer)); cx.update(|_| drop(json_buffer));
let close_message = lsp::DidCloseTextDocumentParams { let close_message = lsp::DidCloseTextDocumentParams {
text_document: lsp::TextDocumentIdentifier::new( text_document: lsp::TextDocumentIdentifier::new(
lsp::Url::from_file_path("/the-root/package.json").unwrap(), lsp::Uri::from_file_path("/the-root/package.json")
.unwrap()
.into(),
), ),
}; };
assert_eq!( assert_eq!(
@ -845,15 +882,21 @@ async fn test_reporting_fs_changes_to_language_servers(cx: &mut gpui::TestAppCon
&*file_changes.lock(), &*file_changes.lock(),
&[ &[
lsp::FileEvent { lsp::FileEvent {
uri: lsp::Url::from_file_path("/the-root/src/b.rs").unwrap(), uri: lsp::Uri::from_file_path("/the-root/src/b.rs")
.unwrap()
.into(),
typ: lsp::FileChangeType::DELETED, typ: lsp::FileChangeType::DELETED,
}, },
lsp::FileEvent { lsp::FileEvent {
uri: lsp::Url::from_file_path("/the-root/src/c.rs").unwrap(), uri: lsp::Uri::from_file_path("/the-root/src/c.rs")
.unwrap()
.into(),
typ: lsp::FileChangeType::CREATED, typ: lsp::FileChangeType::CREATED,
}, },
lsp::FileEvent { lsp::FileEvent {
uri: lsp::Url::from_file_path("/the-root/target/y/out/y2.rs").unwrap(), uri: lsp::Uri::from_file_path("/the-root/target/y/out/y2.rs")
.unwrap()
.into(),
typ: lsp::FileChangeType::CREATED, typ: lsp::FileChangeType::CREATED,
}, },
] ]
@ -890,7 +933,7 @@ async fn test_single_file_worktrees_diagnostics(cx: &mut gpui::TestAppContext) {
.update_diagnostics( .update_diagnostics(
LanguageServerId(0), LanguageServerId(0),
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/dir/a.rs").unwrap(), uri: Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)), range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
@ -907,7 +950,7 @@ async fn test_single_file_worktrees_diagnostics(cx: &mut gpui::TestAppContext) {
.update_diagnostics( .update_diagnostics(
LanguageServerId(0), LanguageServerId(0),
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/dir/b.rs").unwrap(), uri: Uri::from_file_path("/dir/b.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)), range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
@ -996,7 +1039,7 @@ async fn test_omitted_diagnostics(cx: &mut gpui::TestAppContext) {
.update_diagnostics( .update_diagnostics(
server_id, server_id,
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/root/dir/b.rs").unwrap(), uri: Uri::from_file_path("/root/dir/b.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)), range: lsp::Range::new(lsp::Position::new(0, 4), lsp::Position::new(0, 5)),
@ -1013,7 +1056,7 @@ async fn test_omitted_diagnostics(cx: &mut gpui::TestAppContext) {
.update_diagnostics( .update_diagnostics(
server_id, server_id,
lsp::PublishDiagnosticsParams { lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/root/other.rs").unwrap(), uri: Uri::from_file_path("/root/other.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 9)), range: lsp::Range::new(lsp::Position::new(0, 8), lsp::Position::new(0, 9)),
@ -1148,7 +1191,7 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
); );
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/dir/a.rs").unwrap(), uri: Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)), range: lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
@ -1200,7 +1243,7 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
// Ensure publishing empty diagnostics twice only results in one update event. // Ensure publishing empty diagnostics twice only results in one update event.
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/dir/a.rs").unwrap(), uri: Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: Default::default(), diagnostics: Default::default(),
}); });
@ -1213,7 +1256,7 @@ async fn test_disk_based_diagnostics_progress(cx: &mut gpui::TestAppContext) {
); );
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/dir/a.rs").unwrap(), uri: Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: Default::default(), diagnostics: Default::default(),
}); });
@ -1322,7 +1365,7 @@ async fn test_restarting_server_with_diagnostics_published(cx: &mut gpui::TestAp
// Publish diagnostics // Publish diagnostics
let fake_server = fake_servers.next().await.unwrap(); let fake_server = fake_servers.next().await.unwrap();
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: Url::from_file_path("/dir/a.rs").unwrap(), uri: Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: None, version: None,
diagnostics: vec![lsp::Diagnostic { diagnostics: vec![lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)), range: lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
@ -1402,7 +1445,7 @@ async fn test_restarted_server_reporting_invalid_buffer_version(cx: &mut gpui::T
// Before restarting the server, report diagnostics with an unknown buffer version. // Before restarting the server, report diagnostics with an unknown buffer version.
let fake_server = fake_servers.next().await.unwrap(); let fake_server = fake_servers.next().await.unwrap();
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/dir/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: Some(10000), version: Some(10000),
diagnostics: Vec::new(), diagnostics: Vec::new(),
}); });
@ -1578,7 +1621,7 @@ async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
// Report some diagnostics for the initial version of the buffer // Report some diagnostics for the initial version of the buffer
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/dir/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: Some(open_notification.text_document.version), version: Some(open_notification.text_document.version),
diagnostics: vec![ diagnostics: vec![
lsp::Diagnostic { lsp::Diagnostic {
@ -1664,7 +1707,7 @@ async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
// Ensure overlapping diagnostics are highlighted correctly. // Ensure overlapping diagnostics are highlighted correctly.
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/dir/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: Some(open_notification.text_document.version), version: Some(open_notification.text_document.version),
diagnostics: vec![ diagnostics: vec![
lsp::Diagnostic { lsp::Diagnostic {
@ -1756,7 +1799,7 @@ async fn test_transforming_diagnostics(cx: &mut gpui::TestAppContext) {
// Handle out-of-order diagnostics // Handle out-of-order diagnostics
fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams { fake_server.notify::<lsp::notification::PublishDiagnostics>(lsp::PublishDiagnosticsParams {
uri: lsp::Url::from_file_path("/dir/a.rs").unwrap(), uri: lsp::Uri::from_file_path("/dir/a.rs").unwrap().into(),
version: Some(change_notification_2.text_document.version), version: Some(change_notification_2.text_document.version),
diagnostics: vec![ diagnostics: vec![
lsp::Diagnostic { lsp::Diagnostic {
@ -2350,14 +2393,14 @@ async fn test_definition(cx: &mut gpui::TestAppContext) {
fake_server.handle_request::<lsp::request::GotoDefinition, _, _>(|params, _| async move { fake_server.handle_request::<lsp::request::GotoDefinition, _, _>(|params, _| async move {
let params = params.text_document_position_params; let params = params.text_document_position_params;
assert_eq!( assert_eq!(
params.text_document.uri.to_file_path().unwrap(), Uri::from(params.text_document.uri).to_file_path().unwrap(),
Path::new("/dir/b.rs"), Path::new("/dir/b.rs"),
); );
assert_eq!(params.position, lsp::Position::new(0, 22)); assert_eq!(params.position, lsp::Position::new(0, 22));
Ok(Some(lsp::GotoDefinitionResponse::Scalar( Ok(Some(lsp::GotoDefinitionResponse::Scalar(
lsp::Location::new( lsp::Location::new(
lsp::Url::from_file_path("/dir/a.rs").unwrap(), lsp::Uri::from_file_path("/dir/a.rs").unwrap().into(),
lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)), lsp::Range::new(lsp::Position::new(0, 9), lsp::Position::new(0, 10)),
), ),
))) )))
@ -2665,7 +2708,7 @@ async fn test_apply_code_actions_with_commands(cx: &mut gpui::TestAppContext) {
edit: lsp::WorkspaceEdit { edit: lsp::WorkspaceEdit {
changes: Some( changes: Some(
[( [(
lsp::Url::from_file_path("/dir/a.ts").unwrap(), lsp::Uri::from_file_path("/dir/a.ts").unwrap().into(),
vec![lsp::TextEdit { vec![lsp::TextEdit {
range: lsp::Range::new( range: lsp::Range::new(
lsp::Position::new(0, 0), lsp::Position::new(0, 0),
@ -3496,9 +3539,9 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
.await .await
.unwrap(); .unwrap();
let buffer_uri = Url::from_file_path("/the-dir/a.rs").unwrap(); let buffer_uri = Uri::from_file_path("/the-dir/a.rs").unwrap();
let message = lsp::PublishDiagnosticsParams { let message = lsp::PublishDiagnosticsParams {
uri: buffer_uri.clone(), uri: buffer_uri.clone().into(),
diagnostics: vec![ diagnostics: vec![
lsp::Diagnostic { lsp::Diagnostic {
range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)), range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)),
@ -3506,7 +3549,7 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
message: "error 1".to_string(), message: "error 1".to_string(),
related_information: Some(vec![lsp::DiagnosticRelatedInformation { related_information: Some(vec![lsp::DiagnosticRelatedInformation {
location: lsp::Location { location: lsp::Location {
uri: buffer_uri.clone(), uri: buffer_uri.clone().into(),
range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)), range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)),
}, },
message: "error 1 hint 1".to_string(), message: "error 1 hint 1".to_string(),
@ -3519,7 +3562,7 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
message: "error 1 hint 1".to_string(), message: "error 1 hint 1".to_string(),
related_information: Some(vec![lsp::DiagnosticRelatedInformation { related_information: Some(vec![lsp::DiagnosticRelatedInformation {
location: lsp::Location { location: lsp::Location {
uri: buffer_uri.clone(), uri: buffer_uri.clone().into(),
range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)), range: lsp::Range::new(lsp::Position::new(1, 8), lsp::Position::new(1, 9)),
}, },
message: "original diagnostic".to_string(), message: "original diagnostic".to_string(),
@ -3533,7 +3576,7 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
related_information: Some(vec![ related_information: Some(vec![
lsp::DiagnosticRelatedInformation { lsp::DiagnosticRelatedInformation {
location: lsp::Location { location: lsp::Location {
uri: buffer_uri.clone(), uri: buffer_uri.clone().into(),
range: lsp::Range::new( range: lsp::Range::new(
lsp::Position::new(1, 13), lsp::Position::new(1, 13),
lsp::Position::new(1, 15), lsp::Position::new(1, 15),
@ -3543,7 +3586,7 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
}, },
lsp::DiagnosticRelatedInformation { lsp::DiagnosticRelatedInformation {
location: lsp::Location { location: lsp::Location {
uri: buffer_uri.clone(), uri: buffer_uri.clone().into(),
range: lsp::Range::new( range: lsp::Range::new(
lsp::Position::new(1, 13), lsp::Position::new(1, 13),
lsp::Position::new(1, 15), lsp::Position::new(1, 15),
@ -3560,7 +3603,7 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
message: "error 2 hint 1".to_string(), message: "error 2 hint 1".to_string(),
related_information: Some(vec![lsp::DiagnosticRelatedInformation { related_information: Some(vec![lsp::DiagnosticRelatedInformation {
location: lsp::Location { location: lsp::Location {
uri: buffer_uri.clone(), uri: buffer_uri.clone().into(),
range: lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 17)), range: lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 17)),
}, },
message: "original diagnostic".to_string(), message: "original diagnostic".to_string(),
@ -3573,7 +3616,7 @@ async fn test_grouped_diagnostics(cx: &mut gpui::TestAppContext) {
message: "error 2 hint 2".to_string(), message: "error 2 hint 2".to_string(),
related_information: Some(vec![lsp::DiagnosticRelatedInformation { related_information: Some(vec![lsp::DiagnosticRelatedInformation {
location: lsp::Location { location: lsp::Location {
uri: buffer_uri, uri: buffer_uri.into(),
range: lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 17)), range: lsp::Range::new(lsp::Position::new(2, 8), lsp::Position::new(2, 17)),
}, },
message: "original diagnostic".to_string(), message: "original diagnostic".to_string(),
@ -3790,14 +3833,14 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
changes: Some( changes: Some(
[ [
( (
lsp::Url::from_file_path("/dir/one.rs").unwrap(), lsp::Uri::from_file_path("/dir/one.rs").unwrap().into(),
vec![lsp::TextEdit::new( vec![lsp::TextEdit::new(
lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)), lsp::Range::new(lsp::Position::new(0, 6), lsp::Position::new(0, 9)),
"THREE".to_string(), "THREE".to_string(),
)], )],
), ),
( (
lsp::Url::from_file_path("/dir/two.rs").unwrap(), lsp::Uri::from_file_path("/dir/two.rs").unwrap().into(),
vec![ vec![
lsp::TextEdit::new( lsp::TextEdit::new(
lsp::Range::new( lsp::Range::new(

2
crates/project_symbols/src/project_symbols.rs
View file

@ -412,7 +412,7 @@ mod tests {
deprecated: None, deprecated: None,
container_name: None, container_name: None,
location: lsp::Location::new( location: lsp::Location::new(
lsp::Url::from_file_path(path.as_ref()).unwrap(), lsp::Uri::from_file_path(path.as_ref()).unwrap().into(),
lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)), lsp::Range::new(lsp::Position::new(0, 0), lsp::Position::new(0, 0)),
), ),
} }

2
crates/vim/src/test.rs
View file

@ -891,7 +891,7 @@ async fn test_rename(cx: &mut gpui::TestAppContext) {
Ok(Some(lsp::WorkspaceEdit { Ok(Some(lsp::WorkspaceEdit {
changes: Some( changes: Some(
[( [(
url.clone(), url.clone().into(),
vec![ vec![
lsp::TextEdit::new(def_range, params.new_name.clone()), lsp::TextEdit::new(def_range, params.new_name.clone()),
lsp::TextEdit::new(tgt_range, params.new_name), lsp::TextEdit::new(tgt_range, params.new_name),