diff options
author | Yazan AbdAl-Rahman <yazan.abdalrahman@exalt.ps> | 2024-09-18 16:51:39 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-18 14:51:39 +0100 |
commit | bed46474b2d59b229bd85dbdec5b3d943c32f60f (patch) | |
tree | 8262166530242f7c1b68de17e97c646912f1b939 /cli/lsp | |
parent | 48ea4e3c92b53936e89101a56a013300a47337d3 (diff) |
fix: do not panic running invalid file specifier (#25530)
Co-authored-by: Bedis Nbiba <bedisnbiba@gmail.com>
Diffstat (limited to 'cli/lsp')
-rw-r--r-- | cli/lsp/analysis.rs | 2 | ||||
-rw-r--r-- | cli/lsp/cache.rs | 2 | ||||
-rw-r--r-- | cli/lsp/completions.rs | 2 | ||||
-rw-r--r-- | cli/lsp/documents.rs | 2 | ||||
-rw-r--r-- | cli/lsp/language_server.rs | 2 | ||||
-rw-r--r-- | cli/lsp/resolver.rs | 46 | ||||
-rw-r--r-- | cli/lsp/tsc.rs | 2 |
7 files changed, 29 insertions, 29 deletions
diff --git a/cli/lsp/analysis.rs b/cli/lsp/analysis.rs index eeab796bc..fee9c86cb 100644 --- a/cli/lsp/analysis.rs +++ b/cli/lsp/analysis.rs @@ -11,7 +11,6 @@ use super::urls::url_to_uri; use crate::args::jsr_url; use crate::tools::lint::CliLinter; use deno_lint::diagnostic::LintDiagnosticRange; -use deno_runtime::fs_util::specifier_to_file_path; use deno_ast::SourceRange; use deno_ast::SourceRangedForSpanned; @@ -25,6 +24,7 @@ use deno_core::serde_json; use deno_core::serde_json::json; use deno_core::ModuleSpecifier; use deno_runtime::deno_node::PathClean; +use deno_runtime::fs_util::specifier_to_file_path; use deno_semver::jsr::JsrPackageNvReference; use deno_semver::jsr::JsrPackageReqReference; use deno_semver::npm::NpmPackageReqReference; diff --git a/cli/lsp/cache.rs b/cli/lsp/cache.rs index d3c05ca91..a32087842 100644 --- a/cli/lsp/cache.rs +++ b/cli/lsp/cache.rs @@ -7,10 +7,10 @@ use crate::cache::LocalLspHttpCache; use crate::lsp::config::Config; use crate::lsp::logging::lsp_log; use crate::lsp::logging::lsp_warn; -use deno_runtime::fs_util::specifier_to_file_path; use deno_core::url::Url; use deno_core::ModuleSpecifier; +use deno_runtime::fs_util::specifier_to_file_path; use std::collections::BTreeMap; use std::fs; use std::path::Path; diff --git a/cli/lsp/completions.rs b/cli/lsp/completions.rs index 1e5504d75..b3d6fbbd0 100644 --- a/cli/lsp/completions.rs +++ b/cli/lsp/completions.rs @@ -19,7 +19,6 @@ use crate::util::path::relative_specifier; use deno_graph::source::ResolutionMode; use deno_graph::Range; use deno_runtime::deno_node::SUPPORTED_BUILTIN_NODE_MODULES; -use deno_runtime::fs_util::specifier_to_file_path; use deno_ast::LineAndColumnIndex; use deno_ast::SourceTextInfo; @@ -30,6 +29,7 @@ use deno_core::serde::Serialize; use deno_core::serde_json::json; use deno_core::url::Position; use deno_core::ModuleSpecifier; +use deno_runtime::fs_util::specifier_to_file_path; use deno_semver::jsr::JsrPackageReqReference; use deno_semver::package::PackageNv; use import_map::ImportMap; diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs index d6af96b23..e96b8831b 100644 --- a/cli/lsp/documents.rs +++ b/cli/lsp/documents.rs @@ -11,7 +11,6 @@ use super::tsc; use super::tsc::AssetDocument; use crate::graph_util::CliJsrUrlProvider; -use deno_runtime::fs_util::specifier_to_file_path; use dashmap::DashMap; use deno_ast::swc::visit::VisitWith; @@ -28,6 +27,7 @@ use deno_core::ModuleSpecifier; use deno_graph::source::ResolutionMode; use deno_graph::Resolution; use deno_runtime::deno_node; +use deno_runtime::fs_util::specifier_to_file_path; use deno_semver::jsr::JsrPackageReqReference; use deno_semver::npm::NpmPackageReqReference; use deno_semver::package::PackageReq; diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index c859abc02..5f6e38082 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -17,6 +17,7 @@ use deno_graph::GraphKind; use deno_graph::Resolution; use deno_runtime::deno_tls::rustls::RootCertStore; use deno_runtime::deno_tls::RootCertStoreProvider; +use deno_runtime::fs_util::specifier_to_file_path; use deno_semver::jsr::JsrPackageReqReference; use indexmap::Equivalent; use indexmap::IndexSet; @@ -112,7 +113,6 @@ use crate::util::fs::remove_dir_all_if_exists; use crate::util::path::is_importable_ext; use crate::util::path::to_percent_decoded_str; use crate::util::sync::AsyncFlag; -use deno_runtime::fs_util::specifier_to_file_path; struct LspRootCertStoreProvider(RootCertStore); diff --git a/cli/lsp/resolver.rs b/cli/lsp/resolver.rs index 1c3d5c88b..2844eb6f9 100644 --- a/cli/lsp/resolver.rs +++ b/cli/lsp/resolver.rs @@ -1,28 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -use crate::args::create_default_npmrc; -use crate::args::CacheSetting; -use crate::args::CliLockfile; -use crate::args::NpmInstallDepsProvider; -use crate::graph_util::CliJsrUrlProvider; -use crate::http_util::HttpClientProvider; -use crate::lsp::config::Config; -use crate::lsp::config::ConfigData; -use crate::lsp::logging::lsp_warn; -use crate::npm::create_cli_npm_resolver_for_lsp; -use crate::npm::CliNpmResolver; -use crate::npm::CliNpmResolverByonmCreateOptions; -use crate::npm::CliNpmResolverCreateOptions; -use crate::npm::CliNpmResolverManagedCreateOptions; -use crate::npm::CliNpmResolverManagedSnapshotOption; -use crate::npm::ManagedCliNpmResolver; -use crate::resolver::CjsResolutionStore; -use crate::resolver::CliGraphResolver; -use crate::resolver::CliGraphResolverOptions; -use crate::resolver::CliNodeResolver; -use crate::resolver::WorkerCliNpmGraphResolver; -use crate::util::progress_bar::ProgressBar; -use crate::util::progress_bar::ProgressBarStyle; use dashmap::DashMap; use deno_ast::MediaType; use deno_cache_dir::HttpCache; @@ -55,6 +32,29 @@ use std::sync::Arc; use super::cache::LspCache; use super::jsr::JsrCacheResolver; +use crate::args::create_default_npmrc; +use crate::args::CacheSetting; +use crate::args::CliLockfile; +use crate::args::NpmInstallDepsProvider; +use crate::graph_util::CliJsrUrlProvider; +use crate::http_util::HttpClientProvider; +use crate::lsp::config::Config; +use crate::lsp::config::ConfigData; +use crate::lsp::logging::lsp_warn; +use crate::npm::create_cli_npm_resolver_for_lsp; +use crate::npm::CliNpmResolver; +use crate::npm::CliNpmResolverByonmCreateOptions; +use crate::npm::CliNpmResolverCreateOptions; +use crate::npm::CliNpmResolverManagedCreateOptions; +use crate::npm::CliNpmResolverManagedSnapshotOption; +use crate::npm::ManagedCliNpmResolver; +use crate::resolver::CjsResolutionStore; +use crate::resolver::CliGraphResolver; +use crate::resolver::CliGraphResolverOptions; +use crate::resolver::CliNodeResolver; +use crate::resolver::WorkerCliNpmGraphResolver; +use crate::util::progress_bar::ProgressBar; +use crate::util::progress_bar::ProgressBarStyle; #[derive(Debug, Clone)] struct LspScopeResolver { diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs index 6d3e1317b..fe3708d3c 100644 --- a/cli/lsp/tsc.rs +++ b/cli/lsp/tsc.rs @@ -39,7 +39,6 @@ use deno_core::convert::ToV8; use deno_core::error::StdAnyError; use deno_core::futures::stream::FuturesOrdered; use deno_core::futures::StreamExt; -use deno_runtime::fs_util::specifier_to_file_path; use dashmap::DashMap; use deno_ast::MediaType; @@ -63,6 +62,7 @@ use deno_core::ModuleSpecifier; use deno_core::OpState; use deno_core::PollEventLoopOptions; use deno_core::RuntimeOptions; +use deno_runtime::fs_util::specifier_to_file_path; use deno_runtime::inspector_server::InspectorServer; use deno_runtime::tokio_util::create_basic_runtime; use indexmap::IndexMap; |