@knip/language-server 3.1.0 → 3.1.1

package/README.md

@@ -105,8 +105,10 @@ with direct links to their usage locations.
 Optionally, the client can implement:
 
 - Follow cursor between open document and highlight export in view
-- Show contention: naming conflicts through re-exports
-- Show contention: branched/diamond-shaped re-export structures
+- 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.
 
 Example:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knip/language-server",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/webpro-nl/knip.git",
@@ -20,7 +20,7 @@
   "dependencies": {
     "vscode-languageserver": "^10.1.1",
     "vscode-languageserver-textdocument": "^1.0.14",
-    "knip": "^6.35.0"
+    "knip": "^6.36.0"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"

package/src/code-actions.js

@@ -40,6 +40,15 @@ export const createRemoveDependencyEdit = (document, uri, issue) => {
     const range = { start: { line: lineIndex, character: 0 }, end: { line: lineIndex + 1, character: 0 } };
     const edits = [TextEdit.del(range)];
 
+    if (lineIndex > 0 && !document.getText(range).trimEnd().endsWith(',')) {
+      const prevRange = { start: { line: lineIndex - 1, character: 0 }, end: { line: lineIndex, character: 0 } };
+      const prevLine = document.getText(prevRange).trimEnd();
+      if (prevLine.endsWith(',')) {
+        const start = { line: lineIndex - 1, character: prevLine.length - 1 };
+        edits.push(TextEdit.del({ start, end: { line: lineIndex - 1, character: prevLine.length } }));
+      }
+    }
+
     return { changes: { [uri]: edits } };
   } catch (_error) {
     return null;

package/src/server.js

@@ -237,7 +237,7 @@ export class LanguageServer {
       } catch {}
     }
     this.connection.console.log(
-      `Using bundled knip${readKnipVersion(createRequire(__filename).resolve('knip/session'))}`
+      `Using bundled knip${readKnipVersion(createRequire(import.meta.url).resolve('knip/session'))}`
     );
     return { createOptions, createSession };
   }

package/test/code-actions.test.js

@@ -0,0 +1,55 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { createRemoveDependencyEdit } from '../src/code-actions.js';
+
+const uri = 'file:///project/package.json';
+
+const manifest = (eol = '\n') =>
+  [
+    '{',
+    '  "name": "project",',
+    '  "dependencies": {',
+    '    "react": "^19.0.0",',
+    '    "lodash": "^4.17.21",',
+    '    "chalk": "^5.0.0"',
+    '  },',
+    '  "devDependencies": {',
+    '    "typescript": "^5.0.0"',
+    '  }',
+    '}',
+    '',
+  ].join(eol);
+
+const remove = (text, symbol) => {
+  const document = TextDocument.create(uri, 'json', 1, text);
+  const line = text.split(/\r?\n/).findIndex(l => l.includes(`"${symbol}"`)) + 1;
+  const edit = createRemoveDependencyEdit(document, uri, { type: 'dependencies', symbol, line });
+  return TextDocument.applyEdits(document, edit.changes[uri]);
+};
+
+for (const [label, eol] of [
+  ['LF', '\n'],
+  ['CRLF', '\r\n'],
+]) {
+  test(`removes first dependency (${label})`, () => {
+    const result = remove(manifest(eol), 'react');
+    assert.deepEqual(JSON.parse(result).dependencies, { lodash: '^4.17.21', chalk: '^5.0.0' });
+  });
+
+  test(`removes middle dependency (${label})`, () => {
+    const result = remove(manifest(eol), 'lodash');
+    assert.deepEqual(JSON.parse(result).dependencies, { react: '^19.0.0', chalk: '^5.0.0' });
+  });
+
+  test(`removes last dependency (${label})`, () => {
+    const result = remove(manifest(eol), 'chalk');
+    assert.deepEqual(JSON.parse(result).dependencies, { react: '^19.0.0', lodash: '^4.17.21' });
+    assert.ok(result.includes(`"lodash": "^4.17.21"${eol}  }`));
+  });
+
+  test(`removes sole dependency (${label})`, () => {
+    const result = remove(manifest(eol), 'typescript');
+    assert.deepEqual(JSON.parse(result).devDependencies, {});
+  });
+}

package/test/startup.test.js

@@ -0,0 +1,71 @@
+import assert from 'node:assert/strict';
+import { spawn } from 'node:child_process';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { NOTIFICATION_MODULE_GRAPH_BUILT } from '../src/constants.js';
+
+const cli = fileURLToPath(new URL('../src/cli.js', import.meta.url));
+
+const encode = payload => {
+  const body = JSON.stringify({ jsonrpc: '2.0', ...payload });
+  return `Content-Length: ${Buffer.byteLength(body)}\r\n\r\n${body}`;
+};
+
+test('falls back to bundled knip when the project has no local knip', async () => {
+  const cwd = mkdtempSync(path.join(tmpdir(), 'knip-ls-'));
+  writeFileSync(path.join(cwd, 'package.json'), '{"name":"standalone","main":"index.js"}');
+  writeFileSync(path.join(cwd, 'index.js'), '');
+
+  const server = spawn(process.execPath, [cli, '--stdio'], { cwd, stdio: ['pipe', 'pipe', 'pipe'] });
+  const logs = [];
+  let buffer = '';
+
+  const done = new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new Error(`Timeout. Logs:\n${logs.join('\n')}`)), 30_000);
+    server.stdout.on('data', chunk => {
+      buffer += chunk;
+      for (;;) {
+        const match = buffer.match(/Content-Length: (\d+)\r\n\r\n/);
+        if (!match || buffer.length < match.index + match[0].length + Number(match[1])) break;
+        const start = match.index + match[0].length;
+        const msg = JSON.parse(buffer.slice(start, start + Number(match[1])));
+        buffer = buffer.slice(start + Number(match[1]));
+        if (msg.method === 'window/logMessage') logs.push(msg.params.message);
+        if (msg.method === 'workspace/configuration') server.stdin.write(encode({ id: msg.id, result: [{}] }));
+        if (msg.method === NOTIFICATION_MODULE_GRAPH_BUILT) {
+          clearTimeout(timer);
+          resolve();
+        }
+      }
+    });
+  });
+
+  server.stdin.write(
+    encode({
+      id: 1,
+      method: 'initialize',
+      params: {
+        processId: process.pid,
+        capabilities: {},
+        workspaceFolders: [{ uri: pathToFileURL(cwd).href, name: 'standalone' }],
+      },
+    })
+  );
+  server.stdin.write(encode({ method: 'initialized', params: {} }));
+
+  try {
+    await done;
+  } finally {
+    server.kill();
+    rmSync(cwd, { recursive: true, force: true });
+  }
+
+  assert.ok(
+    logs.some(log => log.startsWith('Using bundled knip')),
+    logs.join('\n')
+  );
+  assert.ok(!logs.some(log => log.includes('ReferenceError')), logs.join('\n'));
+});