@lokascript/language-server 3.1.0 → 3.2.0

package/dist/server.js

@@ -1798,18 +1798,23 @@ async function validateDocument(document) {
         ...d,
         source: getBranding(resolvedMode)
       })) : await getDiagnostics(region.code, globalSettings.language);
+      const toDocument = (range) => ({
+        start: {
+          line: region.startLine + range.start.line,
+          character: range.start.line === 0 ? region.startChar + range.start.character : range.start.character
+        },
+        end: {
+          line: region.startLine + range.end.line,
+          character: range.end.line === 0 ? region.startChar + range.end.character : range.end.character
+        }
+      });
       for (const diag of diagnostics) {
+        const collision = nameCollisionData(diag);
         allDiagnostics.push({
           ...diag,
-          range: {
-            start: {
-              line: region.startLine + diag.range.start.line,
-              character: diag.range.start.line === 0 ? region.startChar + diag.range.start.character : diag.range.start.character
-            },
-            end: {
-              line: region.startLine + diag.range.end.line,
-              character: diag.range.end.line === 0 ? region.startChar + diag.range.end.character : diag.range.end.character
-            }
+          range: toDocument(diag.range),
+          ...collision && {
+            data: { ...collision, ranges: collision.ranges.map(toDocument) }
           }
         });
       }
@@ -1819,6 +1824,33 @@ async function validateDocument(document) {
   }
   connection.sendDiagnostics({ uri, diagnostics: allDiagnostics });
 }
+function nameCollisionData(diagnostic) {
+  const data = diagnostic.data;
+  return diagnostic.code === "name-collision" && data?.name && data.rename && data.ranges ? data : void 0;
+}
+function nameCollisionDiagnostics(code, language, source) {
+  const find = semanticPackage?.findNameCollisions;
+  if (typeof find !== "function") return [];
+  const diagnostics = [];
+  for (const finding of find(code, language)) {
+    const ranges = finding.occurrences.map(({ start, end }) => ({
+      start: offsetToPosition(code, start),
+      end: offsetToPosition(code, end)
+    }));
+    const message = finding.rename ? `${finding.message} Rename it (to \`${finding.rename}\`, say).` : finding.message;
+    for (const range of ranges) {
+      diagnostics.push({
+        range,
+        severity: DiagnosticSeverity2.Warning,
+        code: "name-collision",
+        source,
+        message,
+        ...finding.rename && { data: { name: finding.name, rename: finding.rename, ranges } }
+      });
+    }
+  }
+  return diagnostics;
+}
 async function getDiagnostics(code, language) {
   const diagnostics = [];
   const brand = getBranding(resolvedMode);
@@ -1886,6 +1918,9 @@ async function getDiagnostics(code, language) {
         });
       }
       semanticParsedForeign = result.confidence >= 0.5 && usedLanguage !== "en";
+      if (semanticParsedForeign) {
+        diagnostics.push(...nameCollisionDiagnostics(code, usedLanguage, brand));
+      }
       if (result.confidence >= 0.5 && result.command) {
         const cmd = result.command.name;
         const roles = result.command.roles;
@@ -2775,7 +2810,26 @@ function extractSymbols(code, language) {
 connection.onCodeAction((params) => {
   const diagnostics = params.context.diagnostics;
   const actions = [];
+  const renamed = /* @__PURE__ */ new Set();
   for (const diagnostic of diagnostics) {
+    const collision = nameCollisionData(diagnostic);
+    if (collision && !renamed.has(collision.name)) {
+      renamed.add(collision.name);
+      actions.push({
+        title: `Rename \`${collision.name}\` to \`${collision.rename}\``,
+        kind: CodeActionKind.QuickFix,
+        diagnostics: [diagnostic],
+        isPreferred: true,
+        edit: {
+          changes: {
+            [params.textDocument.uri]: collision.ranges.map((range) => ({
+              range,
+              newText: collision.rename
+            }))
+          }
+        }
+      });
+    }
     if (diagnostic.code === "missing-role" && diagnostic.message.includes("toggle")) {
       actions.push({
         title: "Add class target to toggle",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lokascript/language-server",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "description": "Language Server Protocol implementation for LokaScript/hyperscript with 24 language support",
   "type": "module",
   "main": "dist/server.js",
@@ -28,13 +28,13 @@
   "author": "LokaScript Contributors",
   "license": "MIT",
   "dependencies": {
-    "@lokascript/framework": "^3.1.0",
-    "@lokascript/semantic": "^3.1.0",
+    "@lokascript/framework": "^3.2.0",
+    "@lokascript/semantic": "^3.2.0",
     "vscode-languageserver": "^9.0.1",
-    "vscode-languageserver-textdocument": "^1.0.11"
+    "vscode-languageserver-textdocument": "^1.0.15"
   },
   "peerDependencies": {
-    "@hyperfixi/core": "^3.1.0"
+    "@hyperfixi/core": "^3.2.0"
   },
   "peerDependenciesMeta": {
     "@hyperfixi/core": {
@@ -42,13 +42,13 @@
     }
   },
   "devDependencies": {
-    "@hyperfixi/core": "^3.1.0",
-    "@types/node": "^26.1.2",
-    "@vitest/coverage-v8": "^4.0.0",
+    "@hyperfixi/core": "^3.2.0",
+    "@types/node": "^26.6.3",
+    "@vitest/coverage-v8": "^5.0.0",
     "tsup": "^8.0.0",
-    "tsx": "^4.23.1",
+    "tsx": "^4.23.15",
     "typescript": "^5.0.0",
-    "vitest": "^4.1.5"
+    "vitest": "^5.0.2"
   },
   "files": [
     "dist",