sysml-v2-lsp 0.33.0 → 0.34.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [0.34.0]
+
+### Added
+
+- Add `.github/copilot-instructions.md` requiring language-affecting changes to be validated against the latest OMG SysML and KerML specifications, with cited clauses or grammar productions and a regression test.
+
+### Fixed
+
+- Report only an element's own multiplicity: a definition or usage no longer takes the multiplicity of a nested element (`part def Car { part : Engine[2]; }` gave `Car` the multiplicity `2`), and a unit in a default value (`default 0 [kg]`) is no longer reported as a multiplicity. SysML definitions cannot declare a multiplicity (`DefinitionDeclaration`); a usage's comes from its own `FeatureSpecializationPart`. `sysml/model` now reads multiplicity from the parse tree, so a usage whose multiplicity follows a specialization (`item :>> edges [3..4]`) reports it correctly.
+- A connection or interface no longer reports the multiplicity of one of its ends (`connection c connect [2] a.p to [1] b.p;`): a `ConnectorEnd`'s cross multiplicity belongs to the end, not the connector.
+- Elements named with an unreserved KerML keyword (`step`, `function`, `type`, `member`, `feature`, `behavior`, `var`, `multiplicity`, ...) keep their name, which the grammar allows (`name : IDENTIFIER | STRING | unreservedKeyword`). They were reported as anonymous, e.g. `perform action step[2];` was shown as `[2]`, and `alias multiplicity for degeneracy;` was named after its target.
+
 ## [0.33.0]
 
 ### Added

package/dist/server/browserServerMain.js

@@ -131838,7 +131838,7 @@ ${JSON.stringify(message, null, 4)}`);
         const child = ctx.getChild(i);
         if (child instanceof TerminalNode) {
           const token = child.symbol;
-          if (this.isIdentifierToken(token)) {
+          if (this.isNameTerminal(child)) {
             return this.unquoteName(token.text ?? "");
           }
         }
@@ -131890,14 +131890,15 @@ ${JSON.stringify(message, null, 4)}`);
     /**
      * The first node of rule `ruleIndex` in `ctx`'s own declaration: never
      * inside a nested element, its body, its value, a flow's payload or ends,
-     * or a prefix such as `#metadata`.
+     * a connector end's own multiplicity (`connect [2] a to b`), or a prefix
+     * such as `#metadata`.
      */
     findOwnHeaderRule(ctx, ruleIndex) {
       for (let i = 0; i < ctx.getChildCount(); i++) {
         const child = ctx.getChild(i);
         if (!(child instanceof ParserRuleContext)) continue;
         if (child.ruleIndex === ruleIndex) return child;
-        if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || this.isPrefixOrExtensionContext(child)) continue;
+        if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_ownedCrossMultiplicityMember || this.isPrefixOrExtensionContext(child)) continue;
         const found = this.findOwnHeaderRule(child, ruleIndex);
         if (found) return found;
       }
