2 files changed, 53 insertions, 2 deletions

diff --git a/tests/integration/lsp_tests.rs b/tests/integration/lsp_tests.rs
index 862de41f6..5ec3117e6 100644
--- a/tests/integration/lsp_tests.rs
+++ b/tests/integration/lsp_tests.rs
@@ -12253,3 +12253,40 @@ C.test();
 
   client.shutdown();
 }
+
+#[test]
+fn lsp_uses_lockfile_for_npm_initialization() {
+  let context = TestContextBuilder::for_npm().use_temp_cwd().build();
+  let temp_dir = context.temp_dir();
+  temp_dir.write("deno.json", "{}");
+  // use two npm packages here
+  temp_dir.write("main.ts", "import 'npm:@denotest/esm-basic'; import 'npm:@denotest/cjs-default-export';");
+  context
+    .new_command()
+    .args("run main.ts")
+    .run()
+    .skip_output_check();
+  // remove one of the npm packages and let the other one be found via the lockfile
+  temp_dir.write("main.ts", "import 'npm:@denotest/esm-basic';");
+  assert!(temp_dir.path().join("deno.lock").exists());
+  let mut client = context
+    .new_lsp_command()
+    .capture_stderr()
+    .log_debug()
+    .build();
+  client.initialize_default();
+  let mut skipping_count = 0;
+  client.wait_until_stderr_line(|line| {
+    if line.contains("Skipping pending npm resolution.") {
+      skipping_count += 1;
+    }
+    assert!(
+      !line.contains("Running pending npm resolution."),
+      "Line: {}",
+      line
+    );
+    line.contains("Server ready.")
+  });
+  assert_eq!(skipping_count, 1);
+  client.shutdown();
+}
diff --git a/tests/util/server/src/lsp.rs b/tests/util/server/src/lsp.rs
index be455b463..07b63c8a8 100644
--- a/tests/util/server/src/lsp.rs
+++ b/tests/util/server/src/lsp.rs
@@ -464,6 +464,7 @@ impl InitializeParamsBuilder {
 pub struct LspClientBuilder {
   print_stderr: bool,
   capture_stderr: bool,
+  log_debug: bool,
   deno_exe: PathRef,
   root_dir: PathRef,
   use_diagnostic_sync: bool,
@@ -481,6 +482,7 @@ impl LspClientBuilder {
     Self {
       print_stderr: false,
       capture_stderr: false,
+      log_debug: false,
       deno_exe: deno_exe_path(),
       root_dir: deno_dir.path().clone(),
       use_diagnostic_sync: true,
@@ -507,6 +509,11 @@ impl LspClientBuilder {
     self
   }
 
+  pub fn log_debug(mut self) -> Self {
+    self.log_debug = true;
+    self
+  }
+
   /// Whether to use the synchronization messages to better sync diagnostics
   /// between the test client and server.
   pub fn use_diagnostic_sync(mut self, value: bool) -> Self {
@@ -537,6 +544,10 @@ impl LspClientBuilder {
   pub fn build_result(&self) -> Result<LspClient> {
     let deno_dir = self.deno_dir.clone();
     let mut command = Command::new(&self.deno_exe);
+    let mut args = vec!["lsp".to_string()];
+    if self.log_debug {
+      args.push("--log-level=debug".to_string());
+    }
     command
       .env("DENO_DIR", deno_dir.path())
       .env("NPM_CONFIG_REGISTRY", npm_registry_url())
@@ -547,7 +558,7 @@ impl LspClientBuilder {
         if self.use_diagnostic_sync { "1" } else { "" },
       )
       .env("DENO_NO_UPDATE_CHECK", "1")
-      .arg("lsp")
+      .args(args)
       .stdin(Stdio::piped())
       .stdout(Stdio::piped());
     for (key, value) in &self.envs {
@@ -651,7 +662,10 @@ impl LspClient {
   }
 
   #[track_caller]
-  pub fn wait_until_stderr_line(&self, condition: impl Fn(&str) -> bool) {
+  pub fn wait_until_stderr_line(
+    &self,
+    mut condition: impl FnMut(&str) -> bool,
+  ) {
     let timeout_time =
       Instant::now().checked_add(Duration::from_secs(5)).unwrap();
     let lines_rx = self