dot-language-support 4.2.0 → 4.2.1

package/README.md

@@ -1,4 +1,4 @@
-# dot-language-support [![CD](https://github.com/nikeee/dot-language-support/actions/workflows/CD.yml/badge.svg)](https://github.com/nikeee/dot-language-support/actions/workflows/CD.yml) [![CI](https://github.com/nikeee/dot-language-support/actions/workflows/CI.yml/badge.svg)](https://github.com/nikeee/dot-language-support/actions/workflows/CI.yml) ![Dependencies](https://img.shields.io/librariesio/release/npm/dot-language-support) [![npm version](https://img.shields.io/npm/v/dot-language-support)](https://www.npmjs.com/package/dot-language-support)
+# dot-language-support [![CD](https://github.com/nikeee/dot-language-support/actions/workflows/CD.yaml/badge.svg)](https://github.com/nikeee/dot-language-support/actions/workflows/CD.yaml) [![CI](https://github.com/nikeee/dot-language-support/actions/workflows/CI.yaml/badge.svg)](https://github.com/nikeee/dot-language-support/actions/workflows/CI.yaml) ![Dependencies](https://img.shields.io/librariesio/release/npm/dot-language-support) [![npm version](https://img.shields.io/npm/v/dot-language-support)](https://www.npmjs.com/package/dot-language-support)
 
 A language service library, written in TypeScript. Used by [dot-language-server](https://github.com/nikeee/dot-language-server) and [edotor.net](https://edotor.net).
 

package/dist/index.mjs

@@ -295,6 +295,13 @@ const characterCodes = {
 };
 //#endregion
 //#region src/service/util.ts
+function posRangeToRange(doc, sourceFile, pos, end) {
+	const start = pos === end ? pos : skipTrivia(sourceFile.content, pos);
+	return {
+		start: doc.positionAt(start),
+		end: doc.positionAt(end)
+	};
+}
 function getStart(sourceFile, node) {
 	return getTokenPosOfNode(sourceFile, node);
 }
@@ -3268,11 +3275,17 @@ function hover(doc, sourceFile, position) {
 	return getNodeHover(doc, sourceFile, node);
 }
 function getNodeHover(doc, sf, n) {
-	const contents = getHoverContents(n);
-	if (contents) return {
-		contents,
-		range: syntaxNodeToRange(doc, sf, n)
-	};
+	const result = getHoverContents(n);
+	if (result) {
+		const { pos, end } = result.range ?? {
+			pos: n.pos,
+			end: n.end
+		};
+		return {
+			contents: result.contents,
+			range: posRangeToRange(doc, sf, pos, end)
+		};
+	}
 }
 function getAssignedLabel(statement) {
 	const assignedLabel = statement.attributes.flatMap((a) => a.assignments)?.find((a) => getIdentifierText(a.leftId) === "label");
@@ -3288,37 +3301,63 @@ function getHoverContents(n) {
 						const labelMentions = (n.symbol?.references).map((e) => e.symbol?.members?.get("label")?.firstMention.parent);
 						for (let i = labelMentions.length; i >= 0; i--) {
 							const s = labelMentions[i];
-							if (s?.rightId) return `(node) ${getIdentifierText(n)}: ${getIdentifierText(s.rightId)}`;
+							if (s?.rightId) return { contents: `(node) ${getIdentifierText(n)}: ${getIdentifierText(s.rightId)}` };
 						}
 					} else if (parent.parent?.kind === syntaxKind.NodeStatement) {
 						const label = getAssignedLabel(parent.parent);
-						if (label) return `(node) ${getIdentifierText(n)}: ${label}`;
+						if (label) return { contents: `(node) ${getIdentifierText(n)}: ${label}` };
 					}
-					return `(node) ${getIdentifierText(n)}`;
+					return { contents: `(node) ${getIdentifierText(n)}` };
 				case syntaxKind.Assignment: {
 					const assignment = parent;
-					return `(assignment) \`${getIdentifierText(assignment.leftId)}\` = \`${getIdentifierText(assignment.rightId)}\``;
+					return {
+						contents: `(assignment) \`${getIdentifierText(assignment.leftId)}\` = \`${getIdentifierText(assignment.rightId)}\``,
+						range: {
+							pos: assignment.pos,
+							end: assignment.end
+						}
+					};
 				}
 				case syntaxKind.DirectedGraph: return getGraphHover(parent);
 				case syntaxKind.UndirectedGraph: return getGraphHover(parent);
 				case syntaxKind.SubGraphStatement: {
-					const sg = parent.subgraph;
-					return sg.id ? `(sub graph) ${getIdentifierText(sg.id)}` : "(sub graph)";
+					const sgs = parent;
+					const sg = sgs.subgraph;
+					return {
+						contents: sg.id ? `(sub graph) ${getIdentifierText(sg.id)}` : "(sub graph)",
+						range: {
+							pos: sgs.pos,
+							end: sgs.end
+						}
+					};
 				}
 				case syntaxKind.SubGraph: {
 					const sg = parent;
-					return sg.id ? `(sub graph) ${getIdentifierText(sg.id)}` : "(sub graph)";
+					return {
+						contents: sg.id ? `(sub graph) ${getIdentifierText(sg.id)}` : "(sub graph)",
+						range: {
+							pos: sg.pos,
+							end: sg.end
+						}
+					};
 				}
 				case syntaxKind.IdEqualsIdStatement: {
 					const idEqId = parent;
-					return `(graph property) \`${getIdentifierText(idEqId.leftId)}\` = \`${getIdentifierText(idEqId.rightId)}\``;
+					return {
+						contents: `(graph property) \`${getIdentifierText(idEqId.leftId)}\` = \`${getIdentifierText(idEqId.rightId)}\``,
+						range: {
+							pos: idEqId.pos,
+							end: idEqId.end
+						}
+					};
 				}
 				case syntaxKind.EdgeRhs: return getEdgeHover(parent);
 			}
-			return syntaxKindNames[parent.kind];
+			const fallbackParent = syntaxKindNames[parent.kind];
+			return fallbackParent ? { contents: fallbackParent } : void 0;
 		}
 		const fallback = syntaxKindNames[n.kind];
