umple-lsp-server 0.2.2 → 0.2.5

package/out/diagramNavigation.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Diagram-specific navigation: resolve click targets from SVG diagram payloads.
+ * Owns the AST walking and symbol lookup logic for diagram click-to-select.
+ * Depends on SymbolIndex for symbol queries and tree parsing.
+ */
+import { SymbolIndex, SymbolEntry } from "./symbolIndex";
+type LocationRange = {
+    line: number;
+    column: number;
+    endLine: number;
+    endColumn: number;
+};
+/**
+ * Resolve a state location from a diagram click payload.
+ * Uses the symbol index for path-aware state lookup.
+ * Scoped to the clicked file.
+ */
+export declare function resolveStateLocation(si: SymbolIndex, filePath: string, className: string | undefined, stateMachine: string, statePath: string[]): SymbolEntry | undefined;
+/**
+ * Resolve a transition location from a diagram click payload.
+ * Path-aware: navigates class → SM → source state path before searching transitions.
+ * Uses tree-sitter tree walk (transitions are not in the symbol index).
+ */
+export declare function resolveTransitionLocation(si: SymbolIndex, filePath: string, content: string, className: string | undefined, stateMachine: string, sourcePath: string[], event: string, targetPath: string[], guard?: string): LocationRange | undefined;
+export {};

package/out/diagramNavigation.js

