dsh-vscode-mode 0.1.44 → 0.1.46

package/lib/index.js

@@ -112,15 +112,18 @@ async function refreshMcp(ctx, id) {
 /**
 * dsh-vscode-mode shared — 快捷键命令目录与默认键位（双面契约）。
 * 纯数据模块：host（settings schema 默认值）与 client（执行匹配/设置页）共用。
-* 键位格式：修饰符 + 主键，`+` 连接，如 `Ctrl+Shift+F`；空串 = 未绑定。
+* 键位格式：修饰符 + 主键，`+` 连接，如 `Ctrl+Shift+F`；空串 = 未绑定；
+* `|` 连接多个候选（任一命中即触发），如 `Alt+ArrowLeft|Ctrl+Alt+-`。
 * 作者 ddj 2026年08月26号
 */
-/** 命令 id → 默认键位。命令目录以此为准，新增命令只需加一项。 */
+/** 命令 id → 默认键位（可为多候选）。命令目录以此为准，新增命令只需加一项。 */
 const KEYBINDING_DEFAULTS = {
 	"edrv.save": "Ctrl+S",
 	"edrv.quickOpen": "Ctrl+P",
 	"edrv.toggleSidebar": "Ctrl+B",
-	"edrv.searchInFiles": "Ctrl+Shift+F"
+	"edrv.searchInFiles": "Ctrl+Shift+F",
+	"edrv.navigateBack": "Alt+ArrowLeft|Ctrl+Alt+-",
+	"edrv.navigateForward": "Alt+ArrowRight|Ctrl+Shift+-"
 };
 //#endregion
 //#region src/fileOpenSettings.ts
@@ -5757,6 +5760,7 @@ function createLspClient(transport, events = {}) {
 	const pending = /* @__PURE__ */ new Map();
 	let serverCapabilities = {
 		definition: false,
+		declaration: false,
 		references: false,
 		documentSymbol: false,
 		workspaceSymbol: false,
@@ -5891,6 +5895,7 @@ function createLspClient(transport, events = {}) {
 							didSave: true
 						},
 						definition: { dynamicRegistration: false },
+						declaration: { dynamicRegistration: false },
 						references: { dynamicRegistration: false },
 						documentSymbol: { dynamicRegistration: false },
 						hover: { dynamicRegistration: false },
@@ -5910,6 +5915,7 @@ function createLspClient(transport, events = {}) {
 			const legend = caps.semanticTokensProvider?.legend;
 			serverCapabilities = {
 				definition: Boolean(caps.definitionProvider),
+				declaration: Boolean(caps.declarationProvider),
 				references: Boolean(caps.referencesProvider),
 				documentSymbol: Boolean(caps.documentSymbolProvider),
 				workspaceSymbol: Boolean(caps.workspaceSymbolProvider),
@@ -5963,6 +5969,73 @@ function pathToFileUri(absPath) {
 	return pathToFileURL(normalized).toString();
 }
 //#endregion
+//#region src/lsp/derive.ts
+/** file:// URI（或裸路径）→ 归一化绝对路径（小写、/ 分隔）。 */
+function normAbs(uri) {
+	const path = String(uri ?? "").replace(/^file:\/\/\/?/, "");
+	return decodeURIComponent(path).replace(/\\/g, "/").replace(/^\/([A-Za-z]:)/, "$1").toLowerCase();
+}
+/** 取文档 text 在 LSP range（0-based）内的切片。 */
+function sliceRange(text, range) {
+	const lines = text.split(/\r\n|\r|\n/);
+	const start = range.start;
+	const end = range.end;
+	const startLine = Math.max(0, start.line);
+	const endLine = Math.max(startLine, end.line);
+	if (startLine >= lines.length || endLine >= lines.length) return "";
+	const startChar = Math.max(0, start.character);
+	if (startLine === endLine) return lines[startLine].slice(startChar, Math.max(startChar, end.character));
+	const first = lines[startLine].slice(startChar);
+	const middle = lines.slice(startLine + 1, endLine);
+	const last = lines[endLine].slice(0, Math.max(0, end.character));
+	return [
+		first,
+		...middle,
+		last
+	].join("\n");
+}
+/** LSP position 是否落在 range 内（start 包含、end 排除；零宽按点匹配）。 */
+function posInLspRange(pos, range) {
+	const start = range.start;
+	const end = range.end ?? start;
+	if (start.line === end.line && start.character === end.character) return pos.line === start.line && pos.character === start.character;
+	if (pos.line < start.line || pos.line > end.line) return false;
+	if (pos.line === start.line && pos.character < start.character) return false;
+	if (pos.line === end.line && pos.character >= end.character) return false;
+	return true;
+}
+/** 两个 range 是否完全一致。 */
+function sameRange(a, b) {
+	return a.start.line === b.start.line && a.start.character === b.start.character && a.end.line === b.end.line && a.end.character === b.end.character;
+}
+/** range 长度（行/列均按 0-based 差估算，仅用于取"最小包裹"排序）。 */
+function rangeSize(r) {
+	return (r.end.line - r.start.line) * 1e6 + (r.end.line === r.start.line ? r.end.character - r.start.character : r.end.character);
+}
+/**
+* 从引用列表推导定义位置。
+* @author ddj 2026年09月02号
+* @param queryPos 查询位置（LSP 0-based）
+* @param locations references(includeDeclaration) 结果
+* @param docText 当前文档全文（词文本一致校验）
+* @param docAbsPath 当前文档绝对路径（root+相对路径，与 loc.uri 归一化后比较）
+* @returns 推导出的定义位置；无法确定返回 null
+*/
+function deriveDefinitionFromLocations(queryPos, locations, docText, docAbsPath) {
+	if (!locations.length) return null;
+	const docAbs = normAbs(docAbsPath);
+	const containing = locations.filter((loc) => posInLspRange(queryPos, loc.range)).sort((a, b) => rangeSize(a.range) - rangeSize(b.range))[0];
+	if (!containing) return null;
+	const queryWord = sliceRange(docText, containing.range);
+	if (!queryWord) return null;
+	const candidates = locations.filter((loc) => {
+		return normAbs(loc.uri) === docAbs && sliceRange(docText, loc.range) === queryWord;
+	});
+	if (!candidates.length) return null;
+	const first = candidates[0];
+	return sameRange(first.range, containing.range) ? containing : first;
+}
+//#endregion
 //#region src/lsp/server.ts
 /**
 * dsh-vscode-mode host — 单语言服务器会话（绑定 工作区根 + 语言）。
@@ -5987,6 +6060,7 @@ function createLspServer(spec, root, languageId, logger) {
 	let client = null;
 	let capabilities = {
 		definition: false,
+		declaration: false,
 		references: false,
 		documentSymbol: false,
 		workspaceSymbol: false,
@@ -6170,13 +6244,42 @@ function createLspServer(spec, root, languageId, logger) {
 		async definition(path, line, character) {
 			const doc = docs.get(path);
 			if (!doc || !await readyWait) return [];
-			return normalizeLocations(await ensureClient().request("textDocument/definition", {
+			const client = ensureClient();
+			const position = {
+				line,
+				character
+			};
+			const direct = normalizeLocations(await client.request("textDocument/definition", {
 				textDocument: { uri: doc.uri },
-				position: {
-					line,
-					character
-				}
+				position
 			}));
+			if (direct.length) return direct;
+			if (capabilities.declaration) try {
+				const decl = normalizeLocations(await client.request("textDocument/declaration", {
+					textDocument: { uri: doc.uri },
+					position
+				}));
+				if (decl.length) {
+					log("definition fallback → declaration (" + path + ":" + line + ":" + character + ")");
+					return decl;
+				}
+			} catch (error) {
+				log("declaration request failed: " + String(error));
+			}
+			try {
+				const derived = deriveDefinitionFromLocations(position, normalizeLocations(await client.request("textDocument/references", {
+					textDocument: { uri: doc.uri },
+					position,
+					context: { includeDeclaration: true }
+				})), doc.text, doc.uri);
+				if (derived) {
+					log("definition fallback → references-derived (" + path + ":" + line + ":" + character + ")");
+					return [derived];
+				}
+			} catch (error) {
+				log("references fallback failed: " + String(error));
+			}
+			return [];
 		},
 		async references(path, line, character, includeDeclaration) {
 			const doc = docs.get(path);