-		return fallback ? `(${fallback.toLowerCase()})` : void 0;
+		return fallback ? { contents: `(${fallback.toLowerCase()})` } : void 0;
 	}
 	switch (n.kind) {
 		case syntaxKind.GraphKeyword:
@@ -3335,7 +3374,13 @@ function getGraphHover(g) {
 	const direction = g.kind === syntaxKind.DirectedGraph ? "directed" : "undirected";
 	const graphId = g.id;
 	const strict = g.strict ? "strict " : "";
-	return graphId ? `(${strict}${direction} graph) ${getIdentifierText(graphId)}` : `(${strict}${direction} graph)`;
+	return {
+		contents: graphId ? `(${strict}${direction} graph) ${getIdentifierText(graphId)}` : `(${strict}${direction} graph)`,
+		range: {
+			pos: g.pos,
+			end: g.end
+		}
+	};
 }
 function getEdgeHover(n) {
 	const p = n.parent;
@@ -3346,8 +3391,15 @@ function getEdgeHover(n) {
 		source = curr.target;
 	}
 	if (source === void 0) source = p.source;
+	if (source === void 0) return void 0;
 	const edgeOpStr = getEdgeStr(n.operation.kind);
-	return source === void 0 ? void 0 : `(edge) ${getEdgeSourceOrTargetText(source)} ${edgeOpStr} ${getEdgeSourceOrTargetText(n.target)}`;
+	return {
+		contents: `(edge) ${getEdgeSourceOrTargetText(source)} ${edgeOpStr} ${getEdgeSourceOrTargetText(n.target)}`,
+		range: {
+			pos: source.pos,
+			end: n.target.end
+		}
+	};
 }
 function getEdgeSourceOrTargetText(n) {
 	return n.kind === syntaxKind.NodeId ? getIdentifierText(n.id) : n.id !== void 0 ? `${getIdentifierText(n.id)}` : "sub graph";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dot-language-support",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "Parser and language service for graphviz (dot) files",
   "keywords": [
     "dot",