@@ -132061,7 +132062,7 @@ ${JSON.stringify(message, null, 4)}`);
     extractNameRange(ctx) {
       for (let i = 0; i < ctx.getChildCount(); i++) {
         const child = ctx.getChild(i);
-        if (child instanceof TerminalNode && this.isIdentifierToken(child.symbol)) {
+        if (child instanceof TerminalNode && this.isNameTerminal(child)) {
           return tokenToRange(child.symbol);
         }
         if (child instanceof ParserRuleContext) {
@@ -132246,12 +132247,12 @@ ${JSON.stringify(message, null, 4)}`);
       return lines.join("\n").trim();
     }
     /**
-     * Extract multiplicity from a context.
-     * Looks for MultiplicityBoundsContext in the subtree.
+     * Extract multiplicity from a context's own declaration, never from a
+     * nested element or its body.
      * Returns { multiplicity: "1..5", multiplicityRange: { lower: 1, upper: 5 } }
      */
     extractMultiplicity(ctx) {
-      const multCtx = this.findMultiplicityBounds(ctx);
+      const multCtx = this.findOwnHeaderRule(ctx, SysMLv2Parser.RULE_multiplicityBounds);
       if (!multCtx) {
         return {};
       }
@@ -132305,24 +132306,6 @@ ${JSON.stringify(message, null, 4)}`);
         multiplicityRange: { lower, upper }
       };
     }
-    /**
-     * Recursively search for a MultiplicityBoundsContext in the subtree.
-     */
-    findMultiplicityBounds(ctx) {
-      if (ctx.ruleIndex === SysMLv2Parser.RULE_multiplicityBounds) {
-        return ctx;
-      }
-      for (let i = 0; i < ctx.getChildCount(); i++) {
-        const child = ctx.getChild(i);
-        if (child instanceof ParserRuleContext) {
-          const result = this.findMultiplicityBounds(child);
-          if (result) {
-            return result;
-          }
-        }
-      }
-      return void 0;
-    }
     /**
      * Whether a context is a prefix metadata or definition/usage prefix rule.
      * These contain annotation identifiers (e.g. from `#product`) that should
@@ -132364,6 +132347,14 @@ ${JSON.stringify(message, null, 4)}`);
       if (this.isQuotedName(text)) return true;
       return /^[a-zA-Z_]/.test(text) && !this.isKeyword(text);
     }
+    /**
+     * Whether a terminal is (part of) a name: an identifier, a quoted name, or
+     * a KerML keyword such as `step` or `function` that the grammar parsed as a
+     * name (`name : IDENTIFIER | STRING | unreservedKeyword`).
+     */
+    isNameTerminal(node) {
+      return this.isIdentifierToken(node.symbol) || node.parent?.ruleIndex === SysMLv2Parser.RULE_unreservedKeyword;
+    }
     /**
      * Check if text is a SysML quoted name (single-quoted string).
      */
@@ -132733,7 +132724,7 @@ ${JSON.stringify(message, null, 4)}`);
         const child = ctx.getChild(i);
         if (child instanceof TerminalNode) {
           const text = child.symbol.text;
-          if (text && this.isIdentifierToken(child.symbol)) {
+          if (text && this.isNameTerminal(child)) {
             parts.push(this.unquoteName(text));
           }
         } else if (child instanceof ParserRuleContext) {
@@ -137049,9 +137040,8 @@ ${JSON.stringify(message, null, 4)}`);
       if (direction) {
         attributes["direction"] = direction;
       }
-      const multiplicity = this.extractMultiplicity(symbol, lines);
-      if (multiplicity) {
-        attributes["multiplicity"] = multiplicity;
+      if (symbol.multiplicity) {
+        attributes["multiplicity"] = symbol.multiplicity;
       }
       const modifier = this.extractModifier(symbol, lines);
       if (modifier) {
@@ -137669,7 +137659,7 @@ ${JSON.stringify(message, null, 4)}`);
             name: c.name,
             kind: toMetaclassName(c.kind),
             type: c.typeNames.join(", ") || void 0,
-            multiplicity: c.multiplicity ?? this.extractMultiplicity(c, lines),
+            multiplicity: c.multiplicity,
             direction,
             visibility: c.visibility,
             isDerived: modifier?.split(", ").includes("derived") ?? false,
@@ -137793,15 +137783,6 @@ ${JSON.stringify(message, null, 4)}`);
       if (containsWord(elementText, "out")) return "out";
       return void 0;
     }
-    /** Extract multiplicity (e.g., [4], [0..*]) from source text. */
-    extractMultiplicity(symbol, lines) {
-      const elementText = this.getElementText(symbol, lines);
-      const open = elementText.indexOf("[");
-      if (open < 0) return void 0;
-      const close = elementText.indexOf("]", open + 1);
-      if (close < 0) return void 0;
-      return elementText.substring(open + 1, close);
-    }
     /** Extract modifiers (abstract, readonly, derived, etc.) from source text. */
     extractModifier(symbol, lines) {
       const elementText = this.getElementText(symbol, lines);

package/dist/server/mcpServer.js

@@ -160758,7 +160758,7 @@ var SymbolTable = class {
       const child = ctx2.getChild(i);
       if (child instanceof TerminalNode) {
         const token = child.symbol;
-        if (this.isIdentifierToken(token)) {
+        if (this.isNameTerminal(child)) {
           return this.unquoteName(token.text ?? "");
         }
       }
@@ -160810,14 +160810,15 @@ var SymbolTable = class {
   /**
    * The first node of rule `ruleIndex` in `ctx`'s own declaration: never
    * inside a nested element, its body, its value, a flow's payload or ends,
-   * or a prefix such as `#metadata`.
+   * a connector end's own multiplicity (`connect [2] a to b`), or a prefix
+   * such as `#metadata`.
    */
   findOwnHeaderRule(ctx2, ruleIndex) {
     for (let i = 0; i < ctx2.getChildCount(); i++) {
       const child = ctx2.getChild(i);
       if (!(child instanceof ParserRuleContext)) continue;
       if (child.ruleIndex === ruleIndex) return child;
-      if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || this.isPrefixOrExtensionContext(child)) continue;
+      if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_ownedCrossMultiplicityMember || this.isPrefixOrExtensionContext(child)) continue;
       const found = this.findOwnHeaderRule(child, ruleIndex);
       if (found) return found;
     }
