@knip/language-server 3.1.2 → 3.1.3

package/README.md

@@ -108,7 +108,8 @@ Optionally, the client can implement:
 - Show contention: ambiguous or shadowed exports behind re-exports
 - Show contention: converged (diamond-shaped) re-export paths
 
-Each `File.contention[name].sites` entry describes where contention occurs, its kind, and the originating bindings.
+Each `File.contention[name].sites` entry describes where contention occurs, its
+kind, and the originating bindings.
 
 Example:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knip/language-server",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/webpro-nl/knip.git",
@@ -18,7 +18,7 @@
     "./constants": "./src/constants.js"
   },
   "dependencies": {
-    "knip": "^6.44.0",
+    "knip": "^6.44.1",
     "vscode-languageserver": "^10.1.2",
     "vscode-languageserver-textdocument": "^1.0.16"
   },

package/src/server.js

@@ -100,6 +100,10 @@ export class LanguageServer {
   session;
 
   revision = 0;
+
+  /** @type {undefined | number} */
+  failedRevision;
+
   /** @type {Rules}  */
   rules = {};
 
@@ -276,6 +280,7 @@ export class LanguageServer {
       this.connection.sendNotification(NOTIFICATION_MODULE_GRAPH_BUILT, { duration: Date.now() - start });
     } catch (_error) {
       if (revision !== this.revision) return;
+      this.failedRevision = revision;
       this.connection.console.error(`Error: ${_error}`);
     }
   }
@@ -308,8 +313,8 @@ export class LanguageServer {
   async handleFileChanges(params) {
     this.fileCache = undefined;
     this.packageJsonCache = undefined;
-    if (!this.session) return;
     const session = this.session;
+    if (!session && this.failedRevision !== this.revision) return;
 
     const cwd = this.cwd ?? process.cwd();
 
@@ -325,7 +330,7 @@ export class LanguageServer {
       changes.push({ type, filePath });
     }
 
-    if (changes.length === 0) return;
+    if (!session || changes.length === 0) return;
 
     try {
       const result = await session.handleFileChanges(changes);

package/test/lifecycle.test.js

@@ -27,6 +27,7 @@ const cwd = mkdtempSync(path.join(tmpdir(), 'knip-ls-lifecycle-'));
 after(() => rmSync(cwd, { recursive: true, force: true }));
 const filePath = path.join(cwd, 'value.js');
 const changes = { changes: [{ uri: pathToFileURL(filePath).href, type: 2 }] };
+const changed = file => ({ changes: [{ uri: pathToFileURL(path.join(cwd, file)).href, type: 2 }] });
 const updated = { duration: 1, mem: 1024 };
 const config = { editor: { exports: { quickfix: { enabled: true } } } };
 const options = { rules: { exports: 'warn' } };
@@ -134,6 +135,53 @@ test('overlapping starts retain the latest session and ignore obsolete startup e
   assert.equal(connection.sendNotification.mock.callCount(), 1);
 });
 
+for (const file of ['knip.json', 'package.json']) {
+  test(`${file} change restarts after a failed start`, { timeout: 3000 }, async t => {
+    const server = setup(t);
+    let calls = 0;
+    t.mock.method(knip, 'createOptions', async () => {
+      if (++calls === 1) throw new Error('invalid config');
+      return options;
+    });
+    await server.start();
+    assert.equal(server.getResults(), null);
+    assert.equal(connection.console.error.mock.callCount(), 1);
+    await server.handleFileChanges(changed(file));
+    assert.equal(calls, 2);
+    assert.deepEqual(server.getResults(), { name: 'current' });
+    assert.equal(connection.sendNotification.mock.callCount(), 1);
+  });
+}
+
+test('config change does not start a server stopped after a failed start', { timeout: 3000 }, async t => {
+  const server = setup(t);
+  let calls = 0;
+  t.mock.method(knip, 'createOptions', async () => {
+    calls++;
+    throw new Error('invalid config');
+  });
+  await server.start();
+  server.stop();
+  await server.handleFileChanges(changed('knip.json'));
+  assert.equal(calls, 1);
+  assert.equal(server.getResults(), null);
+  assert.equal(connection.sendNotification.mock.callCount(), 0);
+});
+
+test('source change after a failed start neither restarts nor updates', { timeout: 3000 }, async t => {
+  const server = setup(t);
+  let calls = 0;
+  t.mock.method(knip, 'createOptions', async () => {
+    calls++;
+    throw new Error('invalid config');
+  });
+  await server.start();
+  await server.handleFileChanges(changes);
+  assert.equal(calls, 1);
+  assert.equal(server.getResults(), null);
+  assert.equal(connection.console.error.mock.callCount(), 1);
+});
+
 test('graph updates invalidate descriptors requested during the update and notify without diagnostics', async t => {
   const server = setup(t);
   let session = createSession('before');