dot-language-support 4.3.0 → 4.3.2

package/dist/index.mjs

@@ -903,7 +903,7 @@ var Parser = class {
 		const node = this.#createNode(syntaxKind.TextIdentifier);
 		const text = this.scanner.tokenValue;
 		this.#nextToken();
-		if (text === void 0) throw "Satisfy type checker";
+		if (text === void 0) throw new Error("Token value is undefined");
 		node.text = text;
 		return this.#finishNode(node);
 	}
@@ -917,7 +917,7 @@ var Parser = class {
 		if (this.#token() === syntaxKind.PlusToken) this.#nextToken();
 		const text = this.scanner.tokenValue;
 		this.#nextToken();
-		if (text === void 0) throw "Satisfy type checker";
+		if (text === void 0) throw new Error("Token value is undefined");
 		node.text = text;
 		return this.#finishNode(node);
 	}
@@ -929,7 +929,7 @@ var Parser = class {
 		const node = this.#createNode(syntaxKind.HtmlIdentifier);
 		const text = this.scanner.tokenValue;
 		this.#nextToken();
-		if (text === void 0) throw "Satisfy type checker";
+		if (text === void 0) throw new Error("Token value is undefined");
 		node.htmlContent = text;
 		return this.#finishNode(node);
 	}
@@ -937,7 +937,7 @@ var Parser = class {
 		const node = this.#createNode(syntaxKind.NumericIdentifier);
 		const text = this.scanner.tokenValue;
 		this.#nextToken();
-		if (text === void 0) throw "Satisfy type checker";
+		if (text === void 0) throw new Error("Token value is undefined");
 		node.text = text;
 		node.value = Number(text);
 		return this.#finishNode(node);
@@ -962,7 +962,7 @@ var Parser = class {
 				return this.#finishNode(subgraphStatement);
 			}
 			default: {
-				if (!this.#isIdentifier) debugger;
+				if (!this.#isIdentifier()) debugger;
 				if (this.#lookAhead(() => this.#isIdEqualsIdStatement())) return this.#parseIdEqualsIdStatement();
 				const ns = this.#parseNodeStatement();
 				if (ns.terminator !== void 0 || ns.attributes.length !== 0) return ns;
@@ -987,7 +987,7 @@ var Parser = class {
 				node.terminator = this.#parseOptionalToken(syntaxKind.SemicolonToken);
 				return this.#finishNode(node);
 			}
-			default: throw "This should never happen";
+			default: throw new Error("This should never happen");
 		}
 	}
 	#parseAttributeContainer() {
@@ -1000,12 +1000,12 @@ var Parser = class {
 		return this.#finishNode(node);
 	}
 	#isAssignmentStart() {
-		if (!this.#isIdentifier) debugger;
+		if (!this.#isIdentifier()) debugger;
 		this.#nextToken();
 		return this.#token() === syntaxKind.EqualsToken;
 	}
 	#parseIdEqualsIdStatement() {
-		if (!this.#isIdentifier) debugger;
+		if (!this.#isIdentifier()) debugger;
 		const leftIdentifier = this.#parseIdentifier();
 		const node = this.#createNode(syntaxKind.IdEqualsIdStatement, leftIdentifier.pos);
 		node.leftId = leftIdentifier;
@@ -1016,12 +1016,12 @@ var Parser = class {
 		return this.#finishNode(node);
 	}
 	#isIdEqualsIdStatement() {
-		if (!this.#isIdentifier) debugger;
+		if (!this.#isIdentifier()) debugger;
 		this.#nextToken();
 		return this.#token() === syntaxKind.EqualsToken;
 	}
 	#parseNodeStatement() {
-		if (!this.#isIdentifier) debugger;
+		if (!this.#isIdentifier()) debugger;
 		const node = this.#createNode(syntaxKind.NodeStatement);
 		node.id = this.#parseNodeId();
 		if (this.#token() === syntaxKind.OpenBracketToken) node.attributes = this.#parseList(parsingContext.AttributeContainerList, () => this.#parseAttributeContainer());
@@ -1075,7 +1075,7 @@ var Parser = class {
 		return this.#finishNode(result);
 	}
 	#parseAssignment() {
-		if (!this.#isIdentifier) debugger;
+		if (!this.#isIdentifier()) debugger;
 		const node = this.#createNode(syntaxKind.Assignment);
 		node.leftId = this.#parseIdentifier();
 		this.#parseExpectedToken(syntaxKind.EqualsToken);
@@ -1097,7 +1097,7 @@ var Parser = class {
 		return this.#finishNode(node);
 	}
 	#parseNodeId() {
-		if (!this.#isIdentifier) debugger;
+		if (!this.#isIdentifier()) debugger;
 		const node = this.#createNode(syntaxKind.NodeId);
 		node.id = this.#parseIdentifier();
 		node.port = this.#token() === syntaxKind.ColonToken ? this.#parsePortDeclaration() : void 0;
@@ -1178,7 +1178,7 @@ var Parser = class {
 			case parsingContext.EdgeRhsList: return this.#token() === syntaxKind.DirectedEdgeOp || this.#token() === syntaxKind.UndirectedEdgeOp;
 			case parsingContext.QuotedTextIdentifierConcatenation: return this.#token() === syntaxKind.StringLiteral || this.#token() === syntaxKind.PlusToken;
 			case parsingContext.StatementList: return this.#isIdentifier() || this.#token() === syntaxKind.SubgraphKeyword || this.#token() === syntaxKind.OpenBraceToken || this.#token() === syntaxKind.GraphKeyword || this.#token() === syntaxKind.EdgeKeyword || this.#token() === syntaxKind.NodeKeyword;
-			default: throw "This should never happen";
+			default: throw new Error("This should never happen");
 		}
 	}
 	#isListTerminator(context) {
@@ -1266,10 +1266,7 @@ var Parser = class {
 		this.#parseErrorAtCurrentToken(msg, parseError.ExpectationFailed);
 	}
 	#parseExpectedOneOf(...kinds) {
-		if (kinds.length < 2) {
-			console.assert(false);
-			debugger;
-		}
+		if (kinds.length < 2) console.assert(false);
 		for (const kind of kinds) if (this.#token() === kind) {
 			this.#nextToken();
 			return true;
@@ -1278,10 +1275,7 @@ var Parser = class {
 		return false;
 	}
 	#parseExpectedTokenOneOf(fallback, kinds) {
-		if (kinds.length < 2) {
-			console.assert(false);
-			debugger;
-		}
+		if (kinds.length < 2) console.assert(false);
 		for (const kind of kinds) if (this.#token() === kind) {
 			const node = this.#createNode(this.#token());
 			this.#nextToken();
@@ -1328,7 +1322,7 @@ var Parser = class {
 		}
 	}
 	#isCompassPortKind(kind) {
-		return kind >= syntaxKind.CompassCenterToken && kind <= syntaxKind.CompassEnd;
+		return kind >= syntaxKind.CompassBegin && kind <= syntaxKind.CompassEnd;
 	}
 	#speculationHelper(callback, isLookAhead) {
 		const saveToken = this.#token();
@@ -1694,6 +1688,54 @@ const attributes = Array.from(new Set([
 	...graphAttributes,
 	...clusterAttributes
 ])).sort();
+const attributeDescriptions = Object.freeze({
+	arrowhead: "Style of arrowhead at head end",
+	arrowsize: "Scaling factor for arrowheads",
+	arrowtail: "Style of arrowhead at tail end",
+	bgcolor: "Background color",
+	color: "Node shape/edge/cluster color",
+	comment: "Any string",
+	compound: "Allow edges between clusters",
+	concentrate: "Enables edge concentrators",
+	constraint: "Use edge to affect node ranking",
+	decorate: "If set, line between label and edge",
+	dir: "Direction of edge",
+	distortion: "Node distortion",
+	fillcolor: "Node/cluster fill color",
+	fixedsize: "Label text has no effect on node size",
+	fontcolor: "Font face color",
+	fontname: "Font family",
+	fontsize: "Point size of label",
+	group: "Name of node group",
+	headlabel: "Label placed near head of edge",
+	headport: "Where on the node to attach head of edge",
+	height: "Height in inches",
+	label: "Any string",
+	labelangle: "Angle in degrees",
+	labeldistance: "Scaling factor for distance for head or tail label",
+	labelfontcolor: "Type face color for head and tail labels",
+	labelfontname: "Font family for head and tail labels",
+	labelfontsize: "Point size for head and tail labels",
+	labeljust: "Label justification",
+	labelloc: "Label vertical justification",
+	layer: "Overlay range",
+	nodesep: "Separation between nodes, in inches",
+	orientation: "Node rotation angle",
+	peripheries: "Number of node boundaries",
+	ranksep: "Separation between ranks, in inches",
+	ratio: "Aspect ratio",
+	regular: "Force polygon to be regular",
+	rotate: "If 90, set orientation to landscape",
+	shape: "Node shape",
+	shapefile: "External custom shape file",
+	sides: "Number of sides for shape=polygon",
+	skew: "Skewing node for shape=polygon",
+	style: "Graphics options",
+	taillabel: "Label placed near tail of edge",
+	tailport: "Where on the node to attach tail of edge",
+	weight: "Integer cost of stretching an edge",
+	width: "Width in inches"
+});
 /**
 * We only support the X11 color scheme
 */
@@ -2455,9 +2497,8 @@ function checkShapeLabelValues(root) {
 	const invalidShapes = [];
 	forEachAssignmentTransitive(root, (assignment) => {
 		const { leftId, rightId } = assignment;
-		if (leftId.kind !== syntaxKind.TextIdentifier || rightId.kind !== syntaxKind.TextIdentifier) return;
-		if (leftId.text.trim().toLocaleLowerCase() !== "shape") return;
-		const rightText = rightId.text.trim();
+		if (getIdentifierText(leftId).trim().toLowerCase() !== "shape") return;
+		const rightText = getIdentifierText(rightId).trim();
 		const shapeCandidate = rightText.toLowerCase();
 		if (validShapesLowerCase.has(shapeCandidate)) return;
 		invalidShapes.push({
@@ -3239,6 +3280,7 @@ function getAttributeCompletions(posistion) {
 	return attributes.map((label) => ({
 		kind,
 		label,
+		documentation: attributeDescriptions[label.toLowerCase()],
 		textEdit: {
 			range,
 			newText: `${escapeIdentifierText(label)}=`
@@ -3310,8 +3352,12 @@ function getHoverContents(n) {
 					return { contents: `(node) ${getIdentifierText(n)}` };
 				case syntaxKind.Assignment: {
 					const assignment = parent;
+					const left = getIdentifierText(assignment.leftId);
+					const right = getIdentifierText(assignment.rightId);
+					const desc = attributeDescriptions[left.toLowerCase()];
+					const base = `(assignment) \`${left}\` = \`${right}\``;
 					return {
-						contents: `(assignment) \`${getIdentifierText(assignment.leftId)}\` = \`${getIdentifierText(assignment.rightId)}\``,
+						contents: desc ? `${base}\n\n${desc}` : base,
 						range: {
 							pos: assignment.pos,
 							end: assignment.end
@@ -3343,8 +3389,12 @@ function getHoverContents(n) {
 				}
 				case syntaxKind.IdEqualsIdStatement: {
 					const idEqId = parent;
+					const left = getIdentifierText(idEqId.leftId);
+					const right = getIdentifierText(idEqId.rightId);
+					const desc = attributeDescriptions[left.toLowerCase()];
+					const base = `(graph property) \`${left}\` = \`${right}\``;
 					return {
-						contents: `(graph property) \`${getIdentifierText(idEqId.leftId)}\` = \`${getIdentifierText(idEqId.rightId)}\``,
+						contents: desc ? `${base}\n\n${desc}` : base,
 						range: {
 							pos: idEqId.pos,
 							end: idEqId.end
@@ -3449,9 +3499,23 @@ function findDefinition(doc, sourceFile, position) {
 			range
 		};
 	}
-	debugger;
 }
-const findDeclaration = findDefinition;
+function findDeclaration(doc, sourceFile, position) {
+	if (!sourceFile.symbols) throw "sourceFile is not bound";
+	const g = sourceFile.graph;
+	if (!g) return;
+	const node = findNodeAtOffset(g, doc.offsetAt(position));
+	if (!node) return;
+	if (!isIdentifierNode(node)) return;
+	const nodeSymbol = node.symbol;
+	if (!nodeSymbol) throw "node.symbol is not bound";
+	const firstUse = nodeSymbol.firstMention;
+	if (!firstUse) return;
+	return {
+		uri: doc.uri,
+		range: syntaxNodeToRange(doc, sourceFile, firstUse)
+	};
+}
 //#endregion
 //#region src/service/rename.ts
 function renameSymbol(doc, sourceFile, position, newName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dot-language-support",
-  "version": "4.3.0",
+  "version": "4.3.2",
   "description": "Parser and language service for graphviz (dot) files",
   "keywords": [
     "dot",
@@ -35,11 +35,11 @@
     "vscode-languageserver-types": "^3.17.5"
   },
   "devDependencies": {
-    "expect": "^30.3.0",
-    "oxfmt": "^0.45.0",
-    "oxlint": "^1.60.0",
-    "oxlint-tsgolint": "^0.21.1",
-    "tsdown": "^0.21.9",
+    "expect": "^30.4.1",
+    "oxfmt": "^0.52.0",
+    "oxlint": "^1.67.0",
+    "oxlint-tsgolint": "^0.23.0",
+    "tsdown": "^0.22.1",
     "typescript": "^6.0.3"
   },
   "engines": {