umple-lsp-server 0.1.0 → 0.2.0

package/bin/umple-lsp-server

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('../out/server.js');

package/completions.scm

@@ -0,0 +1,72 @@
+; completions.scm — Scope detection for symbol completions.
+;
+; Used by the LSP server to determine which symbols to offer.
+; Capture names follow the pattern: @scope.<kind1>_<kind2>_...
+; where each <kind> is a SymbolKind.
+;
+; The LSP finds the innermost (smallest) capture containing
+; the cursor and offers symbols of the encoded kinds.
+;
+; @scope.none    = keywords only (no symbol completions)
+; @scope.suppress = suppress ALL completions
+; @scope.use_path = trigger file path completions
+
+; =====================
+; SUPPRESS CONTEXTS
+; =====================
+; Method/code bodies — not Umple completion context
+(code_content) @scope.suppress
+(code_block) @scope.suppress
+
+; =====================
+; TOP-LEVEL SCOPES (keywords only)
+; =====================
+(source_file) @scope.none
+(mixset_definition) @scope.none
+(statemachine_definition) @scope.none
+(requirement_definition) @scope.none
+
+; =====================
+; CLASS-LIKE SCOPES (offer type names)
+; =====================
+(class_definition) @scope.class_interface_trait_enum
+(trait_definition) @scope.class_interface_trait_enum
+(interface_definition) @scope.class_interface_trait_enum
+(association_class_definition) @scope.class_interface_trait_enum
+(isa_declaration) @scope.class_interface_trait_enum
+
+; =====================
+; ASSOCIATION SCOPES (offer class names only)
+; =====================
+(association_definition) @scope.class
+(association_inline) @scope.class
+(association_member) @scope.class
+
+; =====================
+; STATE MACHINE SCOPES (offer state names)
+; =====================
+(state_machine) @scope.state
+(state) @scope.state
+(transition) @scope.state
+
+; =====================
+; FINE-GRAINED CLASS MEMBER SCOPES
+; =====================
+; key { attr1, attr2 } — offer attribute names (scoped to class + inherited)
+(key_definition) @scope.attribute
+
+; depend java.util.* — suppress (not a symbol reference)
+(depend_statement) @scope.suppress
+
+; implementsReq R1, R2 — offer requirement names
+(req_implementation) @scope.requirement
+
+; [name != ""] — offer only own attributes (Umple E28: no inherited attrs in constraints)
+(constraint) @scope.own_attribute
+
+; =====================
+; OTHER
+; =====================
+(enum_definition) @scope.none
+(use_statement) @scope.use_path
+(template_list) @scope.template

package/definitions.scm

@@ -0,0 +1,37 @@
+; definitions.scm — Maps AST nodes to symbol definitions for indexing.
+;
+; Used by the LSP server to build the symbol index.
+; Capture names follow the pattern: @definition.<kind>
+; where <kind> is a SymbolKind ("class", "attribute", "state", etc.)
+;
+; The LSP walks up from each captured node to find the enclosing
+; parent scope (class, statemachine, etc.) for scoped lookups.
+
+; =====================
+; TOP-LEVEL DEFINITIONS
+; =====================
+
+(class_definition name: (identifier) @definition.class)
+(interface_definition name: (identifier) @definition.interface)
+(trait_definition name: (identifier) @definition.trait)
+(enum_definition name: (identifier) @definition.enum)
+(external_definition name: (identifier) @definition.class)
+(association_definition name: (identifier) @definition.association)
+(requirement_definition name: (identifier) @definition.requirement)
+(mixset_definition name: (identifier) @definition.mixset)
+(association_class_definition name: (identifier) @definition.class)
+(statemachine_definition name: (identifier) @definition.statemachine)
+
+; =====================
+; SCOPED DEFINITIONS
+; =====================
+; These require a parent scope (class, statemachine, etc.)
+
+(attribute_declaration name: (identifier) @definition.attribute)
+(method_declaration name: (identifier) @definition.method)
+(method_signature name: (identifier) @definition.method)
+(state_machine name: (identifier) @definition.statemachine)
+(state name: (identifier) @definition.state)
+(referenced_statemachine name: (identifier) @definition.statemachine)
+(emit_method name: (identifier) @definition.method)
+(template_attribute name: (identifier) @definition.template)

