summaryrefslogtreecommitdiff
path: root/cli/lsp
diff options
context:
space:
mode:
authorDavid Sherret <dsherret@users.noreply.github.com>2024-10-02 21:17:39 +0100
committerGitHub <noreply@github.com>2024-10-02 21:17:39 +0100
commitcac28b52621975137b86d4fd6efc32cecc10d682 (patch)
tree6338163b4be9d578dbe046a95c90cea274026b15 /cli/lsp
parentbbd4ae1bc12dc6b34d4a455015096b7113a5cec5 (diff)
feat(byonm): support `deno run npm:<package>` when package is not in package.json (#25981)
Closes https://github.com/denoland/deno/issues/25905
Diffstat (limited to 'cli/lsp')
-rw-r--r--cli/lsp/config.rs7
-rw-r--r--cli/lsp/language_server.rs6
2 files changed, 11 insertions, 2 deletions
diff --git a/cli/lsp/config.rs b/cli/lsp/config.rs
index c54de3a23..07fdd3c65 100644
--- a/cli/lsp/config.rs
+++ b/cli/lsp/config.rs
@@ -53,6 +53,7 @@ use super::logging::lsp_log;
use crate::args::discover_npmrc_from_workspace;
use crate::args::has_flag_env_var;
use crate::args::CliLockfile;
+use crate::args::CliLockfileReadFromPathOptions;
use crate::args::ConfigFile;
use crate::args::LintFlags;
use crate::args::LintOptions;
@@ -1931,7 +1932,11 @@ fn resolve_lockfile_from_path(
lockfile_path: PathBuf,
frozen: bool,
) -> Option<CliLockfile> {
- match CliLockfile::read_from_path(lockfile_path, frozen) {
+ match CliLockfile::read_from_path(CliLockfileReadFromPathOptions {
+ file_path: lockfile_path,
+ frozen,
+ skip_write: false,
+ }) {
Ok(value) => {
if value.filename.exists() {
if let Ok(specifier) = ModuleSpecifier::from_file_path(&value.filename)
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index 6ddbb1a51..90a2579f4 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -96,6 +96,7 @@ use crate::args::CaData;
use crate::args::CacheSetting;
use crate::args::CliOptions;
use crate::args::Flags;
+use crate::args::InternalFlags;
use crate::args::UnstableFmtOptions;
use crate::factory::CliFactory;
use crate::file_fetcher::FileFetcher;
@@ -3605,7 +3606,10 @@ impl Inner {
};
let cli_options = CliOptions::new(
Arc::new(Flags {
- cache_path: Some(self.cache.deno_dir().root.clone()),
+ internal: InternalFlags {
+ cache_path: Some(self.cache.deno_dir().root.clone()),
+ ..Default::default()
+ },
ca_stores: workspace_settings.certificate_stores.clone(),
ca_data: workspace_settings.tls_certificate.clone().map(CaData::File),
unsafely_ignore_certificate_errors: workspace_settings