@@ -160981,7 +160982,7 @@ var SymbolTable = class {
   extractNameRange(ctx2) {
     for (let i = 0; i < ctx2.getChildCount(); i++) {
       const child = ctx2.getChild(i);
-      if (child instanceof TerminalNode && this.isIdentifierToken(child.symbol)) {
+      if (child instanceof TerminalNode && this.isNameTerminal(child)) {
         return tokenToRange(child.symbol);
       }
       if (child instanceof ParserRuleContext) {
@@ -161166,12 +161167,12 @@ var SymbolTable = class {
     return lines.join("\n").trim();
   }
   /**
-   * Extract multiplicity from a context.
-   * Looks for MultiplicityBoundsContext in the subtree.
+   * Extract multiplicity from a context's own declaration, never from a
+   * nested element or its body.
    * Returns { multiplicity: "1..5", multiplicityRange: { lower: 1, upper: 5 } }
    */
   extractMultiplicity(ctx2) {
-    const multCtx = this.findMultiplicityBounds(ctx2);
+    const multCtx = this.findOwnHeaderRule(ctx2, SysMLv2Parser.RULE_multiplicityBounds);
     if (!multCtx) {
       return {};
     }
@@ -161225,24 +161226,6 @@ var SymbolTable = class {
       multiplicityRange: { lower, upper }
     };
   }
-  /**
-   * Recursively search for a MultiplicityBoundsContext in the subtree.
-   */
-  findMultiplicityBounds(ctx2) {
-    if (ctx2.ruleIndex === SysMLv2Parser.RULE_multiplicityBounds) {
-      return ctx2;
-    }
-    for (let i = 0; i < ctx2.getChildCount(); i++) {
-      const child = ctx2.getChild(i);
-      if (child instanceof ParserRuleContext) {
-        const result = this.findMultiplicityBounds(child);
-        if (result) {
-          return result;
-        }
-      }
-    }
-    return void 0;
-  }
   /**
    * Whether a context is a prefix metadata or definition/usage prefix rule.
    * These contain annotation identifiers (e.g. from `#product`) that should
@@ -161284,6 +161267,14 @@ var SymbolTable = class {
     if (this.isQuotedName(text)) return true;
     return /^[a-zA-Z_]/.test(text) && !this.isKeyword(text);
   }
+  /**
+   * Whether a terminal is (part of) a name: an identifier, a quoted name, or
+   * a KerML keyword such as `step` or `function` that the grammar parsed as a
+   * name (`name : IDENTIFIER | STRING | unreservedKeyword`).
+   */
+  isNameTerminal(node2) {
+    return this.isIdentifierToken(node2.symbol) || node2.parent?.ruleIndex === SysMLv2Parser.RULE_unreservedKeyword;
+  }
   /**
    * Check if text is a SysML quoted name (single-quoted string).
    */
@@ -161653,7 +161644,7 @@ var SymbolTable = class {
       const child = ctx2.getChild(i);
       if (child instanceof TerminalNode) {
         const text = child.symbol.text;
-        if (text && this.isIdentifierToken(child.symbol)) {
+        if (text && this.isNameTerminal(child)) {
           parts.push(this.unquoteName(text));
         }
       } else if (child instanceof ParserRuleContext) {
@@ -162080,9 +162071,8 @@ var SysMLModelProvider = class {
     if (direction) {
       attributes["direction"] = direction;
     }
-    const multiplicity = this.extractMultiplicity(symbol2, lines);
-    if (multiplicity) {
-      attributes["multiplicity"] = multiplicity;
+    if (symbol2.multiplicity) {
+      attributes["multiplicity"] = symbol2.multiplicity;
     }
     const modifier = this.extractModifier(symbol2, lines);
     if (modifier) {
@@ -162700,7 +162690,7 @@ var SysMLModelProvider = class {
           name: c.name,
           kind: toMetaclassName(c.kind),
           type: c.typeNames.join(", ") || void 0,
-          multiplicity: c.multiplicity ?? this.extractMultiplicity(c, lines),
+          multiplicity: c.multiplicity,
           direction,
           visibility: c.visibility,
           isDerived: modifier?.split(", ").includes("derived") ?? false,
@@ -162824,15 +162814,6 @@ var SysMLModelProvider = class {
     if (containsWord(elementText, "out")) return "out";
     return void 0;
   }
-  /** Extract multiplicity (e.g., [4], [0..*]) from source text. */
-  extractMultiplicity(symbol2, lines) {
-    const elementText = this.getElementText(symbol2, lines);
-    const open2 = elementText.indexOf("[");
-    if (open2 < 0) return void 0;
-    const close = elementText.indexOf("]", open2 + 1);
-    if (close < 0) return void 0;
-    return elementText.substring(open2 + 1, close);
-  }
   /** Extract modifiers (abstract, readonly, derived, etc.) from source text. */
   extractModifier(symbol2, lines) {
     const elementText = this.getElementText(symbol2, lines);

package/dist/server/server.js

@@ -123168,7 +123168,7 @@ var SymbolTable = class {
       const child = ctx.getChild(i);
       if (child instanceof TerminalNode) {
         const token = child.symbol;
-        if (this.isIdentifierToken(token)) {
+        if (this.isNameTerminal(child)) {
           return this.unquoteName(token.text ?? "");
         }
       }
@@ -123220,14 +123220,15 @@ var SymbolTable = class {
   /**
    * The first node of rule `ruleIndex` in `ctx`'s own declaration: never
    * inside a nested element, its body, its value, a flow's payload or ends,
-   * or a prefix such as `#metadata`.
+   * a connector end's own multiplicity (`connect [2] a to b`), or a prefix
+   * such as `#metadata`.
    */
   findOwnHeaderRule(ctx, ruleIndex) {
     for (let i = 0; i < ctx.getChildCount(); i++) {
       const child = ctx.getChild(i);
       if (!(child instanceof ParserRuleContext)) continue;
       if (child.ruleIndex === ruleIndex) return child;
-      if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || this.isPrefixOrExtensionContext(child)) continue;
+      if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_ownedCrossMultiplicityMember || this.isPrefixOrExtensionContext(child)) continue;
       const found = this.findOwnHeaderRule(child, ruleIndex);
       if (found) return found;
     }
@@ -123391,7 +123392,7 @@ var SymbolTable = class {
   extractNameRange(ctx) {
     for (let i = 0; i < ctx.getChildCount(); i++) {
       const child = ctx.getChild(i);
-      if (child instanceof TerminalNode && this.isIdentifierToken(child.symbol)) {
+      if (child instanceof TerminalNode && this.isNameTerminal(child)) {
         return tokenToRange(child.symbol);
       }
       if (child instanceof ParserRuleContext) {
@@ -123576,12 +123577,12 @@ var SymbolTable = class {
     return lines.join("\n").trim();
   }
   /**
-   * Extract multiplicity from a context.
-   * Looks for MultiplicityBoundsContext in the subtree.
+   * Extract multiplicity from a context's own declaration, never from a
+   * nested element or its body.
    * Returns { multiplicity: "1..5", multiplicityRange: { lower: 1, upper: 5 } }
    */
   extractMultiplicity(ctx) {
-    const multCtx = this.findMultiplicityBounds(ctx);
+    const multCtx = this.findOwnHeaderRule(ctx, SysMLv2Parser.RULE_multiplicityBounds);
     if (!multCtx) {
       return {};
     }
@@ -123635,24 +123636,6 @@ var SymbolTable = class {
       multiplicityRange: { lower, upper }
     };
   }
-  /**
-   * Recursively search for a MultiplicityBoundsContext in the subtree.
-   */
-  findMultiplicityBounds(ctx) {
-    if (ctx.ruleIndex === SysMLv2Parser.RULE_multiplicityBounds) {
-      return ctx;
-    }
-    for (let i = 0; i < ctx.getChildCount(); i++) {
-      const child = ctx.getChild(i);
-      if (child instanceof ParserRuleContext) {
-        const result = this.findMultiplicityBounds(child);
-        if (result) {
-          return result;
-        }
-      }
-    }
-    return void 0;
-  }
   /**
    * Whether a context is a prefix metadata or definition/usage prefix rule.
    * These contain annotation identifiers (e.g. from `#product`) that should
@@ -123694,6 +123677,14 @@ var SymbolTable = class {
     if (this.isQuotedName(text)) return true;
     return /^[a-zA-Z_]/.test(text) && !this.isKeyword(text);
   }
+  /**
+   * Whether a terminal is (part of) a name: an identifier, a quoted name, or
+   * a KerML keyword such as `step` or `function` that the grammar parsed as a
+   * name (`name : IDENTIFIER | STRING | unreservedKeyword`).
+   */
+  isNameTerminal(node) {
+    return this.isIdentifierToken(node.symbol) || node.parent?.ruleIndex === SysMLv2Parser.RULE_unreservedKeyword;
+  }
   /**
    * Check if text is a SysML quoted name (single-quoted string).
    */
@@ -124063,7 +124054,7 @@ var SymbolTable = class {
       const child = ctx.getChild(i);
       if (child instanceof TerminalNode) {
         const text = child.symbol.text;
-        if (text && this.isIdentifierToken(child.symbol)) {
+        if (text && this.isNameTerminal(child)) {
           parts.push(this.unquoteName(text));
         }
       } else if (child instanceof ParserRuleContext) {
@@ -126020,9 +126011,8 @@ var SysMLModelProvider = class {
     if (direction) {
       attributes["direction"] = direction;
     }
-    const multiplicity = this.extractMultiplicity(symbol, lines);
-    if (multiplicity) {
-      attributes["multiplicity"] = multiplicity;
+    if (symbol.multiplicity) {
+      attributes["multiplicity"] = symbol.multiplicity;
     }
     const modifier = this.extractModifier(symbol, lines);
     if (modifier) {
@@ -126640,7 +126630,7 @@ var SysMLModelProvider = class {
           name: c.name,
           kind: toMetaclassName(c.kind),
           type: c.typeNames.join(", ") || void 0,
-          multiplicity: c.multiplicity ?? this.extractMultiplicity(c, lines),
+          multiplicity: c.multiplicity,
           direction,
           visibility: c.visibility,
           isDerived: modifier?.split(", ").includes("derived") ?? false,
@@ -126764,15 +126754,6 @@ var SysMLModelProvider = class {
     if (containsWord(elementText, "out")) return "out";
     return void 0;
   }
-  /** Extract multiplicity (e.g., [4], [0..*]) from source text. */
-  extractMultiplicity(symbol, lines) {
-    const elementText = this.getElementText(symbol, lines);
-    const open = elementText.indexOf("[");
-    if (open < 0) return void 0;
-    const close = elementText.indexOf("]", open + 1);
-    if (close < 0) return void 0;
-    return elementText.substring(open + 1, close);
-  }
   /** Extract modifiers (abstract, readonly, derived, etc.) from source text. */
   extractModifier(symbol, lines) {
     const elementText = this.getElementText(symbol, lines);

package/package.json

@@ -2,7 +2,7 @@
   "name": "sysml-v2-lsp",
   "displayName": "SysML v2 Language Server",
   "description": "Language Server Protocol implementation for SysML v2, powered by ANTLR4",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "publisher": "JamieD",
   "license": "MIT",
   "repository": {