package/out/keywords.d.ts

@@ -1,38 +1,6 @@
 /**
- * Context-specific completion keywords for tree-sitter based completions.
- * Keys match CompletionContext values from symbolIndex.ts.
+ * Built-in types for attribute/parameter declarations.
+ * NOT grammar keywords — they're regular identifiers highlighted by highlights.scm.
+ * LookaheadIterator won't yield them, so we offer them explicitly.
  */
-export declare const COMPLETION_KEYWORDS: {
-    top: string[];
-    class_body: string[];
-    attribute_modifiers: string[];
-    attribute_types: string[];
-    state_machine: string[];
-    state: string[];
-    association: string[];
-    enum: never[];
-    method: never[];
-    use_path: never[];
-    isa_type: never[];
-    transition_target: never[];
-    association_type: never[];
-    depend_package: never[];
-    comment: never[];
-    unknown: never[];
-};
-/**
- * Legacy keyword categories (kept for backward compatibility).
- */
-export declare const KEYWORDS: {
-    topLevel: string[];
-    classLevel: string[];
-    attribute: string[];
-    method: string[];
-    statemachine: string[];
-    constraints: string[];
-    modelConstraints: string[];
-    tracing: string[];
-    testing: string[];
-    misc: string[];
-};
-export declare const ALL_KEYWORDS: string[];
+export declare const BUILTIN_TYPES: string[];

package/out/keywords.js

@@ -1,205 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ALL_KEYWORDS = exports.KEYWORDS = exports.COMPLETION_KEYWORDS = void 0;
+exports.BUILTIN_TYPES = void 0;
 /**
- * Context-specific completion keywords for tree-sitter based completions.
- * Keys match CompletionContext values from symbolIndex.ts.
+ * Built-in types for attribute/parameter declarations.
+ * NOT grammar keywords — they're regular identifiers highlighted by highlights.scm.
+ * LookaheadIterator won't yield them, so we offer them explicitly.
  */
-exports.COMPLETION_KEYWORDS = {
-    // Top-level definitions
-    top: [
-        "class",
-        "interface",
-        "trait",
-        "enum",
-        "association",
-        "namespace",
-        "generate",
-        "mixset",
-        "use",
-        "external",
-    ],
-    // Inside class/trait/interface body
-    class_body: [
-        "isA",
-        "singleton",
-        "depend",
-        "before",
-        "after",
-        // Visibility modifiers for methods
-        "public",
-        "private",
-        "protected",
-        // Other method/attribute modifiers
-        "static",
-        "abstract",
-        "const",
-    ],
-    // Attribute modifiers (used in class_body context when typing attribute)
-    attribute_modifiers: [
-        "lazy",
-        "settable",
-        "internal",
-        "defaulted",
-        "immutable",
-        "autounique",
-        "unique",
-        "const",
-    ],
-    // Common types for attribute declarations
-    attribute_types: [
-        "String",
-        "Integer",
-        "Double",
-        "Float",
-        "Boolean",
-        "Date",
-        "Time",
-        "void",
-    ],
-    // State machine definition (outside states)
-    state_machine: ["queued", "pooled"],
-    // Inside a state
-    state: ["entry", "exit", "do", "final", "->"],
-    // Inside association block
-    association: ["--", "->", "<-", "<@>-", "-<@>", ">->", "<-<"],
-    // Inside enum - typically just identifiers, no keywords
-    enum: [],
-    // Inside method body - code completion out of scope for now
-    method: [],
-    // Contexts where only symbol completions are offered (no keywords)
-    use_path: [],
-    isa_type: [],
-    transition_target: [],
-    association_type: [],
-    depend_package: [],
-    comment: [],
-    unknown: [],
-};
-/**
- * Legacy keyword categories (kept for backward compatibility).
- */
-exports.KEYWORDS = {
-    topLevel: [
-        "after",
-        "around",
-        "association",
-        "associationClass",
-        "class",
-        "distributable",
-        "filter",
-        "generate",
-        "interface",
-        "mixset",
-        "namespace",
-        "statemachine",
-        "strictness",
-        "trait",
-        "use",
-        "--redefine",
-    ],
-    classLevel: [
-        "abstract",
-        "active",
-        "const",
-        "depend",
-        "distributable",
-        "emit",
-        "enum",
-        "inner",
-        "isA",
-        "key",
-        "model",
-        "self",
-        "singleton",
-        "sorted",
-        "static",
-    ],
-    attribute: [
-        "attribute",
-        "attr",
-        "autounique",
-        "defaulted",
-        "false",
-        "immutable",
-        "internal",
-        "lazy",
-        "settable",
-        "true",
-        "unique",
-    ],
-    method: [
-        "public",
-        "protected",
-        "private",
-        "static",
-        "abstract",
-        "pre",
-        "custom",
-        "generated",
-        "all",
-        "around_proceed",
-    ],
-    statemachine: [
-        "after",
-        "afterEvery",
-        "as",
-        "do",
-        "entry",
-        "exit",
-        "final",
-        "Final",
-        "pooled",
-        "queued",
-        "statemachine",
-        "unspecified",
-    ],
-    constraints: ["and", "not", "or"],
-    modelConstraints: [
-        "attribute",
-        "attr",
-        "has",
-        "model",
-        "of",
-        "subclass",
-        "superclass",
-    ],
-    tracing: [
-        "add",
-        "cardinality",
-        "for",
-        "giving",
-        "remove",
-        "trace",
-        "tracer",
-        "until",
-        "where",
-    ],
-    testing: [
-        "assertAttribute",
-        "assertEqual",
-        "assertFalse",
-        "assertMethod",
-        "assertNull",
-        "assertTrue",
-        "generic",
-        "prefix",
-        "regex",
-        "suffix",
-        "test",
-    ],
-    misc: [
-        "forced",
-        "hops",
-        "ignore",
-        "include",
-        "includeFilter",
-        "off",
-        "RMI",
-        "sub",
-        "super",
-        "WS",
-    ],
-};
-exports.ALL_KEYWORDS = Array.from(new Set(Object.values(exports.KEYWORDS).flat()));
+exports.BUILTIN_TYPES = [
+    "String",
+    "Integer",
+    "Double",
+    "Float",
+    "Boolean",
+    "Date",
+    "Time",
+    "void",
+];
 //# sourceMappingURL=keywords.js.map

