umple-lsp-server 0.4.2 → 1.0.0

package/CHANGELOG.md

@@ -0,0 +1,10 @@
+# Changelog
+
+## 1.0.0 - 2026-04-29
+
+- Added broader semantic coverage across completion, hover, go-to-definition, references, rename, workspace symbols, inlay hints, semantic tokens, and code actions.
+- Improved association, requirement, trace, port, state, method, class, trait, and enum language intelligence.
+- Added class-scoped transition event symbols so `trace transition eventName;` can resolve, find references, hover, and complete real transition events.
+- Expanded Tree-sitter grammar and query coverage for additional Umple constructs, with corpus checks to guard parser regressions.
+- Improved formatter safety and parser-visible formatting behavior, including idempotence and symbol-preservation checks.
+- Updated docs for editor behavior, local development, publishing, parser/highlighting boundaries, and future maintenance.

package/README.md

@@ -0,0 +1,35 @@
+# umple-lsp-server
+
+Language Server Protocol implementation for the [Umple](https://www.umple.org/) modeling language.
+
+This package provides the editor-agnostic server used by VS Code, Zed, Neovim, and any generic LSP client that can launch a Node-based language server.
+
+## Install
+
+```bash
+npm install -g umple-lsp-server
+umple-lsp-server --stdio
+```
+
+## What Ships
+
+- LSP server JavaScript compiled to `out/`
+- `umple-lsp-server` command wrapper in `bin/`
+- Bundled Tree-sitter Umple WASM parser
+- Bundled Tree-sitter query files for definitions, references, completions, and highlighting
+
+`umplesync.jar` is not bundled in the npm package. Editor clients either download it separately or pass a local path through server initialization options.
+
+## Release Notes
+
+Current release: `1.0.0`
+
+Highlights:
+
+- Broader completion coverage for associations, requirements, traces, ports, states, and class-scoped symbols.
+- Safer go-to-definition, references, rename, workspace symbols, hover, semantic tokens, inlay hints, and code actions across more Umple constructs.
+- Formatter safety checks and focused formatting improvements for parser-visible structural syntax.
+- Expanded Tree-sitter grammar and query coverage backed by corpus checks.
+- Trace transition event symbols: `trace transition flip;` now resolves, references, hovers, and completes class-scoped transition events.
+
+See `CHANGELOG.md` in this package and the upstream repository wiki for the full release history and publishing notes.

package/completions.scm

@@ -85,10 +85,16 @@
 ; All trace entity forms use the same completion scope
 (trace_statement (trace_entity) @scope.trace_attribute_method)
 (trace_statement (trace_entity_call) @scope.trace_attribute_method)
-(trace_postfix "record" . (identifier) @scope.trace_attribute_method)
+(trace_record_target) @scope.trace_attribute_method
 
-; referenced_statemachine definition — offer statemachine names from enclosing class
-(referenced_statemachine definition: (identifier) @scope.statemachine)
+; referenced_statemachine definition — offer statemachine names from enclosing
+; class plus top-level standalone statemachines (topic 055).
+(referenced_statemachine definition: (identifier) @scope.referenced_sm_target)
+
+; trait_sm_binding value — offer statemachine names (first segment) and states
+; in the bound SM (subsequent dotted segments). Disambiguation between first and
+; non-first identifier happens in completionAnalysis.ts.
+(trait_sm_binding value: (qualified_name (identifier) @scope.trait_sm_binding_target))
 
 ; depend java.util.* — suppress (not a symbol reference)
 (depend_statement) @scope.suppress

package/definitions.scm

@@ -37,13 +37,18 @@
 
 (attribute_declaration name: (identifier) @definition.attribute)
 (enumerated_attribute name: (identifier) @definition.attribute)
+(port_declaration name: (identifier) @definition.port)
 (const_declaration name: (identifier) @definition.const)
 (method_declaration name: (identifier) @definition.method)
 (abstract_method_declaration name: (identifier) @definition.method)
 (method_signature name: (identifier) @definition.method)
 (trait_method_signature name: (identifier) @definition.method)
+(active_method name: (identifier) @definition.method)
+(test_case name: (identifier) @definition.method)
 (state_machine name: (identifier) @definition.statemachine)
 (state name: (identifier) @definition.state)
+(state name: (qualified_name (identifier) @definition.state .))
+(event_spec (identifier) @definition.event)
 (referenced_statemachine name: (identifier) @definition.statemachine)
 (emit_method name: (identifier) @definition.method)
 (template_attribute name: (identifier) @definition.template)

package/highlights.scm

@@ -0,0 +1,487 @@
+; Tree-sitter highlight queries for Umple
+; Only uses node types that exist in the grammar
+
+; =============
+; KEYWORDS
+; =============
+
+[
+  "class"
+  "interface"
+  "trait"
+  "enum"
+  "association"
+  "external"
+  "req"
+  "mixset"
+  "associationClass"
+  "statemachine"
+] @keyword.type
+
+[
+  "namespace"
+  "use"
+  "depend"
+  "generate"
+] @keyword.import
+
+[
+  "filter"
+  "include"
+  "includeFilter"
+  "hops"
+  "super"
+  "sub"
+  "strictness"
+  "glossary"
+  "who"
+  "when"
+  "what"
+  "why"
+  "userStep"
+  "systemResponse"
+] @keyword.directive
+
+(filter_definition
+  name: (filter_name (integer_literal) @number))
+
+(filter_definition
+  name: (filter_name (identifier) @variable))
+
+(filter_combined_value
+  (filter_name (integer_literal) @number))
+
+(filter_combined_value
+  (filter_name (identifier) @variable))
+
+(filter_value
+  (filter_pattern) @string.special)
+
+(filter_namespace_stmt
+  (qualified_name) @module)
+
+(filter_hop_super
+  (integer_literal) @number)
+
+(filter_hop_sub
+  (integer_literal) @number)
+
+(filter_hop_association
+  (integer_literal) @number)
+
+(generate_statement language: _ @string.special)
+
+(code_lang) @string.special
+
+[
+  "--override"
+  "--override-all"
+  "-s"
+  "--suboption"
+] @keyword.modifier
+
+[
+  "isA"
+  "implementsReq"
+  "isFeature"
+] @keyword.modifier
+
+[
+  "require"
+  "subfeature"
+] @keyword.directive
+
+[
+  "abstract"
+  "inner"
+  "static"
+  "const"
+  "constant"
+  "lazy"
+  "settable"
+  "internal"
+  "defaulted"
+  "immutable"
+  "autounique"
+  "ivar"
+  "unique"
+  "singleton"
+  "queued"
+  "pooled"
+  "conjugated"
+  "atomic"
+  "synchronous"
+  "intercept"
+  "override"
+  "JUnit"
+  "concrete"
+  "forced"
+  "on"
+  "off"
+  "modelOnly"
+  "noExtraCode"
+  "none"
+  "allow"
+  "ignore"
+  "expect"
+  "disallow"
+  "disable"
+] @keyword.modifier
+
+[
+  "public"
+  "private"
+  "protected"
+] @keyword.modifier
+
+[
+  "before"
+  "after"
+  "around"
+  "custom"
+  "generated"
+  "all"
+  "emit"
+] @keyword.directive
+
+[
+  "entry"
+  "exit"
+  "do"
+  "active"
+  "final"
+  "trace"
+  "tracer"
+  "tracecase"
+  "suboption"
+  "distributable"
+  "test"
+  "testSequence"
+  "generic"
+  "activate"
+  "deactivate"
+  "position"
+  "position.association"
+  "in"
+  "out"
+  "port"
+] @keyword
+
+; Trace postfix sub-keywords (children of trace_postfix, not trace_statement)
+; Trace prefix keywords (children of trace_statement)
+(trace_statement ["set" "get" "onlyGet" "onlySet" "in" "out" "entry" "exit" "cardinality" "add" "remove" "transition"] @keyword)
+(trace_postfix ["where" "until" "after" "giving" "execute" "record" "logLevel" "for" "period" "during"] @keyword)
+(trace_postfix ["trace" "debug" "info" "warn" "error" "fatal" "all" "finest" "finer" "fine" "config" "warning" "severe"] @constant)
+(trace_record_target "only" @keyword)
+; Tracer directive type
+(tracer_directive type: (identifier) @type)
+(tracer_directive
+  type: (identifier)
+  (identifier) @variable.member)
+; activate/deactivate modifiers (direct children of trace_statement)
+(trace_statement ["onAllObjects" "onThisThreadOnly" "onThisObject" "for"] @keyword)
+
+[
+  "new"
+] @keyword.operator
+
+[
+  "displayColor"
+  "displayColour"
+  "key"
+  "self"
+] @keyword
+
+; =============
+; TYPES
+; =============
+
+(class_definition
+  name: (identifier) @type.definition)
+
+(interface_definition
+  name: (identifier) @type.definition)
+
+(trait_definition
+  name: (identifier) @type.definition)
+
+(enum_definition
+  name: (identifier) @type.definition)
+
+(enum_value
+  name: (identifier) @constant)
+
+(external_definition
+  name: (identifier) @type.definition)
+
+(requirement_definition
+  name: (identifier) @type.definition)
+
+(mixset_definition
+  name: (identifier) @type.definition)
+
+(association_class_definition
+  name: (identifier) @type.definition)
+
+(toplevel_code_injection
+  target: (identifier) @type)
+
+(type_name
+  (qualified_name) @type)
+
+(isa_declaration
+  (isa_type_list
+    (type_name) @type))
+
+(trait_binding
+  param: (identifier) @variable
+  value: (qualified_name) @type)
+
+; Trait SM binding: highlight only (value is visual approximation, not semantic type)
+(trait_sm_binding
+  param: (qualified_name) @variable.member
+  value: (qualified_name) @type)
+
+; Built-in types
+((identifier) @type.builtin
+  (#any-of? @type.builtin
+    "String"
+    "Integer"
+    "Float"
+    "Double"
+    "Boolean"
+    "Date"
+    "Time"
+    "void"))
+
+; =============
+; FUNCTIONS
+; =============
+
+(method_declaration
+  name: (identifier) @function)
+
+(method_signature
+  name: (identifier) @function)
+
+(trait_method_signature
+  name: (identifier) @function)
+
+(active_method
+  name: (identifier) @function)
+
+(event_spec
+  (identifier) @function.method)
+
+(emit_method name: (identifier) @function)
+(test_case name: (identifier) @function)
+(test_sequence name: (identifier) @function)
+(test_sequence_step
+  from: (identifier) @function.method
+  to: (identifier) @function.method)
+(generic_test_case name: (identifier) @function)
+(template_attribute name: (identifier) @variable.member)
+(template_body) @string
+(template_reference template_owner: (identifier) @type)
+(template_reference template_name: (identifier) @variable.member)
+
+; =============
+; VARIABLES & PARAMETERS
+; =============
+
+(attribute_declaration
+  name: (identifier) @variable.member)
+
+(const_declaration
+  name: (identifier) @constant)
+
+(param
+  name: (identifier) @variable.parameter)
+
+; Ports
+(port_declaration
+  name: (identifier) @variable.member)
+
+(port_connector
+  (qualified_name (identifier) @variable.member))
+
+; Key attributes
+(key_definition
+  (identifier) @variable.member)
+
+; =============
+; STATE MACHINES
+; =============
+
+(state_machine
+  name: (identifier) @variable.member)
+
+(statemachine_definition
+  name: (identifier) @variable.member)
+
+(referenced_statemachine
+  name: (identifier) @variable.member)
+
+(referenced_statemachine
+  definition: (identifier) @type)
+
+"as" @keyword
+
+(state
+  change_type: _ @operator)
+
+(state
+  name: (identifier) @constant)
+
+(transition
+  target: (qualified_name (identifier) @constant))
+
+; Standalone transition states
+(standalone_transition
+  from_state: (identifier) @constant)
+
+(standalone_transition
+  to_state: (identifier) @constant)
+
+(state_to_state_transition
+  from_state: (identifier) @constant)
+
+(state_to_state_transition
+  to_state: (identifier) @constant)
+
+; =============
+; ASSOCIATIONS
+; =============
+
+; Inline association type (e.g., "1 -- * Address addresses;")
+(association_inline
+  right_type: (identifier) @type)
+
+(association_inline
+  right_role: (identifier) @variable.member)
+
+(association_inline
+  left_role: (identifier) @variable.member)
+
+; Standalone association types (e.g., "0..1 Mentor -- * Student;")
+(association_member
+  left_type: (identifier) @type)
+
+(association_member
+  right_type: (identifier) @type)
+
+(association_member
+  left_role: (identifier) @variable.member)
+
+(association_member
+  right_role: (identifier) @variable.member)
+
+; Single association end (in associationClass)
+(single_association_end
+  type: (identifier) @type)
+
+(single_association_end
+  other_end_role: (identifier) @variable.member)
+
+(single_association_end
+  role_name: (identifier) @variable.member)
+
+; Symmetric reflexive association
+(symmetric_reflexive_association
+  role: (identifier) @variable.member)
+
+; =============
+; NAMESPACE & IMPORTS
+; =============
+
+(namespace_declaration
+  name: (qualified_name) @module)
+
+(use_statement
+  path: (_) @string.special.path)
+
+(depend_statement
+  package: (_) @module)
+
+; =============
+; OPERATORS & PUNCTUATION
+; =============
+
+[
+  "->"
+  "--"
+  "<-"
+  "<@>-"
+  "-<@>"
+  ">->"
+  "<-<"
+  "="
+  "||"
+] @operator
+
+[
+  ";"
+  ","
+  "."
+] @punctuation.delimiter
+
+[
+  "{"
+  "}"
+  "("
+  ")"
+  "["
+  "]"
+  "<"
+  ">"
+] @punctuation.bracket
+
+; Multiplicity
+(multiplicity) @number
+
+; UmpleOnline layout payloads
+(position_directive
+  (position_number) @number)
+
+(position_association_directive
+  (position_association_payload) @variable.member
+  (position_coordinate_pair) @number)
+
+; =============
+; LITERALS
+; =============
+
+(number) @number
+
+(integer_literal) @number
+
+(string_literal) @string
+
+(boolean) @boolean
+
+"null" @constant.builtin
+"true" @boolean
+"false" @boolean
+
+; =============
+; COMMENTS
+; =============
+
+(line_comment) @comment
+
+(block_comment) @comment
+
+; =============
+; CONSTRAINTS
+; =============
+
+(constraint) @string.special
+
+; Named invariant label: [myInvariant: expr]
+(constraint_name (identifier) @property)
+
+; =============
+; REQUIRE STATEMENT
+; =============
+
+(require_body) @string.special

package/out/codeActions.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Quick-fix code actions for Umple diagnostics (topics 056, 057).
+ *
+ * Pure logic only: takes a TextDocument + Diagnostic[] and returns the
+ * CodeActions that apply. No LSP transport, no compiler invocation.
+ *
+ * Currently produces a single user-visible action: `Add missing semicolon`.
+ * Three trigger codes, three classifiers:
+ *
+ *   - W1007 (class-content): isA / implementsReq / inline assoc / interface
+ *     method signature / attribute declaration (incl. simple default value).
+ *   - W1006 (state-machine): transition with optional guard + action body.
+ *   - E1502 (filter-body): include / includeFilter / namespace statements.
+ *     The diagnostic line points to the filter HEADER, so this branch
+ *     scans the filter block for an unterminated single-line statement and
+ *     emits the action only when EXACTLY ONE candidate is found.
+ *
+ * Each classifier rejects line shapes where appending `;` either doesn't
+ * fix the diagnostic or introduces a new one.
+ */
+import { CodeAction, Diagnostic } from "vscode-languageserver/node";
+import { TextDocument } from "vscode-languageserver-textdocument";
+/**
+ * Build all quick-fix CodeActions that apply to the given diagnostic set.
+ * Currently this is just `Add missing semicolon`.
+ */
+export declare function buildQuickFixActions(document: TextDocument, diagnostics: Diagnostic[]): CodeAction[];
+export declare function splitCodeAndComment(lineText: string): {
+    code: string;
+    comment: string;
+};