summaryrefslogtreecommitdiff
path: root/cli/lsp
diff options
context:
space:
mode:
Diffstat (limited to 'cli/lsp')
-rw-r--r--cli/lsp/documents.rs4
-rw-r--r--cli/lsp/language_server.rs14
2 files changed, 6 insertions, 12 deletions
diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs
index 0e3cb2a7f..bc1e4a808 100644
--- a/cli/lsp/documents.rs
+++ b/cli/lsp/documents.rs
@@ -876,7 +876,7 @@ impl Documents {
) -> bool {
let maybe_resolver = self.get_maybe_resolver();
let maybe_specifier = if let Some(resolver) = maybe_resolver {
- resolver.resolve(specifier, referrer).to_result().ok()
+ resolver.resolve(specifier, referrer).ok()
} else {
deno_core::resolve_import(specifier, referrer.as_str()).ok()
};
@@ -1318,7 +1318,7 @@ fn lsp_deno_graph_analyze(
specifier,
maybe_headers,
content,
- Some(&deno_graph::ModuleKind::Esm),
+ Some(deno_graph::ModuleKind::Esm),
maybe_resolver,
Some(&analyzer),
),
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index b90f613e9..68f2447c1 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -8,7 +8,6 @@ use deno_core::serde_json;
use deno_core::serde_json::json;
use deno_core::serde_json::Value;
use deno_core::ModuleSpecifier;
-use deno_graph::ModuleKind;
use import_map::ImportMap;
use log::error;
use log::warn;
@@ -158,7 +157,7 @@ impl LanguageServer {
) -> LspResult<Option<Value>> {
async fn create_graph_for_caching(
cli_options: CliOptions,
- roots: Vec<(ModuleSpecifier, ModuleKind)>,
+ roots: Vec<ModuleSpecifier>,
open_docs: Vec<Document>,
) -> Result<(), AnyError> {
let open_docs = open_docs
@@ -2917,7 +2916,7 @@ impl tower_lsp::LanguageServer for LanguageServer {
struct PrepareCacheResult {
cli_options: CliOptions,
- roots: Vec<(ModuleSpecifier, ModuleKind)>,
+ roots: Vec<ModuleSpecifier>,
open_docs: Vec<Document>,
mark: PerformanceMark,
}
@@ -2938,15 +2937,10 @@ impl Inner {
params
.uris
.iter()
- .map(|t| {
- (
- self.url_map.normalize_url(&t.uri),
- deno_graph::ModuleKind::Esm,
- )
- })
+ .map(|t| self.url_map.normalize_url(&t.uri))
.collect()
} else {
- vec![(referrer, deno_graph::ModuleKind::Esm)]
+ vec![referrer]
};
let mut cli_options = CliOptions::new(