@x18n/lsp 0.0.12 → 0.0.14

package/dist/index.d.mts

@@ -97,6 +97,8 @@ export interface UsageReportResult {
 }
 export interface Decoration {
   readonly range: Range;
+  /** The whole call holding the key, when the scanner knows it. */
+  readonly expression?: Range | undefined;
   readonly key: string;
   readonly value: string | undefined;
   readonly state: "ok" | "missing" | "dynamic";

package/dist/src.mjs

@@ -1,7 +1,7 @@
 import { relative, resolve, sep } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { extractItems, findCandidates } from "@x18n/builtins/extractors";
-import { createLineIndex, createOverlayHost, isX18nError, renderPrompt } from "@x18n/core";
+import { createLineIndex, createOverlayHost, isX18nError, joinKey, renderPrompt, splitKey } from "@x18n/core";
 import { loadWorkspace, migrateI18nAlly } from "@x18n/node";
 import { CodeActionKind, CompletionItemKind, DiagnosticSeverity, DidChangeWatchedFilesNotification, FileChangeType, ResponseError, SymbolKind, TextDocumentSyncKind, TextDocuments } from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
@@ -28,7 +28,7 @@ const commands = {
 };
 //#endregion
 //#region package.json
-var version = "0.0.12";
+var version = "0.0.14";
 //#endregion
 //#region src/server.ts
 const severities = {
@@ -61,7 +61,9 @@ function changedAt(change) {
 		change.author
 	].filter(Boolean).join(" · ");
 }
-const posix = (path) => sep === "\\" ? path.replace(/\\/g, "/") : path;
+function posix(path) {
+	return sep === "\\" ? path.replace(/\\/g, "/") : path;
+}
 var Server = class {
 	connection;
 	options;
@@ -72,7 +74,8 @@ var Server = class {
 	settings = {
 		annotationMaxLength: 40,
 		displayLocale: void 0,
-		codeLens: false
+		codeLens: false,
+		showFlags: true
 	};
 	ready = Promise.resolve();
 	folders = [];
@@ -178,6 +181,7 @@ var Server = class {
 		if (typeof settings?.displayLocale === "string") this.settings.displayLocale = settings.displayLocale;
 		if (typeof settings?.annotationMaxLength === "number") this.settings.annotationMaxLength = settings.annotationMaxLength;
 		if (typeof settings?.codeLens === "boolean") this.settings.codeLens = settings.codeLens;
+		if (typeof settings?.showFlags === "boolean") this.settings.showFlags = settings.showFlags;
 		return {
 			serverInfo: {
 				name: "x18n",
@@ -409,7 +413,8 @@ var Server = class {
 				const value = display(project.lookup(target.key, locale)?.value);
 				const change = changes[i];
 				const changed = dated ? ` ${change ? changedAt(change).replace(/\|/g, "\\|") : ""}${outdated.has(locale) ? " · **outdated**" : ""} |` : "";
-				lines.push(`| ${project.localeInfo(locale).flag ?? ""} ${locale} | ${value === void 0 ? "_missing_" : value === "" ? "_empty_" : value.replace(/\|/g, "\\|").replace(/\n/g, " ")} |${changed}`);
+				const flag = this.settings.showFlags ? project.localeInfo(locale).flag : void 0;
+				lines.push(`| ${flag ?? ""} ${locale} | ${value === void 0 ? "_missing_" : value === "" ? "_empty_" : value.replace(/\|/g, "\\|").replace(/\n/g, " ")} |${changed}`);
 			});
 		}
 		const usages = target.type === "subtree" ? project.usages({ prefix: target.key }) : project.usages({ key: target.key });
@@ -417,7 +422,7 @@ var Server = class {
 			project: at.entry.name,
 			key: target.key
 		}]));
-		lines.push("", `${usages.length} usage${usages.length === 1 ? "" : "s"} · [Open in UI](command:x18n.openKey?${args}) · [Copy translate prompt](command:x18n.copyTranslatePrompt?${args})`);
+		lines.push("", `${usages.length} usage${usages.length === 1 ? "" : "s"} · [Open in UI](command:x18n.openKey?${args}) · [Copy translate prompt](command:x18n.copyTranslatePrompt?${args}) · [Translate with agent](command:x18n.translateWithAgent?${args})`);
 		return {
 			contents: {
 				kind: "markdown",
@@ -458,9 +463,16 @@ var Server = class {
 		const scopeNs = usage?.scopeNamespace ?? project.config.namespace.default;
 		const prefix = usage?.scopePrefix ? `${usage.scopePrefix}.` : "";
 		const range = this.range(at.entry, at.path, slot);
-		return project.keys().flatMap((key) => {
+		const { separator, fallback } = project.config.namespace;
+		const keys = project.keys();
+		const known = new Set(keys);
+		return keys.flatMap((key) => {
 			let insert = key;
-			if (project.namespaced && key.startsWith(`${scopeNs}:`)) insert = key.slice(scopeNs.length + 1);
+			if (project.namespaced) {
+				const { namespace, path } = splitKey(key);
+				const bare = path.join(".");
+				insert = namespace === scopeNs || namespace !== void 0 && fallback.includes(namespace) && !known.has(joinKey(scopeNs, path)) || namespace === void 0 ? bare : `${namespace}${separator}${bare}`;
+			}
 			if (prefix) {
 				if (!insert.startsWith(prefix)) return [];
 				insert = insert.slice(prefix.length);
@@ -819,6 +831,7 @@ var Server = class {
 				const state = usage.dynamic !== false ? "dynamic" : value === void 0 ? "missing" : "ok";
 				return [{
 					range: this.range(entry, path, usage.range),
+					...usage.expression ? { expression: this.range(entry, path, usage.expression) } : {},
 					key: usage.key,
 					value,
 					state

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@x18n/lsp",
   "type": "module",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "x18n language server for any LSP editor",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -29,10 +29,10 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@x18n/builtins": "0.0.12",
-    "@x18n/core": "0.0.12",
-    "@x18n/node": "0.0.12",
-    "@x18n/ui": "0.0.12",
+    "@x18n/builtins": "0.0.14",
+    "@x18n/core": "0.0.14",
+    "@x18n/node": "0.0.14",
+    "@x18n/ui": "0.0.14",
     "devframe": "^1.2.6",
     "vscode-languageserver": "^10.1.2",
     "vscode-languageserver-textdocument": "^1.0.15"