diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-01-24 14:23:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 08:23:19 -0500 |
| commit | 654e177c919babe4eef4c1c9545ef267b23884e6 (patch) | |
| tree | 7e8e00bef1afa9a062be9baf14fa9865865ec844 /cli/lsp | |
| parent | 0d1471282bf758ed5f84e570bffa9424c7b8f26f (diff) | |
refactor(deno_graph): remove unused Resolved::Ok#kind usage (#17504)
See https://github.com/denoland/deno_graph/pull/205 for more details.
Diffstat (limited to 'cli/lsp')
| -rw-r--r-- | cli/lsp/documents.rs | 4 | ||||
| -rw-r--r-- | cli/lsp/language_server.rs | 14 |
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( |