@@ -0,0 +1,193 @@
+"use strict";
+/**
+ * Diagram-specific navigation: resolve click targets from SVG diagram payloads.
+ * Owns the AST walking and symbol lookup logic for diagram click-to-select.
+ * Depends on SymbolIndex for symbol queries and tree parsing.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveStateLocation = resolveStateLocation;
+exports.resolveTransitionLocation = resolveTransitionLocation;
+const path = require("path");
+/**
+ * Resolve a state location from a diagram click payload.
+ * Uses the symbol index for path-aware state lookup.
+ * Scoped to the clicked file.
+ */
+function resolveStateLocation(si, filePath, className, stateMachine, statePath) {
+    const smContainer = className
+        ? `${className}.${stateMachine}`
+        : stateMachine;
+    const targetName = statePath[statePath.length - 1];
+    const preceding = statePath.slice(0, -1);
+    const reachableFiles = new Set([path.normalize(filePath)]);
+    // Try each candidate container in order (alias-local first, then base fallback)
+    const containers = si.getSmContainerCandidates(smContainer);
+    for (const container of containers) {
+        let symbol;
+        if (preceding.length > 0) {
+            symbol = si.resolveStateInPath(preceding, targetName, container, reachableFiles);
+        }
+        if (!symbol) {
+            const candidates = si
+                .getSymbols({
+                name: targetName,
+                kind: "state",
+                container,
+            })
+                .filter((s) => reachableFiles.has(path.normalize(s.file)));
+            if (preceding.length === 0) {
+                symbol = candidates[0];
+            }
+            else {
+                const targetPath = [...preceding, targetName];
+                symbol = candidates.find((s) => s.statePath &&
+                    s.statePath.length >= targetPath.length &&
+                    targetPath.every((seg, i) => s.statePath[s.statePath.length - targetPath.length + i] === seg));
+            }
+        }
+        if (symbol)
+            return symbol;
+    }
+    return undefined;
+}
+// ── Transition AST walking ───────────────────────────────────────────────────
+/**
+ * Find a named child node of specific types within a parent node.
+ * Recurses into class_definition and source_file nodes.
+ */
+function findNamedChild(parent, types, name) {
+    for (let i = 0; i < parent.childCount; i++) {
+        const child = parent.child(i);
+        if (types.includes(child.type)) {
+            const nameNode = child.childForFieldName("name");
+            if (nameNode && nameNode.text === name)
+                return child;
+        }
+    }
+    for (let i = 0; i < parent.childCount; i++) {
+        const child = parent.child(i);
+        if (child.type === "class_definition" || child.type === "source_file" || child.type === "statemachine_definition") {
+            const found = findNamedChild(child, types, name);
+            if (found)
+                return found;
+        }
+    }
+    return null;
+}
+/** SM node types: inline, reused, and standalone definitions. */
+const SM_NODE_TYPES = ["state_machine", "referenced_statemachine", "statemachine_definition"];
+/**
+ * Resolve a transition location from a diagram click payload.
+ * Path-aware: navigates class → SM → source state path before searching transitions.
+ * Uses tree-sitter tree walk (transitions are not in the symbol index).
+ */
+function resolveTransitionLocation(si, filePath, content, className, stateMachine, sourcePath, event, targetPath, guard) {
+    const tree = si.parse(content);
+    if (!tree)
+        return undefined;
+    const targetName = targetPath.join(".");
+    // Step 1: Find the class node (if className provided)
+    let classScope = tree.rootNode;
+    if (className) {
+        const classNode = findNamedChild(classScope, ["class_definition"], className);
+        if (!classNode)
+            return undefined;
+        classScope = classNode;
+    }
+    // Step 2: Find the state machine node (state_machine or referenced_statemachine)
+    const smNode = findNamedChild(classScope, SM_NODE_TYPES, stateMachine);
+    if (!smNode)
+        return undefined;
+    // Try to find the transition in the alias SM first, then fall back to base
+    const result = findTransitionInSm(smNode, sourcePath, event, targetName, guard);
+    if (result)
+        return result;
+    // Fallback: if this is a referenced_statemachine, try the base standalone SM
+    if (smNode.type === "referenced_statemachine") {
+        const baseName = smNode.childForFieldName("definition")?.text;
+        if (baseName) {
+            // Search at file root for standalone statemachine_definition
+            const baseSmNode = findNamedChild(tree.rootNode, ["statemachine_definition"], baseName);
+            if (baseSmNode) {
+                return findTransitionInSm(baseSmNode, sourcePath, event, targetName, guard);
+            }
+        }
+    }
+    return undefined;
+}
+/**
+ * Walk the source state path within an SM node and find a matching transition.
+ */
+function findTransitionInSm(smNode, sourcePath, event, targetName, guard) {
+    // First: check standalone_transition children at SM scope.
+    // These live directly under the SM node (not inside a state body) and encode
+    // source state as from_state field: "event fromState -> toState;"
+    const fromState = sourcePath.length > 0 ? sourcePath[sourcePath.length - 1] : undefined;
+    for (let i = 0; i < smNode.childCount; i++) {
+        const child = smNode.child(i);
+        if (child.type === "standalone_transition") {
+            const eventNode = child.childForFieldName("event");
+            const fromNode = child.childForFieldName("from_state");
+            const toNode = child.childForFieldName("to_state");
+            const eventMatch = eventNode ? eventNode.text === event : !event;
+            const fromMatch = fromNode ? fromNode.text === fromState : !fromState;
+            const targetMatch = toNode ? toNode.text === targetName : !targetName;
+            if (eventMatch && fromMatch && targetMatch) {
+                return {
+                    line: child.startPosition.row,
+                    column: child.startPosition.column,
+                    endLine: child.endPosition.row,
+                    endColumn: child.endPosition.column,
+                };
+            }
+        }
+    }
+    // Then: walk down the source state path for regular nested transitions
+    let scope = smNode;
+    for (const seg of sourcePath) {
+        const stateNode = findNamedChild(scope, ["state"], seg);
+        if (!stateNode)
+            return undefined;
+        scope = stateNode;
+    }
+    // Find the matching transition (regular or standalone within state)
+    for (let i = 0; i < scope.childCount; i++) {
+        const child = scope.child(i);
+        if (child.type === "transition") {
+            const eventNode = child.childForFieldName("event");
+            const targetNode = child.childForFieldName("target");
+            const eventMatch = eventNode ? eventNode.text === event : !event;
+            const targetMatch = targetNode ? targetNode.text === targetName : !targetName;
+            let guardMatch = true;
+            if (guard) {
+                const guardNode = child.children.find((c) => c.type === "guard");
+                guardMatch = guardNode ? guardNode.text.includes(guard) : false;
+            }
+            if (eventMatch && targetMatch && guardMatch) {
+                return {
+                    line: child.startPosition.row,
+                    column: child.startPosition.column,
+                    endLine: child.endPosition.row,
+                    endColumn: child.endPosition.column,
+                };
+            }
+        }
+        // standalone_transition: "event fromState -> toState;"
+        if (child.type === "standalone_transition") {
+            const eventNode = child.childForFieldName("event");
+            const toNode = child.childForFieldName("to_state");
+            const eventMatch = eventNode ? eventNode.text === event : !event;
+            const targetMatch = toNode ? toNode.text === targetName : !targetName;
+            if (eventMatch && targetMatch) {
+                return {
+                    line: child.startPosition.row,
+                    column: child.startPosition.column,
+                    endLine: child.endPosition.row,
+                    endColumn: child.endPosition.column,
+                };
+            }
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=diagramNavigation.js.map

package/out/diagramNavigation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagramNavigation.js","sourceRoot":"","sources":["../src/diagramNavigation.ts"],"names":[],"mappings":"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"}

package/out/diagramRequests.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Custom LSP request handlers for diagram click-to-select.
+ * Registers umple/resolveStateLocation and umple/resolveTransitionLocation.
+ */
+import { Connection } from "vscode-languageserver/node";
+import { TextDocument } from "vscode-languageserver-textdocument";
+import { SymbolIndex } from "./symbolIndex";
+type DiagramDeps = {
+    symbolIndex: SymbolIndex;
+    isSymbolIndexReady: () => boolean;
+    getDocument: (uri: string) => TextDocument | undefined;
+    getDocumentFilePath: (doc: TextDocument) => string | null;
+};
+export declare function registerDiagramRequests(connection: Connection, deps: DiagramDeps): void;
+export {};

package/out/diagramRequests.js

@@ -0,0 +1,66 @@
+"use strict";
+/**
+ * Custom LSP request handlers for diagram click-to-select.
+ * Registers umple/resolveStateLocation and umple/resolveTransitionLocation.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerDiagramRequests = registerDiagramRequests;
+const fs = require("fs");
+const url_1 = require("url");
+const diagramNavigation_1 = require("./diagramNavigation");
+function registerDiagramRequests(connection, deps) {
+    // Resolve a state location from a diagram click payload
+    connection.onRequest("umple/resolveStateLocation", async (params) => {
+        if (!deps.isSymbolIndexReady() || !params.statePath.length)
+            return null;
+        const filePath = deps.getDocumentFilePath({
+            uri: params.uri,
+        });
+        if (!filePath)
+            return null;
+        // Ensure the file is indexed
+        const doc = deps.getDocument(params.uri);
+        if (doc) {
+            deps.symbolIndex.indexFile(filePath, doc.getText());
+        }
+        const symbol = (0, diagramNavigation_1.resolveStateLocation)(deps.symbolIndex, filePath, params.className, params.stateMachine, params.statePath);
+        if (!symbol)
+            return null;
+        return {
+            uri: (0, url_1.pathToFileURL)(symbol.file).toString(),
+            range: {
+                start: { line: symbol.line, character: symbol.column },
+                end: { line: symbol.endLine, character: symbol.endColumn },
+            },
+        };
+    });
+    // Resolve a transition location from a diagram click payload
+    connection.onRequest("umple/resolveTransitionLocation", async (params) => {
+        if (!deps.isSymbolIndexReady() || !params.event)
+            return null;
+        const filePath = deps.getDocumentFilePath({
+            uri: params.uri,
+        });
+        if (!filePath)
+            return null;
+        const doc = deps.getDocument(params.uri);
+        const content = doc
+            ? doc.getText()
+            : fs.existsSync(filePath)
+                ? fs.readFileSync(filePath, "utf8")
+                : null;
+        if (!content)
+            return null;
+        const result = (0, diagramNavigation_1.resolveTransitionLocation)(deps.symbolIndex, filePath, content, params.className, params.stateMachine, params.sourcePath, params.event, params.targetPath, params.guard);
+        if (!result)
+            return null;
+        return {
+            uri: (0, url_1.pathToFileURL)(filePath).toString(),
+            range: {
+                start: { line: result.line, character: result.column },
+                end: { line: result.endLine, character: result.endColumn },
+            },
+        };
+    });
+}
+//# sourceMappingURL=diagramRequests.js.map

package/out/diagramRequests.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"diagramRequests.js","sourceRoot":"","sources":["../src/diagramRequests.ts"],"names":[],"mappings":"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"}

package/out/formatRules.d.ts

@@ -0,0 +1,27 @@
+/**
+ * Formatting rule definitions for the syntax-aware formatter.
+ *
+ * Node-type classification for indentation and skip regions.
+ * All node names are verified against the actual tree-sitter grammar.
+ */
+declare const TreeSitter: any;
+type Tree = InstanceType<typeof TreeSitter.Tree>;
+/** Node types whose body content gets +1 indent level. */
+export declare const INDENT_NODES: Set<string>;
+/** Top-level declaration node types that should be separated by blank lines. */
+export declare const TOP_LEVEL_DECL_NODES: Set<string>;
+/** Node types whose content is verbatim (embedded code — do not reindent). */
+export declare const SKIP_NODES: Set<string>;
+/**
+ * Check if a line falls strictly inside a verbatim/skip node.
+ * Boundary lines (the line with opening `{` and closing `}`) are NOT skipped —
+ * they're Umple-structural and should be formatted normally.
+ */
+export declare function isVerbatimLine(tree: Tree, line: number): boolean;
+/**
+ * Compute the structural indent depth for a line from its AST ancestors.
+ * Only counts indent-contributing ancestors whose body starts ABOVE this line
+ * (so the opening line of `class A {` doesn't get +1 from its own node).
+ */
+export declare function computeStructuralDepth(tree: Tree, line: number, column: number): number;
+export {};

package/out/formatRules.js

@@ -0,0 +1,114 @@
+"use strict";
+/**
+ * Formatting rule definitions for the syntax-aware formatter.
+ *
+ * Node-type classification for indentation and skip regions.
+ * All node names are verified against the actual tree-sitter grammar.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SKIP_NODES = exports.TOP_LEVEL_DECL_NODES = exports.INDENT_NODES = void 0;
+exports.isVerbatimLine = isVerbatimLine;
+exports.computeStructuralDepth = computeStructuralDepth;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const TreeSitter = require("web-tree-sitter");
+/** Node types whose body content gets +1 indent level. */
+exports.INDENT_NODES = new Set([
+    "class_definition",
+    "interface_definition",
+    "trait_definition",
+    "association_class_definition",
+    "enum_definition",
+    "association_definition",
+    "mixset_definition",
+    "state_machine",
+    "statemachine_definition",
+    "state",
+    "before_after",
+    "toplevel_code_injection",
+    "filter_definition",
+    "method_declaration",
+]);
+/** Top-level declaration node types that should be separated by blank lines. */
+exports.TOP_LEVEL_DECL_NODES = new Set([
+    "class_definition",
+    "interface_definition",
+    "trait_definition",
+    "association_class_definition",
+    "enum_definition",
+    "association_definition",
+    "statemachine_definition",
+    "mixset_definition",
+    "toplevel_code_injection",
+    "namespace_declaration",
+    "use_statement",
+    "generate_statement",
+    "requirement_definition",
+    "external_definition",
+]);
+/** Node types whose content is verbatim (embedded code — do not reindent). */
+exports.SKIP_NODES = new Set([
+    "code_content",
+    "template_body",
+]);
+/**
+ * Check if a line falls strictly inside a verbatim/skip node.
+ * Boundary lines (the line with opening `{` and closing `}`) are NOT skipped —
+ * they're Umple-structural and should be formatted normally.
+ */
+function isVerbatimLine(tree, line) {
+    // Walk the tree to find skip nodes that contain this line
+    const cursor = tree.rootNode.walk();
+    let reachedEnd = false;
+    while (!reachedEnd) {
+        const node = cursor.currentNode;
+        if (exports.SKIP_NODES.has(node.type)) {
+            // Strictly between start and end rows (boundary lines are formatted)
+            if (node.startPosition.row < line && line < node.endPosition.row) {
+                return true;
+            }
+            // Don't descend into skip nodes
+            if (!cursor.gotoNextSibling()) {
+                while (!cursor.gotoNextSibling()) {
+                    if (!cursor.gotoParent()) {
+                        reachedEnd = true;
+                        break;
+                    }
+                }
+            }
+        }
+        else if (!cursor.gotoFirstChild()) {
+            if (!cursor.gotoNextSibling()) {
+                while (!cursor.gotoNextSibling()) {
+                    if (!cursor.gotoParent()) {
+                        reachedEnd = true;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return false;
+}
+/**
+ * Compute the structural indent depth for a line from its AST ancestors.
+ * Only counts indent-contributing ancestors whose body starts ABOVE this line
+ * (so the opening line of `class A {` doesn't get +1 from its own node).
+ */
+function computeStructuralDepth(tree, line, column) {
+    const node = tree.rootNode.descendantForPosition({ row: line, column });
+    if (!node)
+        return 0;
+    let depth = 0;
+    let current = node;
+    while (current) {
+        if (exports.INDENT_NODES.has(current.type)) {
+            // Only count if this line is INSIDE the body (not the header line)
+            if (current.startPosition.row < line) {
+                depth++;
+            }
+        }
+        current = current.parent;
+    }
+    return depth;
+}
+//# sourceMappingURL=formatRules.js.map

package/out/formatRules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatRules.js","sourceRoot":"","sources":["../src/formatRules.ts"],"names":[],"mappings":"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"}

package/out/formatter.d.ts

@@ -1,31 +1,53 @@
 /**
- * Document formatting logic.
+ * Syntax-aware document formatter.
  *
- * Pure text manipulation + tree walking for skip-range detection.
- * No dependency on LSP connection, documents, or SymbolIndex class.
+ * Uses tree-sitter AST to compute structural indentation instead of
+ * naive brace counting. Preserves embedded code regions (code_content,
+ * template_body) as verbatim islands.
  */
 import { TextEdit } from "vscode-languageserver/node";
+declare const TreeSitter: any;
+type Tree = InstanceType<typeof TreeSitter.Tree>;
 /**
- * Collect line ranges of code_content and template_body nodes (embedded code
- * that the formatter should not re-indent).
- *
- * @param tree Pre-parsed tree (caller handles tree acquisition)
+ * Expand eligible single-line compact state blocks into multi-line format.
+ * Returns the modified text (or the original if nothing changed).
  */
-export declare function getCodeContentRanges(tree: any): {
-    startLine: number;
-    endLine: number;
-}[];
+export declare function expandCompactStates(text: string, tree: Tree): string;
 /**
- * Compute indent edits for an Umple document.
+ * Compute indent edits for an Umple document using syntax-aware indentation.
  *
- * @param text Document text
+ * @param text    Document text
  * @param options Formatting options (tabSize, insertSpaces)
- * @param skipRanges Ranges to skip (embedded code content)
+ * @param tree    Pre-parsed tree-sitter tree
+ * @returns Array of TextEdits to apply for correct indentation
  */
 export declare function computeIndentEdits(text: string, options: {
     tabSize: number;
     insertSpaces: boolean;
-}, skipRanges: {
+}, tree: Tree): TextEdit[];
+/**
+ * Normalize whitespace around `->` in transition and standalone_transition nodes.
+ * Only handles single-line nodes. Leaves event, guard, action, and target text verbatim.
+ */
+export declare function fixTransitionSpacing(text: string, tree: Tree): TextEdit[];
+/**
+ * Normalize whitespace around the arrow in association_inline and association_member nodes.
+ * Only handles single-line nodes. Same child-walking approach as fixTransitionSpacing.
+ */
+export declare function fixAssociationSpacing(text: string, tree: Tree): TextEdit[];
+/**
+ * Normalize blank lines between top-level declarations in source_file.
+ * Ensures exactly 1 blank line between consecutive top-level named children.
+ * Does NOT touch interior body spacing.
+ */
+export declare function normalizeTopLevelBlankLines(text: string, tree: Tree): TextEdit[];
+/**
+ * Collect line ranges of code_content and template_body nodes.
+ * Kept for backward compatibility with existing callers; the new
+ * formatter uses isVerbatimLine() from formatRules instead.
+ */
+export declare function getCodeContentRanges(tree: any): {
     startLine: number;
     endLine: number;
-}[]): TextEdit[];
+}[];
+export {};