dot-language-support 4.2.1 → 4.3.1

package/dist/index.d.mts

@@ -553,8 +553,10 @@ interface LanguageService {
   hover(doc: DocumentLike, sourceFile: SourceFile, position: lst.Position): lst.Hover | undefined;
   findReferences(doc: DocumentLike, sourceFile: SourceFile, position: lst.Position, context: lst.ReferenceContext): lst.Location[];
   findDefinition(doc: DocumentLike, sourceFile: SourceFile, position: lst.Position): lst.Location | undefined;
+  findDeclaration(doc: DocumentLike, sourceFile: SourceFile, position: lst.Position): lst.Location | undefined;
   renameSymbol(doc: DocumentLike, sourceFile: SourceFile, position: lst.Position, newName: string): lst.WorkspaceEdit | undefined;
   getCompletions(doc: DocumentLike, sourceFile: SourceFile, position: lst.Position): lst.CompletionItem[];
+  getSelectionRanges(doc: DocumentLike, sourceFile: SourceFile, positions: lst.Position[]): lst.SelectionRange[];
   getDocumentColors(doc: DocumentLike, sourceFile: SourceFile): ColorInformation[] | undefined;
   getColorRepresentations(doc: DocumentLike, sourceFile: SourceFile, color: Color$1, range: lst.Range): ColorPresentation[] | undefined;
   getCodeActions(doc: DocumentLike, sourceFile: SourceFile, range: lst.Range, context: lst.CodeActionContext): lst.Command[] | undefined;

package/dist/index.mjs

@@ -1694,6 +1694,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
 */
@@ -3239,6 +3287,7 @@ function getAttributeCompletions(posistion) {
 	return attributes.map((label) => ({
 		kind,
 		label,
+		documentation: attributeDescriptions[label.toLowerCase()],
 		textEdit: {
 			range,
 			newText: `${escapeIdentifierText(label)}=`
@@ -3310,8 +3359,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 +3396,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,7 +3506,22 @@ function findDefinition(doc, sourceFile, position) {
 			range
 		};
 	}
-	debugger;
+}
+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
@@ -3476,6 +3548,40 @@ function isRenameableNode(node) {
 function isRenamableIdentifier(node) {
 	return node.kind !== syntaxKind.QuotedTextIdentifier;
 }
+//#endregion
+//#region src/service/selectionRange.ts
+function getSelectionRanges(doc, sourceFile, positions) {
+	return positions.map((p) => buildSelectionRange(doc, sourceFile, p));
+}
+function buildSelectionRange(doc, sourceFile, position) {
+	const empty = { range: {
+		start: position,
+		end: position
+	} };
+	const g = sourceFile.graph;
+	if (!g) return empty;
+	const leaf = findNodeAtOffset(g, doc.offsetAt(position), true);
+	const chain = [];
+	let curr = leaf;
+	while (curr) {
+		chain.push(curr);
+		curr = curr.parent;
+	}
+	if (chain.length === 0) return empty;
+	let result;
+	let lastKey;
+	for (let i = chain.length - 1; i >= 0; i--) {
+		const range = syntaxNodeToRange(doc, sourceFile, chain[i]);
+		const key = `${range.start.line}:${range.start.character}-${range.end.line}:${range.end.character}`;
+		if (key === lastKey) continue;
+		lastKey = key;
+		result = {
+			range,
+			parent: result
+		};
+	}
+	return result ?? empty;
+}
 const subErrorCodeLength = 3;
 function formatError(error) {
 	const subCode = (error.sub | 0).toString().padStart(subErrorCodeLength, "0");
@@ -3517,8 +3623,10 @@ function createService() {
 		hover,
 		findReferences,
 		findDefinition,
+		findDeclaration,
 		renameSymbol,
 		getCompletions,
+		getSelectionRanges,
 		getDocumentColors,
 		getColorRepresentations,
 		getCodeActions,

package/package.json

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