package/out/keywords.js.map

@@ -1 +1 @@
-{"version":3,"file":"keywords.js","sourceRoot":"","sources":["../src/keywords.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"keywords.js","sourceRoot":"","sources":["../src/keywords.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACU,QAAA,aAAa,GAAG;IAC3B,QAAQ;IACR,SAAS;IACT,QAAQ;IACR,OAAO;IACP,SAAS;IACT,MAAM;IACN,MAAM;IACN,MAAM;CACP,CAAC"}

package/out/log.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Write a debug message to a dedicated log file.
+ *
+ * Usage: debugLog("token:", word, "kinds:", kinds);
+ * View:  tail -f /tmp/umple-lsp.log
+ */
+export declare function debugLog(...args: unknown[]): void;

package/out/log.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.debugLog = debugLog;
+const fs = require("fs");
+const path = require("path");
+const os = require("os");
+const LOG_FILE = path.join(os.tmpdir(), "umple-lsp.log");
+/**
+ * Write a debug message to a dedicated log file.
+ *
+ * Usage: debugLog("token:", word, "kinds:", kinds);
+ * View:  tail -f /tmp/umple-lsp.log
+ */
+function debugLog(...args) {
+    console.error("okokokokok", LOG_FILE);
+    const timestamp = new Date().toISOString().slice(11, 23);
+    const message = args
+        .map((a) => (typeof a === "object" ? JSON.stringify(a) : String(a)))
+        .join(" ");
+    fs.appendFileSync(LOG_FILE, `[${timestamp}] ${message}\n`);
+}
+//# sourceMappingURL=log.js.map

package/out/log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../src/log.ts"],"names":[],"mappings":";;AAYA,4BAOC;AAnBD,yBAAyB;AACzB,6BAA6B;AAC7B,yBAAyB;AAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC;AAEzD;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,GAAG,IAAe;IACzC,OAAO,CAAC,KAAK,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IACtC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,IAAI;SACjB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SACnE,IAAI,CAAC,GAAG,CAAC,CAAC;IACb,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,IAAI,SAAS,KAAK,OAAO,IAAI,CAAC,CAAC;AAC7D,CAAC"}