summaryrefslogtreecommitdiff
path: root/cli/lsp/tsc.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/lsp/tsc.rs')
-rw-r--r--cli/lsp/tsc.rs65
1 files changed, 33 insertions, 32 deletions
diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs
index 3ac25507c..566c61977 100644
--- a/cli/lsp/tsc.rs
+++ b/cli/lsp/tsc.rs
@@ -19,6 +19,7 @@ use super::refactor::EXTRACT_TYPE;
use super::semantic_tokens;
use super::semantic_tokens::SemanticTokensBuilder;
use super::text::LineIndex;
+use super::urls::url_to_uri;
use super::urls::LspClientUrl;
use super::urls::INVALID_SPECIFIER;
@@ -2071,7 +2072,7 @@ impl DocumentSpan {
};
let link = lsp::LocationLink {
origin_selection_range,
- target_uri: target_uri.into_url(),
+ target_uri: target_uri.to_uri(),
target_range,
target_selection_range,
};
@@ -2158,7 +2159,7 @@ impl NavigateToItem {
.ok()?;
let range = self.text_span.to_range(line_index);
let location = lsp::Location {
- uri: uri.into_url(),
+ uri: uri.to_uri(),
range,
};
@@ -2418,7 +2419,7 @@ impl ImplementationLocation {
LspClientUrl::new(ModuleSpecifier::parse("deno://invalid").unwrap())
});
lsp::Location {
- uri: uri.into_url(),
+ uri: uri.to_uri(),
range: self.document_span.text_span.to_range(line_index),
}
}
@@ -2483,7 +2484,7 @@ impl RenameLocations {
uri.clone(),
lsp::TextDocumentEdit {
text_document: lsp::OptionalVersionedTextDocumentIdentifier {
- uri: uri.as_url().clone(),
+ uri: uri.to_uri(),
version: asset_or_doc.document_lsp_version(),
},
edits:
@@ -2685,7 +2686,7 @@ impl FileTextChanges {
.collect();
Ok(lsp::TextDocumentEdit {
text_document: lsp::OptionalVersionedTextDocumentIdentifier {
- uri: specifier,
+ uri: url_to_uri(&specifier),
version: asset_or_doc.document_lsp_version(),
},
edits,
@@ -2712,7 +2713,7 @@ impl FileTextChanges {
if self.is_new_file.unwrap_or(false) {
ops.push(lsp::DocumentChangeOperation::Op(lsp::ResourceOp::Create(
lsp::CreateFile {
- uri: specifier.clone(),
+ uri: url_to_uri(&specifier),
options: Some(lsp::CreateFileOptions {
ignore_if_exists: Some(true),
overwrite: None,
@@ -2729,7 +2730,7 @@ impl FileTextChanges {
.collect();
ops.push(lsp::DocumentChangeOperation::Edit(lsp::TextDocumentEdit {
text_document: lsp::OptionalVersionedTextDocumentIdentifier {
- uri: specifier,
+ uri: url_to_uri(&specifier),
version: maybe_asset_or_document.and_then(|d| d.document_lsp_version()),
},
edits,
@@ -3130,7 +3131,7 @@ impl ReferenceEntry {
.normalize_specifier(&specifier, file_referrer.as_deref())
.unwrap_or_else(|_| LspClientUrl::new(INVALID_SPECIFIER.clone()));
lsp::Location {
- uri: uri.into_url(),
+ uri: uri.to_uri(),
range: self.document_span.text_span.to_range(line_index),
}
}
@@ -3237,7 +3238,7 @@ impl CallHierarchyItem {
lsp::CallHierarchyItem {
name,
tags,
- uri: uri.into_url(),
+ uri: uri.to_uri(),
detail: Some(detail),
kind: self.kind.clone().into(),
range: self.span.to_range(line_index.clone()),
@@ -5398,7 +5399,7 @@ mod tests {
sources: &[(&str, &str, i32, LanguageId)],
) -> (TempDir, TsServer, Arc<StateSnapshot>, LspCache) {
let temp_dir = TempDir::new();
- let cache = LspCache::new(Some(temp_dir.uri().join(".deno_dir").unwrap()));
+ let cache = LspCache::new(Some(temp_dir.url().join(".deno_dir").unwrap()));
let mut config = Config::default();
config
.tree
@@ -5408,7 +5409,7 @@ mod tests {
"compilerOptions": ts_config,
})
.to_string(),
- temp_dir.uri().join("deno.json").unwrap(),
+ temp_dir.url().join("deno.json").unwrap(),
&Default::default(),
)
.unwrap(),
@@ -5419,7 +5420,7 @@ mod tests {
let mut documents = Documents::default();
documents.update_config(&config, &resolver, &cache, &Default::default());
for (relative_specifier, source, version, language_id) in sources {
- let specifier = temp_dir.uri().join(relative_specifier).unwrap();
+ let specifier = temp_dir.url().join(relative_specifier).unwrap();
documents.open(specifier, *version, *language_id, (*source).into(), None);
}
let snapshot = Arc::new(StateSnapshot {
@@ -5489,7 +5490,7 @@ mod tests {
)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(snapshot, vec![specifier.clone()], Default::default())
.await
@@ -5536,7 +5537,7 @@ mod tests {
)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(snapshot, vec![specifier.clone()], Default::default())
.await
@@ -5567,7 +5568,7 @@ mod tests {
)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(snapshot, vec![specifier.clone()], Default::default())
.await
@@ -5594,7 +5595,7 @@ mod tests {
)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(snapshot, vec![specifier.clone()], Default::default())
.await
@@ -5644,7 +5645,7 @@ mod tests {
)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(snapshot, vec![specifier.clone()], Default::default())
.await
@@ -5678,7 +5679,7 @@ mod tests {
)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(snapshot, vec![specifier.clone()], Default::default())
.await
@@ -5736,7 +5737,7 @@ mod tests {
)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(snapshot, vec![specifier.clone()], Default::default())
.await
@@ -5829,7 +5830,7 @@ mod tests {
b"export const b = \"b\";\n",
)
.unwrap();
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(
snapshot.clone(),
@@ -5879,7 +5880,7 @@ mod tests {
[(&specifier_dep, ChangeKind::Opened)],
None,
);
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let diagnostics = ts_server
.get_diagnostics(
snapshot.clone(),
@@ -5951,7 +5952,7 @@ mod tests {
&[("a.ts", fixture, 1, LanguageId::TypeScript)],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let info = ts_server
.get_completions(
snapshot.clone(),
@@ -5966,7 +5967,7 @@ mod tests {
trigger_kind: None,
},
Default::default(),
- Some(temp_dir.uri()),
+ Some(temp_dir.url()),
)
.await
.unwrap();
@@ -5983,7 +5984,7 @@ mod tests {
preferences: None,
data: None,
},
- Some(temp_dir.uri()),
+ Some(temp_dir.url()),
)
.await
.unwrap()
@@ -6105,7 +6106,7 @@ mod tests {
],
)
.await;
- let specifier = temp_dir.uri().join("a.ts").unwrap();
+ let specifier = temp_dir.url().join("a.ts").unwrap();
let fmt_options_config = FmtOptionsConfig {
semi_colons: Some(false),
single_quote: Some(true),
@@ -6126,7 +6127,7 @@ mod tests {
..Default::default()
},
FormatCodeSettings::from(&fmt_options_config),
- Some(temp_dir.uri()),
+ Some(temp_dir.url()),
)
.await
.unwrap();
@@ -6152,7 +6153,7 @@ mod tests {
}),
data: entry.data.clone(),
},
- Some(temp_dir.uri()),
+ Some(temp_dir.url()),
)
.await
.unwrap()
@@ -6217,8 +6218,8 @@ mod tests {
let changes = ts_server
.get_edits_for_file_rename(
snapshot,
- temp_dir.uri().join("b.ts").unwrap(),
- temp_dir.uri().join("🦕.ts").unwrap(),
+ temp_dir.url().join("b.ts").unwrap(),
+ temp_dir.url().join("🦕.ts").unwrap(),
FormatCodeSettings::default(),
UserPreferences::default(),
)
@@ -6227,7 +6228,7 @@ mod tests {
assert_eq!(
changes,
vec![FileTextChanges {
- file_name: temp_dir.uri().join("a.ts").unwrap().to_string(),
+ file_name: temp_dir.url().join("a.ts").unwrap().to_string(),
text_changes: vec![TextChange {
span: TextSpan {
start: 8,
@@ -6286,7 +6287,7 @@ mod tests {
let resolved = op_resolve_inner(
&mut state,
ResolveArgs {
- base: temp_dir.uri().join("a.ts").unwrap().to_string(),
+ base: temp_dir.url().join("a.ts").unwrap().to_string(),
is_base_cjs: false,
specifiers: vec!["./b.ts".to_string()],
},
@@ -6295,7 +6296,7 @@ mod tests {
assert_eq!(
resolved,
vec![Some((
- temp_dir.uri().join("b.ts").unwrap().to_string(),
+ temp_dir.url().join("b.ts").unwrap().to_string(),
MediaType::TypeScript.as_ts_extension().to_string()
))]
);
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 00:23:49 +0000