sysml-v2-lsp 0.35.0 → 0.37.0

package/dist/server/server.js

@@ -118,28 +118,28 @@ var require_messages = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.Message = exports2.NotificationType9 = exports2.NotificationType8 = exports2.NotificationType7 = exports2.NotificationType6 = exports2.NotificationType5 = exports2.NotificationType4 = exports2.NotificationType3 = exports2.NotificationType2 = exports2.NotificationType1 = exports2.NotificationType0 = exports2.NotificationType = exports2.RequestType9 = exports2.RequestType8 = exports2.RequestType7 = exports2.RequestType6 = exports2.RequestType5 = exports2.RequestType4 = exports2.RequestType3 = exports2.RequestType2 = exports2.RequestType1 = exports2.RequestType = exports2.RequestType0 = exports2.AbstractMessageSignature = exports2.ParameterStructures = exports2.ResponseError = exports2.ErrorCodes = void 0;
     var is = require_is2();
-    var ErrorCodes;
-    (function(ErrorCodes2) {
-      ErrorCodes2.ParseError = -32700;
-      ErrorCodes2.InvalidRequest = -32600;
-      ErrorCodes2.MethodNotFound = -32601;
-      ErrorCodes2.InvalidParams = -32602;
-      ErrorCodes2.InternalError = -32603;
-      ErrorCodes2.jsonrpcReservedErrorRangeStart = -32099;
-      ErrorCodes2.serverErrorStart = -32099;
-      ErrorCodes2.MessageWriteError = -32099;
-      ErrorCodes2.MessageReadError = -32098;
-      ErrorCodes2.PendingResponseRejected = -32097;
-      ErrorCodes2.ConnectionInactive = -32096;
-      ErrorCodes2.ServerNotInitialized = -32002;
-      ErrorCodes2.UnknownErrorCode = -32001;
-      ErrorCodes2.jsonrpcReservedErrorRangeEnd = -32e3;
-      ErrorCodes2.serverErrorEnd = -32e3;
-    })(ErrorCodes || (exports2.ErrorCodes = ErrorCodes = {}));
-    var ResponseError = class _ResponseError extends Error {
+    var ErrorCodes2;
+    (function(ErrorCodes3) {
+      ErrorCodes3.ParseError = -32700;
+      ErrorCodes3.InvalidRequest = -32600;
+      ErrorCodes3.MethodNotFound = -32601;
+      ErrorCodes3.InvalidParams = -32602;
+      ErrorCodes3.InternalError = -32603;
+      ErrorCodes3.jsonrpcReservedErrorRangeStart = -32099;
+      ErrorCodes3.serverErrorStart = -32099;
+      ErrorCodes3.MessageWriteError = -32099;
+      ErrorCodes3.MessageReadError = -32098;
+      ErrorCodes3.PendingResponseRejected = -32097;
+      ErrorCodes3.ConnectionInactive = -32096;
+      ErrorCodes3.ServerNotInitialized = -32002;
+      ErrorCodes3.UnknownErrorCode = -32001;
+      ErrorCodes3.jsonrpcReservedErrorRangeEnd = -32e3;
+      ErrorCodes3.serverErrorEnd = -32e3;
+    })(ErrorCodes2 || (exports2.ErrorCodes = ErrorCodes2 = {}));
+    var ResponseError2 = class _ResponseError extends Error {
       constructor(code, message, data) {
         super(message);
-        this.code = is.number(code) ? code : ErrorCodes.UnknownErrorCode;
+        this.code = is.number(code) ? code : ErrorCodes2.UnknownErrorCode;
         this.data = data;
         Object.setPrototypeOf(this, _ResponseError.prototype);
       }
@@ -154,7 +154,7 @@ var require_messages = __commonJS({
         return result;
       }
     };
-    exports2.ResponseError = ResponseError;
+    exports2.ResponseError = ResponseError2;
     var ParameterStructures = class _ParameterStructures {
       constructor(kind) {
         this.kind = kind;
@@ -3375,8 +3375,8 @@ var require_main2 = __commonJS({
         }
         uinteger2.is = is;
       })(uinteger || (exports3.uinteger = uinteger = {}));
-      var Position2;
-      (function(Position3) {
+      var Position4;
+      (function(Position5) {
         function create(line, character) {
           if (line === Number.MAX_VALUE) {
             line = uinteger.MAX_VALUE;
@@ -3386,43 +3386,43 @@ var require_main2 = __commonJS({
           }
           return { line, character };
         }
-        Position3.create = create;
+        Position5.create = create;
         function is(value) {
           var candidate = value;
           return Is.objectLiteral(candidate) && Is.uinteger(candidate.line) && Is.uinteger(candidate.character);
         }
-        Position3.is = is;
-      })(Position2 || (exports3.Position = Position2 = {}));
-      var Range2;
-      (function(Range3) {
+        Position5.is = is;
+      })(Position4 || (exports3.Position = Position4 = {}));
+      var Range6;
+      (function(Range7) {
         function create(one, two, three, four) {
           if (Is.uinteger(one) && Is.uinteger(two) && Is.uinteger(three) && Is.uinteger(four)) {
-            return { start: Position2.create(one, two), end: Position2.create(three, four) };
-          } else if (Position2.is(one) && Position2.is(two)) {
+            return { start: Position4.create(one, two), end: Position4.create(three, four) };
+          } else if (Position4.is(one) && Position4.is(two)) {
             return { start: one, end: two };
           } else {
             throw new Error("Range#create called with invalid arguments[".concat(one, ", ").concat(two, ", ").concat(three, ", ").concat(four, "]"));
           }
         }
-        Range3.create = create;
+        Range7.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Position2.is(candidate.start) && Position2.is(candidate.end);
+          return Is.objectLiteral(candidate) && Position4.is(candidate.start) && Position4.is(candidate.end);
         }
-        Range3.is = is;
-      })(Range2 || (exports3.Range = Range2 = {}));
-      var Location2;
-      (function(Location3) {
+        Range7.is = is;
+      })(Range6 || (exports3.Range = Range6 = {}));
+      var Location3;
+      (function(Location4) {
         function create(uri, range) {
           return { uri, range };
         }
-        Location3.create = create;
+        Location4.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && (Is.string(candidate.uri) || Is.undefined(candidate.uri));
+          return Is.objectLiteral(candidate) && Range6.is(candidate.range) && (Is.string(candidate.uri) || Is.undefined(candidate.uri));
         }
-        Location3.is = is;
-      })(Location2 || (exports3.Location = Location2 = {}));
+        Location4.is = is;
+      })(Location3 || (exports3.Location = Location3 = {}));
       var LocationLink;
       (function(LocationLink2) {
         function create(targetUri, targetRange, targetSelectionRange, originSelectionRange) {
@@ -3431,7 +3431,7 @@ var require_main2 = __commonJS({
         LocationLink2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.targetRange) && Is.string(candidate.targetUri) && Range2.is(candidate.targetSelectionRange) && (Range2.is(candidate.originSelectionRange) || Is.undefined(candidate.originSelectionRange));
+          return Is.objectLiteral(candidate) && Range6.is(candidate.targetRange) && Is.string(candidate.targetUri) && Range6.is(candidate.targetSelectionRange) && (Range6.is(candidate.originSelectionRange) || Is.undefined(candidate.originSelectionRange));
         }
         LocationLink2.is = is;
       })(LocationLink || (exports3.LocationLink = LocationLink = {}));
@@ -3463,7 +3463,7 @@ var require_main2 = __commonJS({
         ColorInformation2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && Color.is(candidate.color);
+          return Is.objectLiteral(candidate) && Range6.is(candidate.range) && Color.is(candidate.color);
         }
         ColorInformation2.is = is;
       })(ColorInformation || (exports3.ColorInformation = ColorInformation = {}));
@@ -3479,7 +3479,7 @@ var require_main2 = __commonJS({
         ColorPresentation2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Is.string(candidate.label) && (Is.undefined(candidate.textEdit) || TextEdit4.is(candidate)) && (Is.undefined(candidate.additionalTextEdits) || Is.typedArray(candidate.additionalTextEdits, TextEdit4.is));
+          return Is.objectLiteral(candidate) && Is.string(candidate.label) && (Is.undefined(candidate.textEdit) || TextEdit5.is(candidate)) && (Is.undefined(candidate.additionalTextEdits) || Is.typedArray(candidate.additionalTextEdits, TextEdit5.is));
         }
         ColorPresentation2.is = is;
       })(ColorPresentation || (exports3.ColorPresentation = ColorPresentation = {}));
@@ -3528,7 +3528,7 @@ var require_main2 = __commonJS({
         DiagnosticRelatedInformation2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Location2.is(candidate.location) && Is.string(candidate.message);
+          return Is.defined(candidate) && Location3.is(candidate.location) && Is.string(candidate.message);
         }
         DiagnosticRelatedInformation2.is = is;
       })(DiagnosticRelatedInformation || (exports3.DiagnosticRelatedInformation = DiagnosticRelatedInformation = {}));
@@ -3574,7 +3574,7 @@ var require_main2 = __commonJS({
         function is(value) {
           var _a;
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(candidate.range) && Is.string(candidate.message) && (Is.number(candidate.severity) || Is.undefined(candidate.severity)) && (Is.integer(candidate.code) || Is.string(candidate.code) || Is.undefined(candidate.code)) && (Is.undefined(candidate.codeDescription) || Is.string((_a = candidate.codeDescription) === null || _a === void 0 ? void 0 : _a.href)) && (Is.string(candidate.source) || Is.undefined(candidate.source)) && (Is.undefined(candidate.relatedInformation) || Is.typedArray(candidate.relatedInformation, DiagnosticRelatedInformation.is));
+          return Is.defined(candidate) && Range6.is(candidate.range) && Is.string(candidate.message) && (Is.number(candidate.severity) || Is.undefined(candidate.severity)) && (Is.integer(candidate.code) || Is.string(candidate.code) || Is.undefined(candidate.code)) && (Is.undefined(candidate.codeDescription) || Is.string((_a = candidate.codeDescription) === null || _a === void 0 ? void 0 : _a.href)) && (Is.string(candidate.source) || Is.undefined(candidate.source)) && (Is.undefined(candidate.relatedInformation) || Is.typedArray(candidate.relatedInformation, DiagnosticRelatedInformation.is));
         }
         Diagnostic7.is = is;
       })(Diagnostic6 || (exports3.Diagnostic = Diagnostic6 = {}));
@@ -3598,26 +3598,26 @@ var require_main2 = __commonJS({
         }
         Command2.is = is;
       })(Command || (exports3.Command = Command = {}));
-      var TextEdit4;
-      (function(TextEdit5) {
+      var TextEdit5;
+      (function(TextEdit6) {
         function replace(range, newText) {
           return { range, newText };
         }
-        TextEdit5.replace = replace;
+        TextEdit6.replace = replace;
         function insert(position, newText) {
           return { range: { start: position, end: position }, newText };
         }
-        TextEdit5.insert = insert;
+        TextEdit6.insert = insert;
         function del(range) {
           return { range, newText: "" };
         }
-        TextEdit5.del = del;
+        TextEdit6.del = del;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Is.string(candidate.newText) && Range2.is(candidate.range);
+          return Is.objectLiteral(candidate) && Is.string(candidate.newText) && Range6.is(candidate.range);
         }
-        TextEdit5.is = is;
-      })(TextEdit4 || (exports3.TextEdit = TextEdit4 = {}));
+        TextEdit6.is = is;
+      })(TextEdit5 || (exports3.TextEdit = TextEdit5 = {}));
       var ChangeAnnotation;
       (function(ChangeAnnotation2) {
         function create(label, needsConfirmation, description) {
@@ -3661,7 +3661,7 @@ var require_main2 = __commonJS({
         AnnotatedTextEdit2.del = del;
         function is(value) {
           var candidate = value;
-          return TextEdit4.is(candidate) && (ChangeAnnotation.is(candidate.annotationId) || ChangeAnnotationIdentifier.is(candidate.annotationId));
+          return TextEdit5.is(candidate) && (ChangeAnnotation.is(candidate.annotationId) || ChangeAnnotationIdentifier.is(candidate.annotationId));
         }
         AnnotatedTextEdit2.is = is;
       })(AnnotatedTextEdit || (exports3.AnnotatedTextEdit = AnnotatedTextEdit = {}));
@@ -3744,8 +3744,8 @@ var require_main2 = __commonJS({
         }
         DeleteFile2.is = is;
       })(DeleteFile || (exports3.DeleteFile = DeleteFile = {}));
-      var WorkspaceEdit3;
-      (function(WorkspaceEdit4) {
+      var WorkspaceEdit4;
+      (function(WorkspaceEdit5) {
         function is(value) {
           var candidate = value;
           return candidate && (candidate.changes !== void 0 || candidate.documentChanges !== void 0) && (candidate.documentChanges === void 0 || candidate.documentChanges.every(function(change) {
@@ -3756,8 +3756,8 @@ var require_main2 = __commonJS({
             }
           }));
         }
-        WorkspaceEdit4.is = is;
-      })(WorkspaceEdit3 || (exports3.WorkspaceEdit = WorkspaceEdit3 = {}));
+        WorkspaceEdit5.is = is;
+      })(WorkspaceEdit4 || (exports3.WorkspaceEdit = WorkspaceEdit4 = {}));
       var TextEditChangeImpl = (
         /** @class */
         (function() {
@@ -3769,7 +3769,7 @@ var require_main2 = __commonJS({
             var edit;
             var id;
             if (annotation === void 0) {
-              edit = TextEdit4.insert(position, newText);
+              edit = TextEdit5.insert(position, newText);
             } else if (ChangeAnnotationIdentifier.is(annotation)) {
               id = annotation;
               edit = AnnotatedTextEdit.insert(position, newText, annotation);
@@ -3787,7 +3787,7 @@ var require_main2 = __commonJS({
             var edit;
             var id;
             if (annotation === void 0) {
-              edit = TextEdit4.replace(range, newText);
+              edit = TextEdit5.replace(range, newText);
             } else if (ChangeAnnotationIdentifier.is(annotation)) {
               id = annotation;
               edit = AnnotatedTextEdit.replace(range, newText, annotation);
@@ -3805,7 +3805,7 @@ var require_main2 = __commonJS({
             var edit;
             var id;
             if (annotation === void 0) {
-              edit = TextEdit4.del(range);
+              edit = TextEdit5.del(range);
             } else if (ChangeAnnotationIdentifier.is(annotation)) {
               id = annotation;
               edit = AnnotatedTextEdit.del(range, annotation);
@@ -4158,7 +4158,7 @@ var require_main2 = __commonJS({
         InsertReplaceEdit2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate && Is.string(candidate.newText) && Range2.is(candidate.insert) && Range2.is(candidate.replace);
+          return candidate && Is.string(candidate.newText) && Range6.is(candidate.insert) && Range6.is(candidate.replace);
         }
         InsertReplaceEdit2.is = is;
       })(InsertReplaceEdit || (exports3.InsertReplaceEdit = InsertReplaceEdit = {}));
@@ -4205,7 +4205,7 @@ var require_main2 = __commonJS({
       (function(Hover4) {
         function is(value) {
           var candidate = value;
-          return !!candidate && Is.objectLiteral(candidate) && (MarkupContent2.is(candidate.contents) || MarkedString.is(candidate.contents) || Is.typedArray(candidate.contents, MarkedString.is)) && (value.range === void 0 || Range2.is(value.range));
+          return !!candidate && Is.objectLiteral(candidate) && (MarkupContent2.is(candidate.contents) || MarkedString.is(candidate.contents) || Is.typedArray(candidate.contents, MarkedString.is)) && (value.range === void 0 || Range6.is(value.range));
         }
         Hover4.is = is;
       })(Hover3 || (exports3.Hover = Hover3 = {}));
@@ -4326,7 +4326,7 @@ var require_main2 = __commonJS({
         DocumentSymbol3.create = create;
         function is(value) {
           var candidate = value;
-          return candidate && Is.string(candidate.name) && Is.number(candidate.kind) && Range2.is(candidate.range) && Range2.is(candidate.selectionRange) && (candidate.detail === void 0 || Is.string(candidate.detail)) && (candidate.deprecated === void 0 || Is.boolean(candidate.deprecated)) && (candidate.children === void 0 || Array.isArray(candidate.children)) && (candidate.tags === void 0 || Array.isArray(candidate.tags));
+          return candidate && Is.string(candidate.name) && Is.number(candidate.kind) && Range6.is(candidate.range) && Range6.is(candidate.selectionRange) && (candidate.detail === void 0 || Is.string(candidate.detail)) && (candidate.deprecated === void 0 || Is.boolean(candidate.deprecated)) && (candidate.children === void 0 || Array.isArray(candidate.children)) && (candidate.tags === void 0 || Array.isArray(candidate.tags));
         }
         DocumentSymbol3.is = is;
       })(DocumentSymbol2 || (exports3.DocumentSymbol = DocumentSymbol2 = {}));
@@ -4387,7 +4387,7 @@ var require_main2 = __commonJS({
         CodeAction3.create = create;
         function is(value) {
           var candidate = value;
-          return candidate && Is.string(candidate.title) && (candidate.diagnostics === void 0 || Is.typedArray(candidate.diagnostics, Diagnostic6.is)) && (candidate.kind === void 0 || Is.string(candidate.kind)) && (candidate.edit !== void 0 || candidate.command !== void 0) && (candidate.command === void 0 || Command.is(candidate.command)) && (candidate.isPreferred === void 0 || Is.boolean(candidate.isPreferred)) && (candidate.edit === void 0 || WorkspaceEdit3.is(candidate.edit));
+          return candidate && Is.string(candidate.title) && (candidate.diagnostics === void 0 || Is.typedArray(candidate.diagnostics, Diagnostic6.is)) && (candidate.kind === void 0 || Is.string(candidate.kind)) && (candidate.edit !== void 0 || candidate.command !== void 0) && (candidate.command === void 0 || Command.is(candidate.command)) && (candidate.isPreferred === void 0 || Is.boolean(candidate.isPreferred)) && (candidate.edit === void 0 || WorkspaceEdit4.is(candidate.edit));
         }
         CodeAction3.is = is;
       })(CodeAction2 || (exports3.CodeAction = CodeAction2 = {}));
@@ -4403,7 +4403,7 @@ var require_main2 = __commonJS({
         CodeLens2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(candidate.range) && (Is.undefined(candidate.command) || Command.is(candidate.command));
+          return Is.defined(candidate) && Range6.is(candidate.range) && (Is.undefined(candidate.command) || Command.is(candidate.command));
         }
         CodeLens2.is = is;
       })(CodeLens || (exports3.CodeLens = CodeLens = {}));
@@ -4427,7 +4427,7 @@ var require_main2 = __commonJS({
         DocumentLink2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(candidate.range) && (Is.undefined(candidate.target) || Is.string(candidate.target));
+          return Is.defined(candidate) && Range6.is(candidate.range) && (Is.undefined(candidate.target) || Is.string(candidate.target));
         }
         DocumentLink2.is = is;
       })(DocumentLink || (exports3.DocumentLink = DocumentLink = {}));
@@ -4439,7 +4439,7 @@ var require_main2 = __commonJS({
         SelectionRange2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && (candidate.parent === void 0 || SelectionRange2.is(candidate.parent));
+          return Is.objectLiteral(candidate) && Range6.is(candidate.range) && (candidate.parent === void 0 || SelectionRange2.is(candidate.parent));
         }
         SelectionRange2.is = is;
       })(SelectionRange || (exports3.SelectionRange = SelectionRange = {}));
@@ -4498,7 +4498,7 @@ var require_main2 = __commonJS({
         InlineValueText2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && Is.string(candidate.text);
+          return candidate !== void 0 && candidate !== null && Range6.is(candidate.range) && Is.string(candidate.text);
         }
         InlineValueText2.is = is;
       })(InlineValueText || (exports3.InlineValueText = InlineValueText = {}));
@@ -4510,7 +4510,7 @@ var require_main2 = __commonJS({
         InlineValueVariableLookup2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && Is.boolean(candidate.caseSensitiveLookup) && (Is.string(candidate.variableName) || candidate.variableName === void 0);
+          return candidate !== void 0 && candidate !== null && Range6.is(candidate.range) && Is.boolean(candidate.caseSensitiveLookup) && (Is.string(candidate.variableName) || candidate.variableName === void 0);
         }
         InlineValueVariableLookup2.is = is;
       })(InlineValueVariableLookup || (exports3.InlineValueVariableLookup = InlineValueVariableLookup = {}));
@@ -4522,7 +4522,7 @@ var require_main2 = __commonJS({
         InlineValueEvaluatableExpression2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && (Is.string(candidate.expression) || candidate.expression === void 0);
+          return candidate !== void 0 && candidate !== null && Range6.is(candidate.range) && (Is.string(candidate.expression) || candidate.expression === void 0);
         }
         InlineValueEvaluatableExpression2.is = is;
       })(InlineValueEvaluatableExpression || (exports3.InlineValueEvaluatableExpression = InlineValueEvaluatableExpression = {}));
@@ -4534,7 +4534,7 @@ var require_main2 = __commonJS({
         InlineValueContext2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(value.stoppedLocation);
+          return Is.defined(candidate) && Range6.is(value.stoppedLocation);
         }
         InlineValueContext2.is = is;
       })(InlineValueContext || (exports3.InlineValueContext = InlineValueContext = {}));
@@ -4555,7 +4555,7 @@ var require_main2 = __commonJS({
         InlayHintLabelPart2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent2.is(candidate.tooltip)) && (candidate.location === void 0 || Location2.is(candidate.location)) && (candidate.command === void 0 || Command.is(candidate.command));
+          return Is.objectLiteral(candidate) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent2.is(candidate.tooltip)) && (candidate.location === void 0 || Location3.is(candidate.location)) && (candidate.command === void 0 || Command.is(candidate.command));
         }
         InlayHintLabelPart2.is = is;
       })(InlayHintLabelPart || (exports3.InlayHintLabelPart = InlayHintLabelPart = {}));
@@ -4571,7 +4571,7 @@ var require_main2 = __commonJS({
         InlayHint2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Position2.is(candidate.position) && (Is.string(candidate.label) || Is.typedArray(candidate.label, InlayHintLabelPart.is)) && (candidate.kind === void 0 || InlayHintKind.is(candidate.kind)) && candidate.textEdits === void 0 || Is.typedArray(candidate.textEdits, TextEdit4.is) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent2.is(candidate.tooltip)) && (candidate.paddingLeft === void 0 || Is.boolean(candidate.paddingLeft)) && (candidate.paddingRight === void 0 || Is.boolean(candidate.paddingRight));
+          return Is.objectLiteral(candidate) && Position4.is(candidate.position) && (Is.string(candidate.label) || Is.typedArray(candidate.label, InlayHintLabelPart.is)) && (candidate.kind === void 0 || InlayHintKind.is(candidate.kind)) && candidate.textEdits === void 0 || Is.typedArray(candidate.textEdits, TextEdit5.is) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent2.is(candidate.tooltip)) && (candidate.paddingLeft === void 0 || Is.boolean(candidate.paddingLeft)) && (candidate.paddingRight === void 0 || Is.boolean(candidate.paddingRight));
         }
         InlayHint2.is = is;
       })(InlayHint || (exports3.InlayHint = InlayHint = {}));
@@ -4760,7 +4760,7 @@ var require_main2 = __commonJS({
             var lineOffsets = this.getLineOffsets();
             var low = 0, high = lineOffsets.length;
             if (high === 0) {
-              return Position2.create(0, offset);
+              return Position4.create(0, offset);
             }
             while (low < high) {
               var mid = Math.floor((low + high) / 2);
@@ -4771,7 +4771,7 @@ var require_main2 = __commonJS({
               }
             }
             var line = low - 1;
-            return Position2.create(line, offset - lineOffsets[line]);
+            return Position4.create(line, offset - lineOffsets[line]);
           };
           FullTextDocument3.prototype.offsetAt = function(position) {
             var lineOffsets = this.getLineOffsets();
@@ -8880,7 +8880,7 @@ var require_node3 = __commonJS({
 });
 
 // server/src/server.ts
-var import_node12 = __toESM(require_node3());
+var import_node14 = __toESM(require_node3());
 var fs = __toESM(require("node:fs"));
 var path2 = __toESM(require("node:path"));
 var import_node_url2 = require("node:url");
@@ -121407,18 +121407,71 @@ var SysMLErrorListener = class extends BaseErrorListener {
   }
 };
 
+// server/src/parser/positionUtils.ts
+function normalizeUtf16Columns(text, tokens, errors) {
+  if (!/[\uD800-\uDBFF][\uDC00-\uDFFF]/.test(text)) return;
+  const columns = /* @__PURE__ */ new Map();
+  const lines = text.split("\n");
+  for (let line = 0; line < lines.length; line++) {
+    if (!/[\uD800-\uDBFF][\uDC00-\uDFFF]/.test(lines[line])) continue;
+    const offsets = [0];
+    for (const character of lines[line]) offsets.push(offsets[offsets.length - 1] + character.length);
+    columns.set(line, offsets);
+  }
+  for (const token of tokens) {
+    token.column = columns.get(token.line - 1)?.[token.column] ?? token.column;
+  }
+  for (const error of errors) {
+    error.column = columns.get(error.line)?.[error.column] ?? error.column;
+  }
+}
+function tokenToPosition(token) {
+  return {
+    line: (token.line ?? 1) - 1,
+    character: token.column ?? 0
+  };
+}
+function tokenToRange(token) {
+  const start = tokenToPosition(token);
+  const length = token.text?.length ?? 1;
+  return {
+    start,
+    end: { line: start.line, character: start.character + length }
+  };
+}
+function contextToRange(ctx) {
+  const startToken = ctx.start;
+  const stopToken = ctx.stop ?? ctx.start;
+  if (!startToken) {
+    return { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } };
+  }
+  const start = {
+    line: (startToken.line ?? 1) - 1,
+    character: startToken.column ?? 0
+  };
+  const end = stopToken ? {
+    line: (stopToken.line ?? 1) - 1,
+    character: (stopToken.column ?? 0) + (stopToken.text?.length ?? 1)
+  } : { line: start.line, character: start.character + 1 };
+  return { start, end };
+}
+
 // server/src/parser/parseDocument.ts
+function withUtf16Columns(text, result) {
+  normalizeUtf16Columns(text, result.tokenStream.getTokens(), result.errors);
+  return result;
+}
 function parseDocument(text) {
   const result = parseDocumentCore(text);
   if (result.errors.length > 0 && hasStaleDfaStates()) {
     markDfaNotPreSeeded();
     clearAllDFAStates();
-    return parseDocumentLL(text, result.lexer, result.tokenStream);
+    return withUtf16Columns(text, parseDocumentLL(text, result.lexer, result.tokenStream));
   }
   if (isDfaPreSeeded()) {
     markDfaNotPreSeeded();
   }
-  return result;
+  return withUtf16Columns(text, result);
 }
 function parseDocumentCore(text) {
   const inputStream = CharStream.fromString(text);
@@ -121560,19 +121613,19 @@ function parseDocumentBatch(text) {
   if (errors.length > 0 && hasStaleDfaStates()) {
     markDfaNotPreSeeded();
     clearAllDFAStates();
-    return parseDocumentBatchLL(text, lexer, tokenStream, lexMs);
+    return withUtf16Columns(text, parseDocumentBatchLL(text, lexer, tokenStream, lexMs));
   }
   if (isDfaPreSeeded()) {
     markDfaNotPreSeeded();
   }
-  return {
+  return withUtf16Columns(text, {
     tree,
     tokenStream,
     parser,
     lexer,
     errors,
     timing: { lexMs, parseMs }
-  };
+  });
 }
 function parseDocumentBatchLL(_text, lexer, tokenStream, lexMs) {
   tokenStream.seek(0);
@@ -121598,41 +121651,162 @@ function parseDocumentBatchLL(_text, lexer, tokenStream, lexMs) {
   };
 }
 
-// server/src/parser/positionUtils.ts
-function tokenToPosition(token) {
-  return {
-    line: (token.line ?? 1) - 1,
-    character: token.column ?? 0
-  };
+// server/src/utils/sysmlKeywords.ts
+var SYSML_KEYWORDS_ARRAY = SysMLv2Lexer.literalNames.filter((n2) => n2 != null).map((n2) => n2.replace(/^'|'$/g, "")).filter((n2) => /^[a-z]+$/.test(n2)).sort();
+var SYSML_KEYWORDS = new Set(SYSML_KEYWORDS_ARRAY);
+
+// server/src/utils/identUtils.ts
+function isIdentStart(c) {
+  return c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95;
 }
-function tokenToRange(token) {
-  const start = tokenToPosition(token);
-  const length = token.text?.length ?? 1;
-  return {
-    start,
-    end: { line: start.line, character: start.character + length }
-  };
+function isIdentPart(c) {
+  return c >= 65 && c <= 90 || c >= 97 && c <= 122 || c >= 48 && c <= 57 || c === 95;
 }
-function contextToRange(ctx) {
-  const startToken = ctx.start;
-  const stopToken = ctx.stop ?? ctx.start;
-  if (!startToken) {
-    return { start: { line: 0, character: 0 }, end: { line: 0, character: 0 } };
+var ESCAPES = {
+  b: "\b",
+  t: "	",
+  n: "\n",
+  f: "\f",
+  r: "\r",
+  "'": "'",
+  '"': '"',
+  "\\": "\\"
+};
+function unquoteName(text) {
+  if (!text.startsWith("'") || !text.endsWith("'")) return text;
+  return text.slice(1, -1).replace(/\\([btnfr'"\\])/g, (_, ch) => ESCAPES[ch]);
+}
+function quoteName(name) {
+  if (/^[A-Za-z_][A-Za-z_0-9]*$/.test(name) && !SYSML_KEYWORDS.has(name)) return name;
+  const escaped = name.replace(/[\\'\b\t\n\f\r]/g, (ch) => {
+    const entry = Object.entries(ESCAPES).find(([, value]) => value === ch);
+    return `\\${entry[0]}`;
+  });
+  return `'${escaped}'`;
+}
+function splitQualifiedName(text) {
+  const parts = [];
+  let start = 0;
+  let quoted = false;
+  for (let i = 0; i < text.length; i++) {
+    if (quoted && text[i] === "\\") {
+      i++;
+      continue;
+    }
+    if (text[i] === "'" && (quoted || i === start)) quoted = !quoted;
+    if (!quoted && text.startsWith("::", i)) {
+      parts.push(unquoteName(text.slice(start, i).trim()));
+      start = i + 2;
+      i++;
+    }
   }
-  const start = {
-    line: (startToken.line ?? 1) - 1,
-    character: startToken.column ?? 0
-  };
-  const end = stopToken ? {
-    line: (stopToken.line ?? 1) - 1,
-    character: (stopToken.column ?? 0) + (stopToken.text?.length ?? 1)
-  } : { line: start.line, character: start.character + 1 };
-  return { start, end };
+  parts.push(unquoteName(text.slice(start).trim()));
+  return parts;
+}
+function joinQualifiedName(parts) {
+  return parts.map((part) => /::|['\\\r\n\t\b\f]/.test(part) ? quoteName(part) : part).join("::");
+}
+function readNameAt(text, start, allowIncomplete = false) {
+  if (text[start] === "'") {
+    let end2 = start + 1;
+    while (end2 < text.length && text[end2] !== "'") {
+      if (text[end2] === "\r" || text[end2] === "\n") return void 0;
+      if (text[end2] === "\\") {
+        if (!Object.hasOwn(ESCAPES, text[end2 + 1])) return void 0;
+        end2++;
+      }
+      end2++;
+    }
+    if (end2 >= text.length) {
+      return allowIncomplete ? { name: unquoteName(`${text.slice(start)}'`), start, end: text.length } : void 0;
+    }
+    if (end2 === start + 1 && !allowIncomplete) return void 0;
+    return { name: unquoteName(text.slice(start, end2 + 1)), start, end: end2 + 1 };
+  }
+  if (!isIdentStart(text.charCodeAt(start))) return void 0;
+  let end = start + 1;
+  while (end < text.length && isIdentPart(text.charCodeAt(end))) end++;
+  return { name: text.slice(start, end), start, end };
+}
+function readQualifiedNameAt(text, start, allowIncomplete = false) {
+  const first = readNameAt(text, start, allowIncomplete);
+  if (!first) return void 0;
+  const segments = [first];
+  let end = first.end;
+  while (end < text.length) {
+    let next = end;
+    while (/\s/.test(text[next] ?? "") && next < text.length) next++;
+    if (!text.startsWith("::", next)) break;
+    next += 2;
+    while (/\s/.test(text[next] ?? "") && next < text.length) next++;
+    const segment = readNameAt(text, next, allowIncomplete);
+    if (!segment) break;
+    segments.push(segment);
+    end = segment.end;
+  }
+  return { name: joinQualifiedName(segments.map((s) => s.name)), start, end, segments };
+}
+function* scanQualifiedNames(text, allowIncomplete = false) {
+  let i = 0;
+  while (i < text.length) {
+    if (text.startsWith("//", i)) {
+      const end = text.indexOf("\n", i + 2);
+      i = end < 0 ? text.length : end + 1;
+    } else if (text.startsWith("/*", i)) {
+      const end = text.indexOf("*/", i + 2);
+      i = end < 0 ? text.length : end + 2;
+    } else if (text[i] === '"') {
+      i++;
+      while (i < text.length && text[i] !== '"') i += text[i] === "\\" ? 2 : 1;
+      i++;
+    } else if (/\d/.test(text[i]) || text[i] === "." && /\d/.test(text[i + 1] ?? "")) {
+      const number = text.slice(i).match(/^(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?/);
+      i += number[0].length;
+    } else {
+      const name = readQualifiedNameAt(text, i, allowIncomplete);
+      if (name) {
+        yield name;
+        i = name.end;
+      } else if (text[i] === "'") {
+        i++;
+        while (i < text.length && text[i] !== "'" && text[i] !== "\n") {
+          i += text[i] === "\\" ? 2 : 1;
+        }
+        if (text[i] === "'") i++;
+      } else {
+        i++;
+      }
+    }
+  }
+}
+function* scanFeaturePaths(text) {
+  const names = [...scanQualifiedNames(text)];
+  for (let i = 0; i < names.length; i++) {
+    const first = names[i];
+    const parts = [first.name];
+    const qualifiedNames = [first];
+    let end = first.end;
+    while (i + 1 < names.length && /^\s*\.\s*$/.test(text.slice(end, names[i + 1].start))) {
+      parts.push(names[++i].name);
+      qualifiedNames.push(names[i]);
+      end = names[i].end;
+    }
+    yield { name: parts.join("."), start: first.start, end, qualifiedNames, parts: parts.map((part) => {
+      const segments = splitQualifiedName(part);
+      return segments.length === 1 ? segments[0] : part;
+    }) };
+  }
+}
+function extractQualifiedNameAt(text, character) {
+  for (const name of scanQualifiedNames(text)) {
+    if (character >= name.start && character <= name.end) return name.name;
+    if (name.start > character) break;
+  }
+  return void 0;
+}
+function stripComments(text) {
+  return text.replace(/\/\*[\s\S]*?\*\//g, (m2) => m2.replace(/[^\n]/g, " ")).replace(/\/\/[^\n]*/g, (m2) => " ".repeat(m2.length));
 }
-
-// server/src/utils/sysmlKeywords.ts
-var SYSML_KEYWORDS_ARRAY = SysMLv2Lexer.literalNames.filter((n2) => n2 != null).map((n2) => n2.replace(/^'|'$/g, "")).filter((n2) => /^[a-z]+$/.test(n2)).sort();
-var SYSML_KEYWORDS = new Set(SYSML_KEYWORDS_ARRAY);
 
 // server/src/utils/documentUri.ts
 function canonicalUri(uri) {
@@ -122411,7 +122585,7 @@ var RE_SPEC_WITH_SUBSETS = /(?:specializes|subsets|:>|:>>)\s*('[^']+'|[A-Za-z_]\
 var RE_DEFINED_BY = /definedby\s*([A-Za-z_]\w*(?:::\w+)*(?:\s*,\s*[A-Za-z_]\w*(?:::\w+)*)*)/;
 var MAX_RULE_SEARCH_DEPTH = 6;
 var RE_TYPING = /:(?![:>])\s*('[^']+'|[A-Za-z_]\w*(?:::\w+)*)/;
-var RE_QUOTED_NAME = /'([^']+)'/;
+var RE_QUOTED_NAME = /^\s*(?:\$::)?(?:(?:[A-Za-z_]\w*|'\d+')::)*'(\d+)'/;
 var RE_IDENT_START = /^([A-Za-z_]\w*(?:::\w+)*)/;
 var SymbolTable = class {
   /** All symbols indexed by qualified name */
@@ -122478,7 +122652,12 @@ var SymbolTable = class {
    * Find a symbol by name (simple name, not qualified).
    */
   findByName(name) {
-    return this.symbolsByName.get(name) ?? [];
+    const exact = this.symbolsByName.get(name);
+    if (exact) return exact;
+    const segments = splitQualifiedName(name);
+    if (segments.length === 1) return this.symbolsByName.get(segments[0]) ?? [];
+    const qualified = this.getSymbol(joinQualifiedName(segments));
+    return qualified ? [qualified] : [];
   }
   /**
    * Find all symbols in a given URI.
@@ -122985,10 +123164,11 @@ var SymbolTable = class {
     const anonymous = !declaredName;
     const name = declaredName ?? "";
     const shortName = transition || isFlowUsage(kind) && !declaredName ? void 0 : this.extractShortName(ctx);
-    const qualifiedName = anonymous || owner && owner.qualifiedName === void 0 ? void 0 : owner ? `${owner.qualifiedName}::${name}` : name;
+    const qualifiedName = anonymous || owner && owner.qualifiedName === void 0 ? void 0 : owner ? `${owner.qualifiedName}::${joinQualifiedName([name])}` : joinQualifiedName([name]);
     const selectionRange = anonymous ? ctx.start ? tokenToRange(ctx.start) : range : this.extractNameRange(ctx) ?? range;
     const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx) : transition ? this.extractTransitionTypeNames(ctx) : this.extractTypeNames(ctx);
     const specializationNames = this.extractSpecializationNames(ctx);
+    const redefinedFeatureTargets = this.extractRedefinedFeatureTargets(ctx);
     const typeName = typeNames[0];
     const documentation = this.extractDocumentation(ctx);
     const visibility = this.extractVisibility(ctx);
@@ -123019,6 +123199,7 @@ var SymbolTable = class {
       typeName,
       typeNames,
       specializationNames,
+      redefinedFeatureTargets: redefinedFeatureTargets.length > 0 ? redefinedFeatureTargets : void 0,
       documentation,
       visibility,
       source: transition?.source,
@@ -123143,7 +123324,10 @@ var SymbolTable = class {
   }
   /** Remove SysML quoting while retaining qualified and dotted references. */
   cleanTransitionText(text) {
-    const cleaned = text.replace(/'([^']+)'/g, "$1").trim();
+    const cleaned = text.replace(
+      /'(?:\\.|[^'\\])*'/g,
+      (name) => joinQualifiedName([unquoteName(name)])
+    ).trim();
     return cleaned || void 0;
   }
   /** Extract explicit first/then successions owned by an action body. */
@@ -123270,15 +123454,28 @@ var SymbolTable = class {
    * such as `#metadata`.
    */
   findOwnHeaderRule(ctx, ruleIndex) {
+    const matches = [];
+    this.findOwnHeaderRules(ctx, ruleIndex, matches, true);
+    return matches[0];
+  }
+  findOwnHeaderRules(ctx, ruleIndex, matches, firstOnly = false) {
     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 (child.ruleIndex === ruleIndex) {
+        matches.push(child);
+        if (firstOnly) return;
+        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;
+      this.findOwnHeaderRules(child, ruleIndex, matches, firstOnly);
+      if (firstOnly && matches.length > 0) return;
     }
-    return void 0;
+  }
+  extractRedefinedFeatureTargets(ctx) {
+    const targets = [];
+    this.findOwnHeaderRules(ctx, SysMLv2Parser.RULE_ownedRedefinition, targets);
+    return targets.map((target) => target.getText());
   }
   /**
    * A connection, interface or allocation usage's end reference paths, in
@@ -123303,16 +123500,10 @@ var SymbolTable = class {
   }
   /** The name of the feature a reference such as `a.b` or `P::a` ends at (`b`, `a`). */
   lastNameSegment(reference) {
-    const segment = reference.getText().split(/::|\./).pop();
-    return segment ? this.unquoteName(segment) : void 0;
+    const names = [...scanQualifiedNames(reference.getText())];
+    return names.at(-1)?.segments.at(-1)?.name;
   }
-  /**
-   * An element's declaration as written, without its body: its tokens up to
-   * its body or closing `;`, each exactly as written (a quoted name keeps its
-   * spaces), with one space wherever the source has whitespace or a comment
-   * between two of them (`connect a.p to b.p`, `connection : Conn`).
-   */
-  declarationText(ctx) {
+  declarationTokens(ctx) {
     const tokens = [];
     const visit = (node) => {
       for (let i = 0; i < node.getChildCount(); i++) {
@@ -123327,6 +123518,16 @@ var SymbolTable = class {
       return false;
     };
     visit(ctx);
+    return tokens;
+  }
+  /**
+   * An element's declaration as written, without its body: its tokens up to
+   * its body or closing `;`, each exactly as written (a quoted name keeps its
+   * spaces), with one space wherever the source has whitespace or a comment
+   * between two of them (`connect a.p to b.p`, `connection : Conn`).
+   */
+  declarationText(ctx) {
+    const tokens = this.declarationTokens(ctx);
     let text = "";
     tokens.forEach((token, i) => {
       if (i > 0 && token.start > tokens[i - 1].stop + 1) text += " ";
@@ -123436,6 +123637,16 @@ var SymbolTable = class {
    * Extract the range of just the name token.
    */
   extractNameRange(ctx) {
+    if (ctx.ruleIndex === SysMLv2Parser.RULE_identification || ctx.ruleIndex === SysMLv2Parser.RULE_featureIdentification) {
+      let name;
+      for (let i = 0; i < ctx.getChildCount(); i++) {
+        const child = ctx.getChild(i);
+        if (child instanceof ParserRuleContext && child.ruleIndex === SysMLv2Parser.RULE_name) {
+          name = child;
+        }
+      }
+      if (name) return contextToRange(name);
+    }
     for (let i = 0; i < ctx.getChildCount(); i++) {
       const child = ctx.getChild(i);
       if (child instanceof TerminalNode && this.isNameTerminal(child)) {
@@ -123467,17 +123678,16 @@ var SymbolTable = class {
     const names = [];
     this.collectTypeNamesFromTree(ctx, names, 0);
     if (names.length > 0) return names;
-    const fullText = ctx.getText();
-    const braceIdx = fullText.indexOf("{");
-    let text = braceIdx >= 0 ? fullText.substring(0, braceIdx) : fullText;
+    const { text: declarationText, quotedName } = this.maskedDeclaration(ctx);
+    let text = declarationText;
     text = text.replace(RE_KEYWORD_TRUNCATE, "");
     const specMatch = text.match(RE_SPEC);
     if (specMatch) {
       const specStr = text.substring(text.indexOf(specMatch[0]) + specMatch[0].indexOf(specMatch[1]));
       for (const part of specStr.split(",")) {
-        const qm = part.match(RE_QUOTED_NAME);
-        if (qm) {
-          names.push(qm[1]);
+        const quoted = quotedName(part);
+        if (quoted !== void 0) {
+          names.push(joinQualifiedName([quoted]));
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -123498,9 +123708,9 @@ var SymbolTable = class {
       const fullMatchIdx = text.indexOf(typingMatch[0]);
       const afterColon = text.substring(fullMatchIdx + 1).trim();
       for (const part of afterColon.split(",")) {
-        const qm = part.match(RE_QUOTED_NAME);
-        if (qm) {
-          names.push(qm[1]);
+        const quoted = quotedName(part);
+        if (quoted !== void 0) {
+          names.push(joinQualifiedName([quoted]));
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -123510,6 +123720,30 @@ var SymbolTable = class {
     }
     return names;
   }
+  /**
+   * The declaration tokens before the value or body, with each lexer STRING token
+   * replaced by a numbered placeholder (`'0'`, `'1'`, ...), and
+   * `quotedName`, which turns a placeholder in a part of that text back into
+   * the name, when it ends the qualified name the part starts with. SysML
+   * 2.0 section 7.2.2 permits punctuation in unrestricted names (the STRING
+   * lexer production), so fallback regexes must never see their `:`, `:>`,
+   * `{` or keywords. Documentation is not a name token.
+   */
+  maskedDeclaration(ctx) {
+    const quoted = [];
+    const valueStart = this.findOwnHeaderRule(ctx, SysMLv2Parser.RULE_valuePart)?.start?.tokenIndex;
+    const masked = this.declarationTokens(ctx).filter((token) => valueStart === void 0 || token.tokenIndex < valueStart).map((token) => {
+      const text = token.text ?? "";
+      return token.type === SysMLv2Lexer.STRING ? `'${quoted.push(unquoteName(text)) - 1}'` : text;
+    }).join("");
+    return {
+      text: masked,
+      quotedName: (part) => {
+        const qm = part.match(RE_QUOTED_NAME);
+        return qm ? quoted[Number(qm[1])] : void 0;
+      }
+    };
+  }
   /**
    * Extract only the specialization names (:> / specializes / subsets) from a context.
    * Uses the same tree-walk as extractTypeNames but restricted to
@@ -123520,17 +123754,15 @@ var SymbolTable = class {
     const names = [];
     this.collectNamesFromTree(ctx, names, 0, TYPE_SPECIALIZATION_RULE_INDICES);
     if (names.length > 0) return names;
-    const fullText = ctx.getText();
-    const braceIdx = fullText.indexOf("{");
-    let text = braceIdx >= 0 ? fullText.substring(0, braceIdx) : fullText;
-    text = text.replace(RE_KEYWORD_TRUNCATE_SPEC, "");
+    const { text: declarationText, quotedName } = this.maskedDeclaration(ctx);
+    const text = declarationText.replace(RE_KEYWORD_TRUNCATE_SPEC, "");
     const specMatch = text.match(RE_SPEC_WITH_SUBSETS);
     if (specMatch) {
       const specStr = text.substring(text.indexOf(specMatch[0]) + specMatch[0].indexOf(specMatch[1]));
       for (const part of specStr.split(",")) {
-        const qm = part.match(RE_QUOTED_NAME);
-        if (qm) {
-          names.push(qm[1]);
+        const quoted = quotedName(part);
+        if (quoted !== void 0) {
+          names.push(joinQualifiedName([quoted]));
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -123559,17 +123791,7 @@ var SymbolTable = class {
       if (!(child instanceof ParserRuleContext)) continue;
       const ri = child.ruleIndex;
       if (extractionRules.has(ri)) {
-        const childText = child.getText();
-        const stripped = childText.replace(/^(specializes|:>>|:>|:|definedby|subsets|redefines|references|conjugates|disjoints)/i, "");
-        for (const part of stripped.split(",")) {
-          const qm = part.match(/'([^']+)'/);
-          if (qm) {
-            names.push(qm[1]);
-          } else {
-            const m2 = part.match(/([A-Za-z_]\w*(?:::\w+)*)/);
-            if (m2) names.push(m2[1]);
-          }
-        }
+        this.collectQualifiedTypeNames(child, names);
       } else if (
         // Recurse into declaration / part / body wrappers that may
         // contain nested typing rules (but NOT into body rules that
@@ -123582,6 +123804,17 @@ var SymbolTable = class {
       }
     }
   }
+  collectQualifiedTypeNames(ctx, names) {
+    if (ctx.ruleIndex === SysMLv2Parser.RULE_qualifiedName) {
+      const name = this.extractTextFromSubtree(ctx);
+      if (name) names.push(name);
+      return;
+    }
+    for (let i = 0; i < ctx.getChildCount(); i++) {
+      const child = ctx.getChild(i);
+      if (child instanceof ParserRuleContext) this.collectQualifiedTypeNames(child, names);
+    }
+  }
   /**
    * Extract documentation owned by this element.
    *
@@ -123742,10 +123975,7 @@ var SymbolTable = class {
    * Returns the text unchanged if not quoted.
    */
   unquoteName(text) {
-    if (this.isQuotedName(text)) {
-      return text.slice(1, -1);
-    }
-    return text;
+    return unquoteName(text);
   }
   /**
    * Check if a text is a SysML keyword.
@@ -124033,7 +124263,7 @@ var SymbolTable = class {
       const child = ctx.getChild(i);
       if (child instanceof TerminalNode) {
         const text = child.symbol.text;
-        if (text) parts.push(text);
+        if (text) parts.push(child.symbol.type === SysMLv2Lexer.STRING ? joinQualifiedName([unquoteName(text)]) : text);
       } else if (child instanceof ParserRuleContext) {
         this.collectExposeText(child, parts);
       }
@@ -124095,58 +124325,24 @@ var SymbolTable = class {
    * Extract all text content from a subtree (concatenate terminal nodes).
    */
   extractTextFromSubtree(ctx) {
+    if (ctx.ruleIndex === SysMLv2Parser.RULE_name) return unquoteName(ctx.getText());
     const parts = [];
     for (let i = 0; i < ctx.getChildCount(); i++) {
       const child = ctx.getChild(i);
       if (child instanceof TerminalNode) {
         const text = child.symbol.text;
         if (text && this.isNameTerminal(child)) {
-          parts.push(this.unquoteName(text));
+          parts.push(joinQualifiedName([this.unquoteName(text)]));
         }
       } else if (child instanceof ParserRuleContext) {
         const sub = this.extractTextFromSubtree(child);
-        if (sub) parts.push(sub);
+        if (sub) parts.push(child.ruleIndex === SysMLv2Parser.RULE_name ? joinQualifiedName([sub]) : sub);
       }
     }
     return parts.length > 0 ? parts.join("::") : void 0;
   }
 };
 
-// server/src/utils/identUtils.ts
-function isIdentStart(c) {
-  return c >= 65 && c <= 90 || c >= 97 && c <= 122 || c === 95;
-}
-function isIdentPart(c) {
-  return c >= 65 && c <= 90 || c >= 97 && c <= 122 || c >= 48 && c <= 57 || c === 95;
-}
-function extractQualifiedNameAt(lineText, character) {
-  const len = lineText.length;
-  let i = 0;
-  while (i < len) {
-    if (!isIdentStart(lineText.charCodeAt(i))) {
-      i++;
-      continue;
-    }
-    const wordStart = i;
-    while (i < len) {
-      while (i < len && isIdentPart(lineText.charCodeAt(i))) i++;
-      if (i + 2 <= len && lineText[i] === ":" && lineText[i + 1] === ":" && i + 2 < len && isIdentStart(lineText.charCodeAt(i + 2))) {
-        i += 2;
-      } else {
-        break;
-      }
-    }
-    const wordEnd = i;
-    if (character >= wordStart && character <= wordEnd) {
-      return lineText.substring(wordStart, wordEnd);
-    }
-  }
-  return void 0;
-}
-function stripComments(text) {
-  return text.replace(/\/\*[\s\S]*?\*\//g, (m2) => m2.replace(/[^\n]/g, " ")).replace(/\/\/[^\n]*/g, (m2) => " ".repeat(m2.length));
-}
-
 // server/src/documentManager.ts
 var DocumentManager = class {
   cache = /* @__PURE__ */ new Map();
@@ -124441,55 +124637,30 @@ function readWord(line, pos) {
   while (pos < line.length && isIdentPart(line.charCodeAt(pos))) pos++;
   return pos > start ? [line.slice(start, pos), pos] : void 0;
 }
+function readSimpleName(line, pos) {
+  const name = readNameAt(line, skipSpaces(line, pos));
+  return name ? [name.name, name.end] : void 0;
+}
 function readName(line, pos) {
   pos = skipSpaces(line, pos);
-  if (pos < line.length && line[pos] === "'") {
-    pos++;
-    const start = pos;
-    while (pos < line.length && isIdentPart(line.charCodeAt(pos))) pos++;
-    const name = line.slice(start, pos);
-    if (pos < line.length && line[pos] === "'") pos++;
-    return name ? [name, pos] : void 0;
-  }
   if (pos < line.length && line[pos] === "<") {
-    pos++;
-    const start = pos;
-    while (pos < line.length && line[pos] !== ">") pos++;
-    const shortName = line.slice(start, pos).trim();
-    if (pos < line.length && line[pos] === ">") pos++;
-    pos = skipSpaces(line, pos);
-    if (pos < line.length && line[pos] === "'") {
-      pos++;
-      while (pos < line.length && line[pos] !== "'") pos++;
-      if (pos < line.length) pos++;
-    } else if (pos < line.length && isIdentPart(line.charCodeAt(pos))) {
-      while (pos < line.length && isIdentPart(line.charCodeAt(pos))) pos++;
-    }
-    return shortName ? [shortName, pos] : void 0;
-  }
-  return readWord(line, pos);
+    const short = readSimpleName(line, pos + 1);
+    if (!short) return void 0;
+    pos = skipSpaces(line, short[1]);
+    if (line[pos] !== ">") return void 0;
+    const long = readSimpleName(line, pos + 1);
+    return [short[0], long?.[1] ?? pos + 1];
+  }
+  return readSimpleName(line, pos);
 }
 function readLongName(line, pos) {
   pos = skipSpaces(line, pos);
   if (pos >= line.length || line[pos] !== "<") return void 0;
-  while (pos < line.length && line[pos] !== ">") pos++;
-  if (pos < line.length) pos++;
-  pos = skipSpaces(line, pos);
-  if (pos >= line.length) return void 0;
-  if (line[pos] === "'") {
-    pos++;
-    const start = pos;
-    while (pos < line.length && line[pos] !== "'") pos++;
-    const longName = line.slice(start, pos).trim();
-    if (longName && /^[A-Za-z_]\w*$/.test(longName)) return longName;
-    return void 0;
-  }
-  if (isIdentPart(line.charCodeAt(pos))) {
-    const start = pos;
-    while (pos < line.length && isIdentPart(line.charCodeAt(pos))) pos++;
-    return line.slice(start, pos);
-  }
-  return void 0;
+  const short = readSimpleName(line, pos + 1);
+  if (!short) return void 0;
+  pos = skipSpaces(line, short[1]);
+  if (line[pos] !== ">") return void 0;
+  return readSimpleName(line, pos + 1)?.[0];
 }
 function matchWord(line, pos, keyword) {
   if (!line.startsWith(keyword, pos)) return false;
@@ -124561,7 +124732,7 @@ function extractPackageNameFromHead(head) {
       if (close < 0) continue;
       pos = skipSpaces(line, close + 1);
     }
-    const w = readWord(line, pos);
+    const w = readName(line, pos);
     if (w) return w[0];
   }
   return void 0;
@@ -124686,7 +124857,7 @@ function indexLibraryFile(fileUri, content, packages, types) {
         types.set(usageName, { uri: fileUri, line: i });
       }
       if (pkgName) {
-        const qualName = `${pkgName}::${usageName}`;
+        const qualName = joinQualifiedName([pkgName, usageName]);
         if (!types.has(qualName)) {
           types.set(qualName, { uri: fileUri, line: i });
         }
@@ -124697,7 +124868,7 @@ function indexLibraryFile(fileUri, content, packages, types) {
           types.set(longName, { uri: fileUri, line: i });
         }
         if (pkgName) {
-          const qualLong = `${pkgName}::${longName}`;
+          const qualLong = joinQualifiedName([pkgName, longName]);
           if (!types.has(qualLong)) {
             types.set(qualLong, { uri: fileUri, line: i });
           }
@@ -124729,15 +124900,17 @@ function initLibraryIndex(serverDir, customPath) {
 }
 function resolveLibraryPackage(name) {
   if (!index) return void 0;
-  const pkg = name.split("::")[0];
+  const pkg = splitQualifiedName(name)[0];
   return index.get(pkg);
 }
 function resolveLibraryType(name) {
   if (!typeIndex) return void 0;
+  const segments = splitQualifiedName(name);
+  name = segments.length === 1 ? segments[0] : joinQualifiedName(segments);
   const exact = typeIndex.get(name);
   if (exact) return exact;
-  if (name.includes("::")) {
-    const member = name.split("::").pop();
+  if (segments.length > 1) {
+    const member = segments[segments.length - 1];
     return typeIndex.get(member);
   }
   return void 0;
@@ -125376,20 +125549,31 @@ var NamespaceResolver = class {
    * namespace.
    */
   isLocallyVisible(symbol, name, indexes) {
-    return this.resolveQualifiedNameFrom(ownerKeyOf(symbol, indexes.byId), name, indexes) !== void 0;
+    return this.resolveNameFrom(symbol, name, indexes) !== void 0;
+  }
+  /**
+   * Resolve a (possibly qualified) name from the namespace containing
+   * `symbol`, respecting namespace membership and visibility.
+   */
+  resolveNameFrom(symbol, name, indexes) {
+    return this.resolveQualifiedNameFrom(ownerKeyOf(symbol, indexes.byId), name, indexes);
+  }
+  /** Resolve an editor reference within its enclosing namespace, including the root. */
+  resolveNameIn(namespace, name, indexes) {
+    return this.resolveQualifiedNameFrom(namespace ? namespaceKeyOf(namespace) : "", name, indexes);
   }
   /**
    * Resolve a (possibly qualified) name to its symbol per §7.5.1, searching
    * outward from namespace `start` and its enclosing namespaces (its own resolved
    * members first, then its parent's, ...). Shared by `isLocallyVisible` (an
-   * ordinary reference resolving relative to its own enclosing namespace) and
-   * import-target resolution (an `import` declaration's target is itself a
+   * ordinary reference resolving relative to its own enclosing namespace),
+   * `resolveNameFrom`, and import-target resolution (an `import` declaration's target is itself a
    * qualifiedName, resolved the same relative way -- not as an absolute/global
    * name -- so a bare `import C;` inside a nested package can pick up a `C`
    * its own enclosing package already imported, per §7.5.1/§7.5.3).
    */
   resolveQualifiedNameFrom(start, name, indexes) {
-    const [first, ...rest] = name.split("::");
+    const [first, ...rest] = splitQualifiedName(name);
     let resolved;
     for (const ancestor of this.namespaceAncestorsOf(start, indexes)) {
       const candidates = this.getResolvedMembers(ancestor, indexes).get(first);
@@ -125556,6 +125740,9 @@ var NamespaceResolver = class {
     };
     for (const owned of indexes.byParent.get(namespace) ?? []) {
       addMember(owned.name, { symbol: owned, visibility: owned.visibility ?? "public" });
+      if (owned.shortName) {
+        addMember(owned.shortName, { symbol: owned, visibility: owned.visibility ?? "public" });
+      }
     }
     perIndexesCache.set(namespace, members);
     const owner = typeof namespace === "string" ? indexes.byQualifiedName.get(namespace) : namespace;
@@ -125591,13 +125778,17 @@ var NamespaceResolver = class {
     switch (imp.kind) {
       case "membership": {
         const target = this.resolveQualifiedNameFrom(importingNamespace, imp.target, indexes);
-        if (target) addMember(target.name, { symbol: target, visibility: imp.visibility });
+        if (target) {
+          addMember(target.name, { symbol: target, visibility: imp.visibility });
+          if (target.shortName) addMember(target.shortName, { symbol: target, visibility: imp.visibility });
+        }
         break;
       }
       case "membership-deep": {
         const target = this.resolveQualifiedNameFrom(importingNamespace, imp.target, indexes);
         if (target) {
           addMember(target.name, { symbol: target, visibility: imp.visibility });
+          if (target.shortName) addMember(target.shortName, { symbol: target, visibility: imp.visibility });
           this.importVisibleMembers(namespaceKeyOf(target), imp.visibility, indexes, addMember, true);
         }
         break;
@@ -125762,7 +125953,7 @@ function isISQValueType(name) {
 function resolveTypeName(typeName, symbol, resolver, indexes, libraryNames) {
   const kwMatch = typeName.match(/^([A-Z][A-Za-z_0-9]*?)(redefines|subsets|references|connect|bind|default|via|accept|send|flow|allocate|assign|decide|merge|join|fork)([A-Z])/);
   const strippedTypeName = kwMatch ? kwMatch[1] : typeName;
-  const rootSegment = strippedTypeName.split("::")[0];
+  const rootSegment = splitQualifiedName(strippedTypeName)[0];
   const resolved = resolver.isLocallyVisible(symbol, strippedTypeName, indexes) || STANDARD_LIBRARY_TYPES.has(strippedTypeName) || STANDARD_LIBRARY_TYPES.has(rootSegment) || libraryNames.has(rootSegment) || isISQValueType(strippedTypeName) || resolveLibraryType(strippedTypeName) !== void 0 || resolveLibraryType(rootSegment) !== void 0 || // Names starting with lowercase are feature references (subsettings
   // via :>), not type references — don't flag them as unresolved types.
   strippedTypeName.charCodeAt(0) >= 97 && strippedTypeName.charCodeAt(0) <= 122;
@@ -127307,11 +127498,11 @@ var CodeActionProvider = class {
     const packageNames = /* @__PURE__ */ new Set();
     for (const s of allSymbols) {
       if (!isDefinition(s.kind)) continue;
-      if (s.name !== unresolvedType) continue;
+      if (s.name !== unquoteName(unresolvedType)) continue;
       if (s.uri === uri) continue;
-      const pkg = (s.qualifiedName?.split("::")[0] ?? "").trim();
+      const pkg = s.qualifiedName ? splitQualifiedName(s.qualifiedName)[0] : "";
       if (!pkg || pkg === unresolvedType) continue;
-      if (pkg) packageNames.add(pkg);
+      packageNames.add(quoteName(pkg));
     }
     for (const pkg of packageNames) {
       if (this.hasImportForPackage(text, pkg)) {
@@ -127420,7 +127611,7 @@ var CodeActionProvider = class {
     const edit = {
       changes: {
         [uri]: [
-          import_node2.TextEdit.replace(diagnostic.range, newName)
+          import_node2.TextEdit.replace(diagnostic.range, quoteName(newName))
         ]
       }
     };
@@ -127529,7 +127720,7 @@ ${childIndent}enum value2;`;
     const edit = {
       changes: {
         [uri]: [
-          import_node2.TextEdit.replace(diagnostic.range, newName)
+          import_node2.TextEdit.replace(diagnostic.range, quoteName(newName))
         ]
       }
     };
@@ -127590,10 +127781,11 @@ ${childIndent}enum value2;`;
     if (diagnostic.code !== "incompatible-port-types") return void 0;
     const msg = diagnostic.message;
     const m2 = msg.match(/'([^']+)'\s+\(([^)]+)\)\s+is connected to\s+'([^']+)'\s+\(([^)]+)\)/);
-    if (!m2) return void 0;
-    const left = m2[1];
-    const leftType = m2[2];
-    const right = m2[3];
+    const data = diagnostic.data;
+    const left = data?.left ?? m2?.[1];
+    const leftType = data?.leftType ?? m2?.[2];
+    const right = data?.right ?? m2?.[3];
+    if (!left || !leftType || !right) return void 0;
     const symbolTable = this.documentManager.getWorkspaceSymbolTable();
     const symbolsInUri = symbolTable.getSymbolsForUri(uri);
     const compatible = symbolsInUri.find(
@@ -127608,8 +127800,10 @@ ${childIndent}enum value2;`;
     if (start.line !== end.line) return void 0;
     const segment = (lines[start.line] ?? "").slice(start.character, end.character);
     if (!segment) return void 0;
-    const replaced = segment.replace(new RegExp(`\\b${right}\\b`), compatible.name);
-    if (replaced === segment) return void 0;
+    const rightPath = [...scanFeaturePaths(segment)].reverse().find((path3) => path3.parts[path3.parts.length - 1] === right);
+    const rightName = rightPath?.qualifiedNames.at(-1)?.segments.at(-1);
+    if (!rightName) return void 0;
+    const replaced = segment.slice(0, rightName.start) + quoteName(compatible.name) + segment.slice(rightName.end);
     const edit = {
       changes: {
         [uri]: [
@@ -127644,12 +127838,14 @@ ${childIndent}enum value2;`;
       diagnostic.range.end.character
     ) : "";
     const m2 = msg.match(/Unresolved constraint reference\s+'([^']+)'(?:\s+in scope\s+'([^']+)')?/);
+    const data = diagnostic.data;
     const expr = rangeExpr && rangeExpr.includes(".") ? rangeExpr : tokenExpr && tokenExpr.includes(".") ? tokenExpr : m2?.[1] ?? "";
-    const scopeName = m2?.[2];
+    const scopeName = data?.scopeName ?? m2?.[2];
     if (!expr) return void 0;
     if (!expr.includes(".")) return void 0;
-    const parts = expr.split(".");
-    if (parts.length < 2) return void 0;
+    const path3 = [...scanFeaturePaths(expr)].find((path4) => path4.qualifiedNames.length > 1);
+    if (!path3) return void 0;
+    const parts = path3.parts;
     const root = parts[0];
     const unresolvedLeaf = parts[parts.length - 1];
     const symbolTable = this.documentManager.getWorkspaceSymbolTable();
@@ -127661,7 +127857,7 @@ ${childIndent}enum value2;`;
     const rootType = rootUsage ? rootUsage.typeNames[0] ?? rootUsage.typeName : void 0;
     let memberNames = [];
     if (rootType) {
-      const typeDef = allSymbols.find((s) => s.name === rootType && s.kind.endsWith(" def"));
+      const typeDef = symbolTable.findByName(rootType).find((s) => isDefinition(s.kind));
       if (typeDef) {
         memberNames = allSymbols.filter((s) => s.parentId === typeDef.symbolId).map((s) => s.name);
       }
@@ -127683,7 +127879,8 @@ ${childIndent}enum value2;`;
       }
     }
     if (!best || best.dist > 4 || best.name === unresolvedLeaf) return void 0;
-    const fixedExpr = `${root}.${best.name}`;
+    const leaf = path3.qualifiedNames.at(-1);
+    const fixedExpr = expr.slice(0, leaf.start) + quoteName(best.name) + expr.slice(leaf.end);
     const edit = {
       changes: {
         [uri]: [
@@ -127759,6 +127956,13 @@ ${childIndent}enum value2;`;
   isAttributeTypeContext(text, diagnostic, unresolvedType) {
     const lines = text.split("\n");
     const line = lines[diagnostic.range.start.line] ?? "";
+    const names = [...scanQualifiedNames(line)];
+    const attribute = names.findIndex((name) => line.slice(name.start, name.end) === "attribute");
+    const usage = names[attribute + 1];
+    const type = names[attribute + 2];
+    if (attribute >= 0 && usage && type && type.name === unresolvedType && /^\s*:\s*$/.test(line.slice(usage.end, type.start))) {
+      return true;
+    }
     const beforeRange = line.slice(0, diagnostic.range.start.character);
     const unresolvedInLine = line.slice(diagnostic.range.start.character, diagnostic.range.end.character);
     const escapedType = unresolvedType.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -127771,18 +127975,19 @@ ${childIndent}enum value2;`;
     return /\battribute\s+[A-Za-z_][A-Za-z0-9_]*\s*:\s*[A-Za-z_][A-Za-z0-9_]*\b/.test(beforeRange + unresolvedInLine);
   }
   buildLocalTypeStub(text, diagnostic, unresolvedType, childIndent) {
+    const sourceName = quoteName(unquoteName(unresolvedType));
     if (this.isAttributeTypeContext(text, diagnostic, unresolvedType)) {
       return {
-        title: `Create local 'attribute def ${unresolvedType};'`,
+        title: `Create local 'attribute def ${sourceName};'`,
         stubText: `
-${childIndent}attribute def ${unresolvedType};
+${childIndent}attribute def ${sourceName};
 `
       };
     }
     return {
-      title: `Create local 'item def ${unresolvedType};'`,
+      title: `Create local 'item def ${sourceName};'`,
       stubText: `
-${childIndent}item def ${unresolvedType};
+${childIndent}item def ${sourceName};
 `
     };
   }
@@ -127818,13 +128023,12 @@ function extractQuotedString(text, prefixWithQuote) {
 }
 function extractDottedTokenAtRange(line, start, end) {
   if (!line || start < 0 || end < 0 || start > line.length || end > line.length) return "";
-  const isTokenChar = (ch) => ch >= "a" && ch <= "z" || ch >= "A" && ch <= "Z" || ch >= "0" && ch <= "9" || ch === "_" || ch === ".";
-  let left = Math.max(0, start);
-  while (left > 0 && isTokenChar(line[left - 1])) left--;
-  let right = Math.min(line.length, end);
-  while (right < line.length && isTokenChar(line[right])) right++;
-  const token = line.slice(left, right).trim();
-  return token.includes(".") ? token : "";
+  for (const path3 of scanFeaturePaths(line)) {
+    if (path3.qualifiedNames.length > 1 && path3.start <= start && path3.end >= end) {
+      return line.slice(path3.start, path3.end);
+    }
+  }
+  return "";
 }
 function extractLikelyMemberNames(text, excludeName) {
   const names = /* @__PURE__ */ new Set();
@@ -127936,6 +128140,7 @@ var CompletionProvider = class {
         seen.add(sym.name);
         defItems.push({
           label: sym.name,
+          insertText: quoteName(sym.name),
           kind: this.mapSymbolKindToCompletionKind(sym.kind),
           detail: `${sym.kind}${sym.qualifiedName !== void 0 && sym.qualifiedName !== sym.name ? ` (${sym.qualifiedName})` : ""}`,
           documentation: sym.documentation,
@@ -127956,6 +128161,7 @@ var CompletionProvider = class {
         seenPorts.add(sym.name);
         items.push({
           label: sym.name,
+          insertText: quoteName(sym.name),
           kind: import_node3.CompletionItemKind.Interface,
           detail: `${sym.kind}${sym.typeNames[0] ? ` : ${sym.typeNames[0]}` : ""}`,
           data: sym.qualifiedName,
@@ -127963,13 +128169,17 @@ var CompletionProvider = class {
         });
       }
     }
-    if (context === "type-annotation") {
-      return items.filter((i) => this.isTypeOrDefinitionCompletion(i));
-    }
-    if (context === "connect-endpoint") {
-      return items.filter((i) => this.isConnectContextCompletion(i));
-    }
-    return items;
+    const filtered = context === "type-annotation" ? items.filter((i) => this.isTypeOrDefinitionCompletion(i)) : context === "connect-endpoint" ? items.filter((i) => this.isConnectContextCompletion(i)) : items;
+    const line = this.documentManager.getText(uri)?.split("\n")[params.position.line] ?? "";
+    const segment = [...scanQualifiedNames(line, true)].flatMap((name) => name.segments).find((name) => name.start <= params.position.character && name.end >= params.position.character);
+    if (!segment) return filtered;
+    return filtered.map((item) => item.insertTextFormat === import_node3.InsertTextFormat.Snippet ? item : {
+      ...item,
+      textEdit: {
+        range: import_node3.Range.create(params.position.line, segment.start, params.position.line, segment.end),
+        newText: item.insertText ?? item.label
+      }
+    });
   }
   resolveCompletion(item) {
     return item;
@@ -128042,6 +128252,108 @@ var CompletionProvider = class {
   }
 };
 
+// server/src/symbols/nameReferences.ts
+var import_node4 = __toESM(require_node3());
+var NameReferences = class {
+  constructor(documents2) {
+    this.documents = documents2;
+    this.symbols = documents2.getWorkspaceSymbolTable().getAllSymbols();
+    this.indexes = buildSymbolIndexes(this.symbols);
+  }
+  documents;
+  symbols;
+  indexes;
+  resolver = new NamespaceResolver();
+  at(uri, position) {
+    return this.inDocument(uri, position).find((ref) => ref.range.start.line === position.line && ref.range.start.character <= position.character && ref.range.end.character >= position.character);
+  }
+  to(symbol, includeDeclaration = true) {
+    return this.documents.getUris().flatMap((uri) => this.inDocument(uri, void 0, symbol)).filter((ref) => ref.symbol?.symbolId === symbol.symbolId && (includeDeclaration || !ref.isDeclaration));
+  }
+  inDocument(uri, position, target) {
+    const text = this.documents.getText(uri);
+    const parsed = this.documents.get(uri);
+    if (text === void 0 || !parsed) return [];
+    const doc = TextDocument.create(uri, "sysml", 0, text);
+    const symbols = this.symbols.filter((symbol) => symbol.uri === uri);
+    const braces = parsed.tokenStream.getTokens().filter((token) => token.type === SysMLv2Lexer.LBRACE).map((token) => doc.offsetAt({ line: token.line - 1, character: token.column }));
+    const namespaces = symbols.flatMap((symbol) => {
+      const start = doc.offsetAt(symbol.range.start);
+      const end = doc.offsetAt(symbol.range.end);
+      let lo = 0;
+      let hi = braces.length;
+      while (lo < hi) {
+        const mid = lo + hi >>> 1;
+        if (braces[mid] < start) lo = mid + 1;
+        else hi = mid;
+      }
+      const body = braces[lo];
+      return body === void 0 || body >= end ? [] : [{ symbol, body, end }];
+    }).sort((a, b) => a.end - a.body - (b.end - b.body));
+    const refs = [];
+    const cursor = position ? doc.offsetAt(position) : void 0;
+    for (const path3 of scanFeaturePaths(text)) {
+      if (cursor !== void 0 && (cursor < path3.start || cursor > path3.end)) continue;
+      if (target && !path3.qualifiedNames.some((name) => name.segments.some((segment) => segment.name === target.name || segment.name === target.shortName))) continue;
+      const namespace = namespaces.find((ns) => ns.body < path3.start && path3.end <= ns.end);
+      let receiver;
+      for (let group = 0; group < path3.qualifiedNames.length; group++) {
+        const qualified = path3.qualifiedNames[group];
+        let resolved;
+        for (let index2 = 0; index2 < qualified.segments.length; index2++) {
+          const segment = qualified.segments[index2];
+          const range = import_node4.Range.create(doc.positionAt(segment.start), doc.positionAt(segment.end));
+          let before = segment.start - 1;
+          let after = segment.end;
+          while (before >= 0 && /\s/.test(text[before])) before--;
+          while (after < text.length && /\s/.test(text[after])) after++;
+          const declaration = symbols.find((symbol) => !isAnonymous(symbol) && (symbol.selectionRange.start.line === range.start.line && symbol.selectionRange.start.character === range.start.character && symbol.selectionRange.end.character === range.end.character || symbol.shortName === segment.name && text[before] === "<" && text[after] === ">" && doc.offsetAt(symbol.range.start) <= segment.start && segment.end < doc.offsetAt(symbol.selectionRange.start)));
+          if (declaration) resolved = declaration;
+          else if (index2 > 0) {
+            resolved = resolved ? this.resolver.getResolvedMembers(namespaceKeyOf(resolved), this.indexes).get(segment.name)?.find((entry) => entry.visibility === "public")?.symbol : void 0;
+          } else if (group > 0) {
+            resolved = receiver ? this.resolveFeature(receiver, segment.name) : void 0;
+          } else {
+            resolved = this.resolver.resolveNameIn(
+              namespace?.symbol,
+              joinQualifiedName([segment.name]),
+              this.indexes
+            );
+          }
+          if (cursor !== void 0 && (cursor < segment.start || cursor > segment.end)) continue;
+          if (target && segment.name !== target.name && segment.name !== target.shortName) continue;
+          refs.push({
+            uri,
+            range,
+            name: segment.name,
+            qualifiedName: index2 === qualified.segments.length - 1 ? qualified.name : segment.name,
+            symbol: resolved,
+            isDeclaration: declaration !== void 0
+          });
+        }
+        receiver = resolved;
+      }
+    }
+    return refs;
+  }
+  resolveFeature(receiver, name) {
+    const queue = [receiver];
+    const visited = /* @__PURE__ */ new Set();
+    for (let index2 = 0; index2 < queue.length; index2++) {
+      const owner = queue[index2];
+      if (visited.has(owner)) continue;
+      visited.add(owner);
+      const member = this.resolver.getResolvedMembers(namespaceKeyOf(owner), this.indexes).get(name)?.find((entry) => entry.visibility === "public")?.symbol;
+      if (member) return member;
+      for (const typeName of owner.typeNames) {
+        const type = this.resolver.resolveNameFrom(owner, typeName, this.indexes);
+        if (type && !visited.has(type)) queue.push(type);
+      }
+    }
+    return void 0;
+  }
+};
+
 // server/src/providers/definitionProvider.ts
 var DefinitionProvider = class {
   constructor(documentManager2) {
@@ -128054,6 +128366,10 @@ var DefinitionProvider = class {
       return null;
     }
     const wsSymbolTable = this.documentManager.getWorkspaceSymbolTable();
+    const reference = new NameReferences(this.documentManager).at(params.textDocument.uri, params.position);
+    if (reference?.symbol && !reference.isDeclaration) {
+      return { uri: reference.symbol.uri, range: reference.symbol.selectionRange };
+    }
     const symbol = symbolTable.findSymbolAtPosition(
       params.textDocument.uri,
       params.position.line,
@@ -128161,7 +128477,7 @@ var DefinitionProvider = class {
 };
 
 // server/src/providers/diagnosticsProvider.ts
-var import_node4 = __toESM(require_node3());
+var import_node5 = __toESM(require_node3());
 var EXPRESSION_OPERATOR_RE = /(\w\s*[+\-*/^]\s*\w)|(\w\s*\*\*\s*\w)|->|\.(?:\?)|:=|;\s*doc\b|#\w+\s+dependency/;
 var DiagnosticsProvider = class {
   constructor(documentManager2) {
@@ -128213,7 +128529,7 @@ var DiagnosticsProvider = class {
       message = `'${word}' is a reserved SysML keyword and cannot be used as a name. Consider renaming it (e.g., '${suggestion}').`;
     }
     return {
-      severity: import_node4.DiagnosticSeverity.Error,
+      severity: import_node5.DiagnosticSeverity.Error,
       range: {
         start: { line: error.line, character: error.column },
         end: { line: error.line, character: error.column + error.length }
@@ -128282,51 +128598,51 @@ var DiagnosticsProvider = class {
 };
 
 // server/src/providers/symbolKindMapping.ts
-var import_node5 = __toESM(require_node3());
+var import_node6 = __toESM(require_node3());
 function toSysMLSymbolKind(kind) {
   switch (kind) {
     // Structural definitions → Class (they *are* types)
     case "part def" /* PartDef */:
     case "occurrence def" /* OccurrenceDef */:
-      return import_node5.SymbolKind.Class;
+      return import_node6.SymbolKind.Class;
     // Structural usages → Field (instances / typed features)
     case "part" /* PartUsage */:
     case "occurrence" /* OccurrenceUsage */:
     case "ref" /* RefUsage */:
-      return import_node5.SymbolKind.Field;
+      return import_node6.SymbolKind.Field;
     // Attributes
     case "attribute def" /* AttributeDef */:
     case "attribute" /* AttributeUsage */:
-      return import_node5.SymbolKind.Property;
+      return import_node6.SymbolKind.Property;
     // Ports & Interfaces → Interface
     case "port def" /* PortDef */:
     case "port" /* PortUsage */:
     case "interface def" /* InterfaceDef */:
     case "interface" /* InterfaceUsage */:
-      return import_node5.SymbolKind.Interface;
+      return import_node6.SymbolKind.Interface;
     // Connections
     case "connection def" /* ConnectionDef */:
     case "connection" /* ConnectionUsage */:
-      return import_node5.SymbolKind.Interface;
+      return import_node6.SymbolKind.Interface;
     // Behavioral: actions → Method
     case "action def" /* ActionDef */:
     case "action" /* ActionUsage */:
     case "perform action" /* PerformActionUsage */:
-      return import_node5.SymbolKind.Method;
+      return import_node6.SymbolKind.Method;
     // Control-flow nodes (fork/join/merge/decide) → Event
     case "fork" /* ForkNode */:
     case "join" /* JoinNode */:
     case "merge" /* MergeNode */:
     case "decide" /* DecisionNode */:
-      return import_node5.SymbolKind.Event;
+      return import_node6.SymbolKind.Event;
     // Behavioral: states → Event (better semantic fit than Enum)
     case "state def" /* StateDef */:
     case "state" /* StateUsage */:
     case "exhibit state" /* ExhibitStateUsage */:
-      return import_node5.SymbolKind.Event;
+      return import_node6.SymbolKind.Event;
     // Transitions → Event
     case "transition" /* TransitionUsage */:
-      return import_node5.SymbolKind.Event;
+      return import_node6.SymbolKind.Event;
     // Requirements → Object
     case "requirement def" /* RequirementDef */:
     case "requirement" /* RequirementUsage */:
@@ -128335,58 +128651,58 @@ function toSysMLSymbolKind(kind) {
     case "actor" /* ActorUsage */:
     case "subject" /* SubjectUsage */:
     case "stakeholder" /* StakeholderUsage */:
-      return import_node5.SymbolKind.Object;
+      return import_node6.SymbolKind.Object;
     // Constraints → Constant (boolean-valued)
     case "constraint def" /* ConstraintDef */:
     case "constraint" /* ConstraintUsage */:
-      return import_node5.SymbolKind.Constant;
+      return import_node6.SymbolKind.Constant;
     // Items → Struct (physical things, data)
     case "item def" /* ItemDef */:
     case "item" /* ItemUsage */:
-      return import_node5.SymbolKind.Struct;
+      return import_node6.SymbolKind.Struct;
     // Allocations → TypeParameter (cross-concern mapping)
     case "allocation def" /* AllocationDef */:
     case "allocation" /* AllocationUsage */:
-      return import_node5.SymbolKind.TypeParameter;
+      return import_node6.SymbolKind.TypeParameter;
     // Enumerations
     case "enum def" /* EnumDef */:
-      return import_node5.SymbolKind.Enum;
+      return import_node6.SymbolKind.Enum;
     case "enum" /* EnumUsage */:
-      return import_node5.SymbolKind.EnumMember;
+      return import_node6.SymbolKind.EnumMember;
     // Calculations → Function
     case "calc def" /* CalcDef */:
     case "calc" /* CalcUsage */:
     case "analysis case def" /* AnalysisCaseDef */:
     case "verification case def" /* VerificationCaseDef */:
-      return import_node5.SymbolKind.Function;
+      return import_node6.SymbolKind.Function;
     // Use cases → Event
     case "use case def" /* UseCaseDef */:
     case "use case" /* UseCaseUsage */:
     case "include use case" /* IncludeUseCaseUsage */:
-      return import_node5.SymbolKind.Event;
+      return import_node6.SymbolKind.Event;
     // Views → Namespace
     case "view def" /* ViewDef */:
     case "view" /* ViewUsage */:
     case "viewpoint def" /* ViewpointDef */:
     case "viewpoint" /* ViewpointUsage */:
     case "rendering def" /* RenderingDef */:
-      return import_node5.SymbolKind.Namespace;
+      return import_node6.SymbolKind.Namespace;
     // Metadata → TypeParameter
     case "metadata def" /* MetadataDef */:
-      return import_node5.SymbolKind.TypeParameter;
+      return import_node6.SymbolKind.TypeParameter;
     // Package
     case "package" /* Package */:
-      return import_node5.SymbolKind.Package;
+      return import_node6.SymbolKind.Package;
     // Comments / docs
     case "comment" /* Comment */:
     case "doc" /* Doc */:
-      return import_node5.SymbolKind.String;
+      return import_node6.SymbolKind.String;
     // Import / Alias
     case "import" /* Import */:
     case "alias" /* Alias */:
-      return import_node5.SymbolKind.Module;
+      return import_node6.SymbolKind.Module;
     default:
-      return import_node5.SymbolKind.Variable;
+      return import_node6.SymbolKind.Variable;
   }
 }
 
@@ -128433,7 +128749,7 @@ var DocumentSymbolProvider = class {
 };
 
 // server/src/providers/foldingRangeProvider.ts
-var import_node6 = __toESM(require_node3());
+var import_node7 = __toESM(require_node3());
 var FoldingRangeProvider = class {
   constructor(documentManager2) {
     this.documentManager = documentManager2;
@@ -128456,7 +128772,7 @@ var FoldingRangeProvider = class {
         ranges.push({
           startLine: commentStart,
           endLine: i,
-          kind: import_node6.FoldingRangeKind.Comment
+          kind: import_node7.FoldingRangeKind.Comment
         });
         commentStart = void 0;
       }
@@ -128469,7 +128785,7 @@ var FoldingRangeProvider = class {
             ranges.push({
               startLine,
               endLine: i,
-              kind: import_node6.FoldingRangeKind.Region
+              kind: import_node7.FoldingRangeKind.Region
             });
           }
         }
@@ -128480,7 +128796,7 @@ var FoldingRangeProvider = class {
 };
 
 // server/src/providers/formattingProvider.ts
-var import_node7 = __toESM(require_node3());
+var import_node8 = __toESM(require_node3());
 var FormattingProvider = class {
   constructor(documents2) {
     this.documents = documents2;
@@ -128496,8 +128812,8 @@ var FormattingProvider = class {
     const formatted = this.formatSysML(text, indent);
     if (formatted === text) return [];
     return [
-      import_node7.TextEdit.replace(
-        import_node7.Range.create(0, 0, doc.lineCount, 0),
+      import_node8.TextEdit.replace(
+        import_node8.Range.create(0, 0, doc.lineCount, 0),
         formatted
       )
     ];
@@ -128511,7 +128827,7 @@ var FormattingProvider = class {
     const rangeText = doc.getText(params.range);
     const formatted = this.formatSysML(rangeText, indent);
     if (formatted === rangeText) return [];
-    return [import_node7.TextEdit.replace(params.range, formatted)];
+    return [import_node8.TextEdit.replace(params.range, formatted)];
   }
   formatSysML(text, indent) {
     const lines = text.split("\n");
@@ -128647,7 +128963,7 @@ var FormattingProvider = class {
 };
 
 // server/src/providers/hoverProvider.ts
-var import_node8 = __toESM(require_node3());
+var import_node9 = __toESM(require_node3());
 var HoverProvider = class {
   constructor(documentManager2) {
     this.documentManager = documentManager2;
@@ -128664,12 +128980,13 @@ var HoverProvider = class {
       return null;
     }
     const text = this.documentManager.getText(params.textDocument.uri);
-    const word = text ? this.getWordAtPosition(text, params.position.line, params.position.character) : void 0;
-    if (word && word.includes("::")) {
+    const reference = new NameReferences(this.documentManager).at(params.textDocument.uri, params.position);
+    const word = reference?.qualifiedName ?? (text ? this.getWordAtPosition(text, params.position.line, params.position.character) : void 0);
+    if (word && word.includes("::") && !reference?.symbol) {
       const libHover = this.buildLibraryHover(word);
       if (libHover) return libHover;
     }
-    const symbol = symbolTable.findSymbolAtPosition(
+    const symbol = reference?.symbol ?? symbolTable.findSymbolAtPosition(
       params.textDocument.uri,
       params.position.line,
       params.position.character
@@ -128721,7 +129038,7 @@ ${symbol.documentation}`);
     if (hoverDiags.length > 0) {
       lines.push("\n---\n**Semantic Feedback**");
       for (const d of hoverDiags.slice(0, 3)) {
-        const sev = d.severity === import_node8.DiagnosticSeverity.Error ? "Error" : d.severity === import_node8.DiagnosticSeverity.Warning ? "Warning" : "Hint";
+        const sev = d.severity === import_node9.DiagnosticSeverity.Error ? "Error" : d.severity === import_node9.DiagnosticSeverity.Warning ? "Warning" : "Hint";
         lines.push(`- **${sev}**: ${d.message}`);
         const hint = this.getRepairHint(String(d.code ?? ""));
         if (hint) {
@@ -128730,12 +129047,12 @@ ${symbol.documentation}`);
       }
     }
     const content = {
-      kind: import_node8.MarkupKind.Markdown,
+      kind: import_node9.MarkupKind.Markdown,
       value: lines.join("\n")
     };
     return {
       contents: content,
-      range: symbol.selectionRange
+      range: reference?.range ?? symbol.selectionRange
     };
   }
   /**
@@ -128762,7 +129079,7 @@ ${info.documentation}`);
     }
     return {
       contents: {
-        kind: import_node8.MarkupKind.Markdown,
+        kind: import_node9.MarkupKind.Markdown,
         value: lines.join("\n")
       }
     };
@@ -128802,7 +129119,7 @@ ${info.documentation}`);
 };
 
 // server/src/providers/keywordValidator.ts
-var import_node9 = __toESM(require_node3());
+var import_node10 = __toESM(require_node3());
 
 // server/src/utils/emptyNames.ts
 var EMPTY_NAME_MESSAGE = "Empty name '': a name in single quotes must contain at least one character";
@@ -129201,7 +129518,7 @@ function validateKeywords(result) {
       const line2 = (token.line ?? 1) - 1;
       const char2 = token.column ?? 0;
       diagnostics.push({
-        severity: import_node9.DiagnosticSeverity.Error,
+        severity: import_node10.DiagnosticSeverity.Error,
         range: { start: { line: line2, character: char2 }, end: { line: line2, character: char2 + 2 } },
         message: EMPTY_NAME_MESSAGE,
         source: "sysml",
@@ -129219,7 +129536,7 @@ function validateKeywords(result) {
     const char = token.column ?? 0;
     const message = `Unknown keyword '${text}'. Did you mean '${suggestion}'?`;
     diagnostics.push({
-      severity: import_node9.DiagnosticSeverity.Error,
+      severity: import_node10.DiagnosticSeverity.Error,
       range: {
         start: { line, character: char },
         end: { line, character: char + text.length }
@@ -129239,115 +129556,50 @@ var ReferencesProvider = class {
   }
   documentManager;
   provideReferences(params) {
-    const result = this.documentManager.get(params.textDocument.uri);
-    if (!result) {
-      return [];
-    }
-    const symbolTable = this.documentManager.getWorkspaceSymbolTable();
-    const symbol = symbolTable.findSymbolAtPosition(
-      params.textDocument.uri,
-      params.position.line,
-      params.position.character
-    );
-    if (!symbol || isAnonymous(symbol)) {
-      return [];
-    }
-    const references = symbolTable.findReferences(symbol.name);
-    const locations = [];
-    for (const ref of references) {
-      locations.push({
-        uri: ref.uri,
-        range: ref.selectionRange
-      });
-    }
-    if (params.context.includeDeclaration) {
-    }
-    return locations;
+    const references = new NameReferences(this.documentManager);
+    const ref = references.at(params.textDocument.uri, params.position);
+    return ref?.symbol ? references.to(ref.symbol, params.context.includeDeclaration).map(({ uri, range }) => ({ uri, range })) : [];
   }
 };
 
 // server/src/providers/renameProvider.ts
-function findWordOccurrences(line, word) {
-  const positions = [];
-  let from = 0;
-  while (from <= line.length - word.length) {
-    const idx = line.indexOf(word, from);
-    if (idx < 0) break;
-    if ((idx === 0 || !isIdentPart(line.charCodeAt(idx - 1))) && (idx + word.length >= line.length || !isIdentPart(line.charCodeAt(idx + word.length)))) {
-      positions.push(idx);
-    }
-    from = idx + 1;
-  }
-  return positions;
-}
+var import_node11 = __toESM(require_node3());
 var RenameProvider = class {
   constructor(documentManager2) {
     this.documentManager = documentManager2;
   }
   documentManager;
-  /**
-   * Check if the token at position is renameable and return its range.
-   */
   prepareRename(params) {
-    const symbolTable = this.documentManager.getSymbolTable(params.textDocument.uri);
-    if (!symbolTable) return null;
-    const symbol = symbolTable.findSymbolAtPosition(
-      params.textDocument.uri,
-      params.position.line,
-      params.position.character
-    );
-    if (!symbol || isAnonymous(symbol)) return null;
-    return symbol.selectionRange;
+    const ref = new NameReferences(this.documentManager).at(params.textDocument.uri, params.position);
+    return ref?.symbol ? ref.range : null;
   }
-  /**
-   * Perform the rename — update the symbol and all references.
-   */
   provideRename(params) {
-    const symbolTable = this.documentManager.getSymbolTable(params.textDocument.uri);
-    if (!symbolTable) return null;
-    const symbol = symbolTable.findSymbolAtPosition(
-      params.textDocument.uri,
-      params.position.line,
-      params.position.character
-    );
-    if (!symbol || isAnonymous(symbol)) return null;
-    const text = this.documentManager.getText(params.textDocument.uri);
-    if (!text) return null;
-    const edits = [];
-    const oldName = symbol.name;
-    const newName = params.newName;
-    const references = symbolTable.findReferences(oldName);
-    for (const ref of references) {
-      if (ref.uri === params.textDocument.uri) {
-        edits.push({
-          range: ref.selectionRange,
-          newText: newName
-        });
-      }
+    const references = new NameReferences(this.documentManager);
+    const ref = references.at(params.textDocument.uri, params.position);
+    if (!ref?.symbol) return null;
+    const invalidControl = [...params.newName].some((ch) => {
+      const code = ch.charCodeAt(0);
+      return code < 32 && !"	\n\r".includes(ch) || code === 127;
+    });
+    if (!params.newName || invalidControl) {
+      throw new import_node11.ResponseError(import_node11.ErrorCodes.InvalidParams, "A SysML name must be non-empty and contain printable characters or escaped whitespace.");
     }
-    const lines = text.split("\n");
-    for (let i = 0; i < lines.length; i++) {
-      for (const col of findWordOccurrences(lines[i], oldName)) {
-        const range = {
-          start: { line: i, character: col },
-          end: { line: i, character: col + oldName.length }
-        };
-        if (!edits.some((e) => e.range.start.line === i && e.range.start.character === col)) {
-          edits.push({ range, newText: newName });
-        }
-      }
+    const parsed = params.newName.startsWith("'") ? readNameAt(params.newName, 0) : void 0;
+    if (params.newName.startsWith("'") && parsed?.end !== params.newName.length) {
+      throw new import_node11.ResponseError(import_node11.ErrorCodes.InvalidParams, "The quoted SysML name is incomplete or contains an invalid escape sequence.");
     }
-    if (edits.length === 0) return null;
-    return {
-      changes: {
-        [params.textDocument.uri]: edits
-      }
-    };
+    const newText = quoteName(parsed?.name ?? params.newName);
+    const changes = {};
+    for (const occurrence of references.to(ref.symbol)) {
+      if (occurrence.name !== ref.name) continue;
+      (changes[occurrence.uri] ??= []).push({ range: occurrence.range, newText });
+    }
+    return Object.keys(changes).length > 0 ? { changes } : null;
   }
 };
 
 // server/src/providers/semanticTokensProvider.ts
-var import_node10 = __toESM(require_node3());
+var import_node12 = __toESM(require_node3());
 var OPERATOR_TOKENS = /* @__PURE__ */ new Set([
   SysMLv2Lexer.BANG_EQ_EQ,
   // !==
@@ -129488,7 +129740,7 @@ var SemanticTokensProvider = class {
     if (this.tokenCache && this.tokenCache.uri === uri && this.tokenCache.version === version) {
       return this.tokenCache.tokens;
     }
-    const builder = new import_node10.SemanticTokensBuilder();
+    const builder = new import_node12.SemanticTokensBuilder();
     const result = this.documentManager.get(uri);
     if (!result) {
       return builder.build();
@@ -129568,7 +129820,7 @@ var SemanticTokensProvider = class {
 };
 
 // server/src/providers/semanticValidator.ts
-var import_node11 = __toESM(require_node3());
+var import_node13 = __toESM(require_node3());
 var CONSTRAINT_KEYWORDS = /* @__PURE__ */ new Set([
   "and",
   "or",
@@ -129590,6 +129842,13 @@ var CONSTRAINT_KEYWORDS = /* @__PURE__ */ new Set([
   "assert",
   "assume"
 ]);
+var CONNECTOR_KINDS = /* @__PURE__ */ new Set([
+  "connection" /* ConnectionUsage */,
+  "interface" /* InterfaceUsage */,
+  "allocation" /* AllocationUsage */,
+  "flow" /* FlowUsage */,
+  "succession flow" /* SuccessionFlowUsage */
+]);
 var SemanticValidator = class _SemanticValidator {
   constructor(documentManager2) {
     this.documentManager = documentManager2;
@@ -129666,7 +129925,7 @@ var SemanticValidator = class _SemanticValidator {
     diagnostics.push(...this.checkAmbiguousNamespaceName(symbols, allSymbols));
     diagnostics.push(...this.checkUnusedDefinitions(allSymbols, uri));
     diagnostics.push(...this.checkRedefinitionMultiplicity(symbols, indexes, text));
-    diagnostics.push(...this.checkPortCompatibility(text, uri, indexes));
+    diagnostics.push(...this.checkPortCompatibility(text, uri, symbols, indexes));
     diagnostics.push(...this.checkConstraintBodyReferences(text, uri, symbols, indexes));
     diagnostics.push(...this.checkCircularSpecialization(symbols, indexes));
     diagnostics.push(...this.checkUnsatisfiedRequirements(symbols, indexes));
@@ -129687,7 +129946,7 @@ var SemanticValidator = class _SemanticValidator {
     const { resolved, strippedTypeName: typeName } = resolveTypeName(symbol.typeName, symbol, this.namespaceResolver, indexes, libraryNames);
     if (resolved) return [];
     const isMandatory = symbol.multiplicityRange && symbol.multiplicityRange.lower >= 1;
-    const severity = isMandatory ? import_node11.DiagnosticSeverity.Error : import_node11.DiagnosticSeverity.Warning;
+    const severity = isMandatory ? import_node13.DiagnosticSeverity.Error : import_node13.DiagnosticSeverity.Warning;
     let message = `Type '${typeName}' is not defined in the current document or standard library`;
     if (isMandatory) {
       const multStr = symbol.multiplicity ?? "1";
@@ -129713,7 +129972,7 @@ var SemanticValidator = class _SemanticValidator {
     const { lower, upper } = symbol.multiplicityRange;
     if (typeof upper === "number" && lower > upper) {
       return [{
-        severity: import_node11.DiagnosticSeverity.Error,
+        severity: import_node13.DiagnosticSeverity.Error,
         range: symbol.selectionRange,
         message: `Invalid multiplicity [${symbol.multiplicity}]: lower bound (${lower}) exceeds upper bound (${upper})`,
         source: "sysml",
@@ -129722,7 +129981,7 @@ var SemanticValidator = class _SemanticValidator {
     }
     if (lower < 0) {
       return [{
-        severity: import_node11.DiagnosticSeverity.Error,
+        severity: import_node13.DiagnosticSeverity.Error,
         range: symbol.selectionRange,
         message: `Invalid multiplicity [${symbol.multiplicity}]: lower bound cannot be negative`,
         source: "sysml",
@@ -129746,7 +130005,7 @@ var SemanticValidator = class _SemanticValidator {
     );
     if (!hasEnumValues) {
       return [{
-        severity: import_node11.DiagnosticSeverity.Information,
+        severity: import_node13.DiagnosticSeverity.Information,
         range: symbol.selectionRange,
         message: `Enumeration '${displayName(symbol)}' has no enum values defined`,
         source: "sysml",
@@ -129766,7 +130025,7 @@ var SemanticValidator = class _SemanticValidator {
       const ch = symbol.name[0];
       if (ch === ch.toLowerCase() && ch !== ch.toUpperCase()) {
         return [{
-          severity: import_node11.DiagnosticSeverity.Hint,
+          severity: import_node13.DiagnosticSeverity.Hint,
           range: symbol.selectionRange,
           message: `Definition '${symbol.name}' should use PascalCase`,
           source: "sysml",
@@ -129778,7 +130037,7 @@ var SemanticValidator = class _SemanticValidator {
       const ch = symbol.name[0];
       if (ch === ch.toUpperCase() && ch !== ch.toLowerCase()) {
         return [{
-          severity: import_node11.DiagnosticSeverity.Hint,
+          severity: import_node13.DiagnosticSeverity.Hint,
           range: symbol.selectionRange,
           message: `Usage '${symbol.name}' should use camelCase`,
           source: "sysml",
@@ -129797,7 +130056,7 @@ var SemanticValidator = class _SemanticValidator {
     if (!isDefinition(symbol.kind)) return [];
     if (symbol.documentation) return [];
     return [{
-      severity: import_node11.DiagnosticSeverity.Information,
+      severity: import_node13.DiagnosticSeverity.Information,
       range: symbol.selectionRange,
       message: `Definition '${displayName(symbol)}' has no documentation`,
       source: "sysml",
@@ -129816,23 +130075,23 @@ var SemanticValidator = class _SemanticValidator {
     );
     const defsInScope = targetUri ? defs.filter((def) => def.uri === targetUri) : defs;
     const referencedTypes = new Set(
-      symbols.filter((s) => s.kind !== "package" /* Package */).flatMap((s) => s.typeNames)
+      symbols.filter((s) => s.kind !== "package" /* Package */).flatMap((s) => s.typeNames.flatMap((name) => [name, splitQualifiedName(name).at(-1)]))
     );
     for (const s of symbols) {
       if (s.exposeTargets) {
         for (const target of s.exposeTargets) {
-          const simpleName = target.replace(/::\*{1,2}$/, "").split("::").pop();
+          const simpleName = splitQualifiedName(target.replace(/::\*{1,2}$/, "")).pop();
           if (simpleName) referencedTypes.add(simpleName);
         }
       }
     }
     const diagnostics = [];
     for (const def of defsInScope) {
-      const isReferenced = referencedTypes.has(def.name);
+      const isReferenced = referencedTypes.has(def.name) || def.shortName !== void 0 && referencedTypes.has(def.shortName);
       const hasBaseType = (def.typeNames?.length ?? 0) > 0;
       if (!isReferenced && !hasBaseType) {
         diagnostics.push({
-          severity: import_node11.DiagnosticSeverity.Warning,
+          severity: import_node13.DiagnosticSeverity.Warning,
           range: def.selectionRange,
           message: `Definition '${def.name}' is not referenced by any usage in the workspace`,
           source: "sysml",
@@ -129887,7 +130146,7 @@ var SemanticValidator = class _SemanticValidator {
       opts?.text ? [opts.text] : []
     ));
     if (opts?.text && opts.uri) {
-      diagnostics.push(...instance.checkPortCompatibility(opts.text, opts.uri, indexes));
+      diagnostics.push(...instance.checkPortCompatibility(opts.text, opts.uri, symbolsInUri, indexes));
       diagnostics.push(...instance.checkConstraintBodyReferences(opts.text, opts.uri, symbolsInUri, indexes));
     }
     return instance.dedupeDiagnostics(diagnostics);
@@ -129907,7 +130166,7 @@ var SemanticValidator = class _SemanticValidator {
       const cycle = this.followSpecializationChain(def.name, def.typeNames, visited, indexes);
       if (cycle) {
         diagnostics.push({
-          severity: import_node11.DiagnosticSeverity.Error,
+          severity: import_node13.DiagnosticSeverity.Error,
           range: def.selectionRange,
           message: `Circular specialization: ${cycle.join(" :> ")} :> ${cycle[0]}`,
           source: "sysml",
@@ -129995,7 +130254,7 @@ var SemanticValidator = class _SemanticValidator {
       const isSatisfied = satisfiedNames.has(req.name) || req.qualifiedName !== void 0 && satisfiedNames.has(req.qualifiedName);
       if (!isSatisfied) {
         diagnostics.push({
-          severity: import_node11.DiagnosticSeverity.Warning,
+          severity: import_node13.DiagnosticSeverity.Warning,
           range: req.selectionRange,
           message: `Requirement '${req.name}' is not satisfied by any element`,
           source: "sysml",
@@ -130132,7 +130391,7 @@ var SemanticValidator = class _SemanticValidator {
       if (!isVerified) {
         const message = isSatisfied ? `Requirement '${req.name}' is satisfied but has no verification case \u2014 consider adding: verify ${req.name} by <VerificationCase>;` : `Requirement '${req.name}' has no verification case \u2014 consider adding: verify ${req.name} by <VerificationCase>;`;
         diagnostics.push({
-          severity: import_node11.DiagnosticSeverity.Warning,
+          severity: import_node13.DiagnosticSeverity.Warning,
           range: req.selectionRange,
           message,
           source: "sysml",
@@ -130192,7 +130451,7 @@ var SemanticValidator = class _SemanticValidator {
       const hasFilter = view.viewFilters && view.viewFilters.length > 0;
       if (!hasExpose && !hasFilter) {
         diagnostics.push({
-          severity: import_node11.DiagnosticSeverity.Information,
+          severity: import_node13.DiagnosticSeverity.Information,
           range: view.selectionRange,
           message: `View '${view.name}' has no expose or filter directives \u2014 it will show all elements`,
           source: "sysml",
@@ -130232,7 +130491,7 @@ var SemanticValidator = class _SemanticValidator {
       const upperOk = baseUpper === "*" || curUpper !== "*" && curUpper <= baseUpper;
       if (lowerOk && upperOk) continue;
       diagnostics.push({
-        severity: import_node11.DiagnosticSeverity.Error,
+        severity: import_node13.DiagnosticSeverity.Error,
         range: s.selectionRange,
         message: `Redefinition multiplicity [${s.multiplicity ?? "?"}] is incompatible with base '${base.name}' multiplicity [${base.multiplicity ?? "?"}]`,
         source: "sysml",
@@ -130250,17 +130509,21 @@ var SemanticValidator = class _SemanticValidator {
    * - The connection is within an interface usage
    * - Both ports are untyped (empty port defs with no features)
    */
-  checkPortCompatibility(text, uri, indexes) {
+  checkPortCompatibility(text, uri, symbolsInUri, indexes) {
     if (!text) return [];
     const diagnostics = [];
     const lines = text.split("\n");
-    const re = /\bconnect\s+([A-Za-z_][\w.]*)\s+to\s+([A-Za-z_][\w.]*)/g;
-    let m2;
-    while ((m2 = re.exec(text)) !== null) {
-      const left = m2[1].split(".").pop();
-      const right = m2[2].split(".").pop();
-      const lSym = (indexes.portsByName.get(left) ?? [])[0];
-      const rSym = (indexes.portsByName.get(right) ?? [])[0];
+    const paths = [...scanFeaturePaths(text)];
+    for (let i = 0; i + 3 < paths.length; i++) {
+      const [connect, leftEnd, to, rightEnd] = paths.slice(i, i + 4);
+      if (text.slice(connect.start, connect.end) !== "connect" || text.slice(to.start, to.end) !== "to" || !/^\s+$/.test(text.slice(connect.end, leftEnd.start)) || !/^\s+$/.test(text.slice(leftEnd.end, to.start)) || !/^\s+$/.test(text.slice(to.end, rightEnd.start))) continue;
+      const leftPath = [...leftEnd.parts];
+      const rightPath = [...rightEnd.parts];
+      const left = leftPath[leftPath.length - 1];
+      const right = rightPath[rightPath.length - 1];
+      const scope = this.connectorScope(symbolsInUri, this.indexToRange(text, connect.start, 0).start, indexes);
+      const lSym = this.resolveConnectorEnd(leftPath, scope, indexes);
+      const rSym = this.resolveConnectorEnd(rightPath, scope, indexes);
       if (!lSym || !rSym) continue;
       const lType = lSym.typeNames[0] ?? lSym.typeName;
       const rType = rSym.typeNames[0] ?? rSym.typeName;
@@ -130268,10 +130531,10 @@ var SemanticValidator = class _SemanticValidator {
       if (lType === "~" + rType || rType === "~" + lType) continue;
       if (lType.startsWith("~") && lType.slice(1) === rType) continue;
       if (rType.startsWith("~") && rType.slice(1) === lType) continue;
-      const matchLine = text.substring(0, m2.index).split("\n").length - 1;
+      const matchLine = text.substring(0, connect.start).split("\n").length - 1;
       let insideInterfaceDef = false;
-      for (let i = matchLine; i >= 0 && i >= matchLine - 30; i--) {
-        const line = (lines[i] || "").trim();
+      for (let i2 = matchLine; i2 >= 0 && i2 >= matchLine - 30; i2--) {
+        const line = (lines[i2] || "").trim();
         if (/\binterface\s+def\b/.test(line)) {
           insideInterfaceDef = true;
           break;
@@ -130279,7 +130542,7 @@ var SemanticValidator = class _SemanticValidator {
         if (/^\s*package\b/.test(line)) break;
       }
       if (insideInterfaceDef) continue;
-      const precedingText = text.substring(Math.max(0, m2.index - 300), m2.index);
+      const precedingText = text.substring(Math.max(0, connect.start - 300), connect.start);
       if (/\binterface\s+\w[\w']*(:\w[\w']*)?\s*$/m.test(precedingText)) continue;
       const lDefSyms = indexes.byName.get(lType) ?? [];
       const rDefSyms = indexes.byName.get(rType) ?? [];
@@ -130298,18 +130561,67 @@ var SemanticValidator = class _SemanticValidator {
         const hasSharedFeature = rChildren.some((c) => lChildNames.has(c.name));
         if (hasSharedFeature) continue;
       }
-      const range = this.indexToRange(text, m2.index, m2[0].length);
+      const range = this.indexToRange(text, connect.start, rightEnd.end - connect.start);
       diagnostics.push({
-        severity: import_node11.DiagnosticSeverity.Warning,
+        severity: import_node13.DiagnosticSeverity.Warning,
         range,
         message: `Port compatibility issue: '${left}' (${lType}) is connected to '${right}' (${rType})`,
         source: "sysml",
         code: "incompatible-port-types",
-        data: { uri }
+        data: { uri, left, right, leftType: lType }
       });
     }
     return diagnostics;
   }
+  /**
+   * The innermost element around `position` that owns a connector declared
+   * there: the connector's own symbol, when it has one, is skipped.
+   */
+  connectorScope(symbols, position, indexes) {
+    const before = (a, b) => a.line < b.line || a.line === b.line && a.character <= b.character;
+    const size = (r) => (r.end.line - r.start.line) * 1e6 + (r.end.character - r.start.character);
+    let scope;
+    for (const s of symbols) {
+      if (!before(s.range.start, position) || !before(position, s.range.end)) continue;
+      if (!scope || size(s.range) < size(scope.range)) scope = s;
+    }
+    while (scope && CONNECTOR_KINDS.has(scope.kind)) scope = ownerOf(scope, indexes);
+    return scope;
+  }
+  /**
+   * The port that a connector end (`a.p`, `a.p.q`) names, resolved from
+   * `scope` outward: its first segment is a feature of `scope` or of one of
+   * its owners, each next one a feature of the one before. Two parts can each
+   * have a port of the same name, so an end is never matched by its last
+   * segment alone, except when the path does not resolve and the workspace
+   * has only one port of that name.
+   */
+  resolveConnectorEnd(path3, scope, indexes) {
+    let feature;
+    for (let namespace = scope; namespace && !feature; namespace = ownerOf(namespace, indexes)) {
+      feature = this.findFeature(namespace, path3[0], indexes);
+    }
+    for (const name of path3.slice(1)) {
+      feature = feature && this.findFeature(feature, name, indexes);
+    }
+    if (feature) return feature.kind === "port" /* PortUsage */ ? feature : void 0;
+    const sameName = indexes.portsByName.get(path3[path3.length - 1]) ?? [];
+    return sameName.length === 1 ? sameName[0] : void 0;
+  }
+  /** The feature `name` of `owner`: its own member, else a member of one of its types or their supertypes. */
+  findFeature(owner, name, indexes) {
+    const own = (indexes.byParent.get(namespaceKeyOf(owner)) ?? []).find((s) => s.name === name);
+    if (own) return own;
+    for (const typeName of owner.typeNames) {
+      const type = this.namespaceResolver.resolveNameFrom(owner, typeName, indexes);
+      if (!type || !isDefinition(type.kind)) continue;
+      for (const definition of this.getSpecializationHierarchy(type, indexes).flat()) {
+        const member = (indexes.byParent.get(namespaceKeyOf(definition)) ?? []).find((s) => s.name === name);
+        if (member) return member;
+      }
+    }
+    return void 0;
+  }
   /**
    * Resolve the full type hierarchy for a type name by following
    * specialization chains transitively (max depth 10).
@@ -130346,7 +130658,7 @@ var SemanticValidator = class _SemanticValidator {
         const startInBody = trimStart >= 0 ? trimStart : 0;
         const trimmedLen = Math.max(1, b.body.trim().length);
         diagnostics.push({
-          severity: import_node11.DiagnosticSeverity.Warning,
+          severity: import_node13.DiagnosticSeverity.Warning,
           range: this.indexToRange(text, b.bodyOffset + startInBody, trimmedLen),
           message: "Invalid constraint body: expected expression, found documentation text",
           source: "sysml",
@@ -130357,17 +130669,13 @@ var SemanticValidator = class _SemanticValidator {
       }
       const parent = this.findConstraintScopeSymbol(symbolsInUri, indexes, b.startLine);
       if (!parent) continue;
-      const parentMembers = indexes.byParent.get(namespaceKeyOf(parent)) ?? [];
+      const parentMembers = this.getConstraintScopeMembers(parent, indexes);
       if (parentMembers.length === 0) continue;
-      const ignoredRanges = this.getIgnoredBodyRanges(b.body);
-      const idRe = /\b([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*)\b/g;
-      let im;
-      while ((im = idRe.exec(b.body)) !== null) {
-        if (this.isIndexInRanges(im.index, ignoredRanges)) continue;
-        const expr = im[1];
+      for (const reference of scanFeaturePaths(b.body)) {
+        const expr = reference.name;
         if (this.isConstraintKeyword(expr)) continue;
         if (/^\d/.test(expr)) continue;
-        const path3 = expr.split(".");
+        const path3 = [...reference.parts];
         const ok = this.resolvePathFromParent(path3, parentMembers, indexes);
         if (ok) continue;
         if (path3.length === 1) {
@@ -130376,14 +130684,14 @@ var SemanticValidator = class _SemanticValidator {
             continue;
           }
         }
-        const absoluteStart = b.bodyOffset + im.index;
+        const absoluteStart = b.bodyOffset + reference.start;
         diagnostics.push({
-          severity: import_node11.DiagnosticSeverity.Warning,
-          range: this.indexToRange(text, absoluteStart, expr.length),
+          severity: import_node13.DiagnosticSeverity.Warning,
+          range: this.indexToRange(text, absoluteStart, reference.end - reference.start),
           message: `Unresolved constraint reference '${expr}' in scope '${displayName(parent)}'`,
           source: "sysml",
           code: "unresolved-constraint-reference",
-          data: { uri }
+          data: { uri, scopeName: parent.name }
         });
       }
     }
@@ -130416,18 +130724,135 @@ var SemanticValidator = class _SemanticValidator {
     const root = parentMembers.find((s) => s.name === path3[0]);
     if (!root) return false;
     if (path3.length === 1) return true;
-    let typeName = root.typeNames[0] ?? root.typeName;
+    let current = root;
     for (let i = 1; i < path3.length; i++) {
+      const typeName = current.typeNames[0] ?? current.typeName;
       if (!typeName) return false;
-      const typeDefs = indexes.definitionsByName.get(typeName) ?? [];
-      const typeDef = typeDefs[0];
-      if (!typeDef) return false;
-      const member = (indexes.byParent.get(namespaceKeyOf(typeDef)) ?? []).find((s) => s.name === path3[i]);
+      const typeDef = this.namespaceResolver.resolveNameFrom(current, typeName, indexes);
+      if (!typeDef || !isDefinition(typeDef.kind)) return false;
+      const member = this.getConstraintScopeMembers(typeDef, indexes, true).find((s) => s.name === path3[i]);
       if (!member) return false;
-      typeName = member.typeNames[0] ?? member.typeName;
+      current = member;
     }
     return true;
   }
+  getConstraintScopeMembers(scope, indexes, publicOnly = false) {
+    const hierarchy = [[scope]];
+    const visited = /* @__PURE__ */ new Set([scope]);
+    let frontier = [scope];
+    while (frontier.length > 0) {
+      const next = [];
+      for (const current of frontier) {
+        for (const typeName of current.typeNames) {
+          const supertype = this.namespaceResolver.resolveNameFrom(current, typeName, indexes);
+          if (!supertype || !isDefinition(supertype.kind) || visited.has(supertype)) continue;
+          visited.add(supertype);
+          next.push(supertype);
+        }
+      }
+      if (next.length > 0) hierarchy.push(next);
+      frontier = next;
+    }
+    const membersByLevel = hierarchy.map((level) => level.flatMap((namespace) => indexes.byParent.get(namespaceKeyOf(namespace)) ?? []));
+    const hiddenMembers = /* @__PURE__ */ new Set();
+    for (let level = membersByLevel.length - 1; level >= 0; level--) {
+      for (const redefining of membersByLevel[level]) {
+        for (const target of redefining.redefinedFeatureTargets ?? []) {
+          const owner = ownerOf(redefining, indexes);
+          if (!owner) continue;
+          for (const candidate of this.resolveInheritedRedefinitionTarget(owner, target, hiddenMembers, indexes)) {
+            hiddenMembers.add(candidate.symbolId);
+          }
+        }
+        if (redefining.kind === "subject" /* SubjectUsage */) {
+          const owner = ownerOf(redefining, indexes);
+          if (!owner) continue;
+          for (const ancestor of this.getSpecializationHierarchy(owner, indexes).slice(1).flat()) {
+            for (const candidate of indexes.byParent.get(namespaceKeyOf(ancestor)) ?? []) {
+              if (candidate.kind === "subject" /* SubjectUsage */) hiddenMembers.add(candidate.symbolId);
+            }
+          }
+        }
+      }
+    }
+    const membersByName = /* @__PURE__ */ new Map();
+    for (let level = 0; level < membersByLevel.length; level++) {
+      for (const member of membersByLevel[level]) {
+        if (level > 0 && member.visibility === "private") continue;
+        if (publicOnly && member.visibility !== void 0 && member.visibility !== "public") continue;
+        if (hiddenMembers.has(member.symbolId) || membersByName.has(member.name)) continue;
+        membersByName.set(member.name, member);
+      }
+    }
+    return [...membersByName.values()];
+  }
+  resolveInheritedRedefinitionTarget(owner, target, alreadyRedefined, indexes) {
+    if (target.includes(".")) return [];
+    const segments = target.split("::");
+    const targetName = segments.pop()?.replace(/^'|'$/g, "");
+    if (!targetName) return [];
+    const qualifier = segments.join("::").replace(/^'|'$/g, "");
+    const matches = /* @__PURE__ */ new Map();
+    for (const supertype of this.resolveDirectSupertypes(owner, indexes)) {
+      const branch = this.getSpecializationHierarchy(supertype, indexes);
+      const anchors = qualifier ? branch.flat().filter((type) => this.matchesSpecializationQualifier(type, qualifier)) : [supertype];
+      for (const anchor of anchors) {
+        let frontier = [anchor];
+        const visited = new Set(frontier);
+        const candidates = [];
+        while (frontier.length > 0 && candidates.length === 0) {
+          for (const type of frontier) {
+            for (const member of indexes.byParent.get(namespaceKeyOf(type)) ?? []) {
+              if (member.name === targetName && member.visibility !== "private" && !alreadyRedefined.has(member.symbolId)) {
+                candidates.push(member);
+              }
+            }
+          }
+          if (candidates.length > 0) break;
+          const next = /* @__PURE__ */ new Map();
+          for (const type of frontier) {
+            for (const parent of this.resolveDirectSupertypes(type, indexes)) {
+              if (visited.has(parent)) continue;
+              visited.add(parent);
+              next.set(parent.symbolId, parent);
+            }
+          }
+          frontier = [...next.values()];
+        }
+        for (const candidate of candidates) matches.set(candidate.symbolId, candidate);
+      }
+    }
+    return matches.size === 1 ? [...matches.values()] : [];
+  }
+  resolveDirectSupertypes(scope, indexes) {
+    const supertypes = /* @__PURE__ */ new Map();
+    for (const typeName of scope.typeNames) {
+      const supertype = this.namespaceResolver.resolveNameFrom(scope, typeName, indexes);
+      if (supertype && isDefinition(supertype.kind)) supertypes.set(supertype.symbolId, supertype);
+    }
+    return [...supertypes.values()];
+  }
+  getSpecializationHierarchy(scope, indexes) {
+    const levels = [[scope]];
+    const visited = /* @__PURE__ */ new Set([scope]);
+    let frontier = [scope];
+    while (frontier.length > 0) {
+      const next = [];
+      for (const type of frontier) {
+        for (const parent of this.resolveDirectSupertypes(type, indexes)) {
+          if (visited.has(parent)) continue;
+          visited.add(parent);
+          next.push(parent);
+        }
+      }
+      if (next.length > 0) levels.push(next);
+      frontier = next;
+    }
+    return levels;
+  }
+  matchesSpecializationQualifier(type, qualifier) {
+    return type.name === qualifier || type.qualifiedName === qualifier || type.qualifiedName?.endsWith(`::${qualifier}`) === true;
+  }
   findContainingSymbolByLine(symbols, line) {
     return symbols.filter((s) => s.range.start.line <= line && s.range.end.line >= line).sort((a, b) => {
       const ar = (a.range.end.line - a.range.start.line) * 1e3 + (a.range.end.character - a.range.start.character);
@@ -130438,7 +130863,7 @@ var SemanticValidator = class _SemanticValidator {
   findConstraintScopeSymbol(symbolsInUri, indexes, line) {
     let scope = this.findContainingSymbolByLine(symbolsInUri, line);
     while (scope) {
-      const members = indexes.byParent.get(namespaceKeyOf(scope)) ?? [];
+      const members = this.getConstraintScopeMembers(scope, indexes);
       if (members.length > 0) return scope;
       if (!scope.parentId) return scope;
       scope = ownerOf(scope, indexes);
@@ -130460,25 +130885,6 @@ var SemanticValidator = class _SemanticValidator {
   isConstraintKeyword(value) {
     return CONSTRAINT_KEYWORDS.has(value);
   }
-  getIgnoredBodyRanges(body) {
-    const ranges = [];
-    const blockRe = /\/\*[\s\S]*?\*\//g;
-    let m2;
-    while ((m2 = blockRe.exec(body)) !== null) {
-      ranges.push({ start: m2.index, end: m2.index + m2[0].length });
-    }
-    const lineRe = /\/\/[^\n\r]*/g;
-    while ((m2 = lineRe.exec(body)) !== null) {
-      ranges.push({ start: m2.index, end: m2.index + m2[0].length });
-    }
-    return ranges;
-  }
-  isIndexInRanges(index2, ranges) {
-    for (const r of ranges) {
-      if (index2 >= r.start && index2 < r.end) return true;
-    }
-    return false;
-  }
   hasDocumentationOnlyConstraintBody(body) {
     const trimmed = body.trim();
     if (!trimmed) return false;
@@ -130576,7 +130982,7 @@ var SemanticValidator = class _SemanticValidator {
         if (defs.length > 1) {
           for (const def of defs) {
             diagnostics.push({
-              severity: import_node11.DiagnosticSeverity.Warning,
+              severity: import_node13.DiagnosticSeverity.Warning,
               range: def.selectionRange,
               message: `Duplicate definition: '${name}' is defined ${defs.length} times in the same scope`,
               source: "sysml",
@@ -130618,7 +131024,7 @@ var SemanticValidator = class _SemanticValidator {
       if (!conflicting) continue;
       const others = otherDeclarations(conflicting, symbol);
       diagnostics.push({
-        severity: import_node11.DiagnosticSeverity.Error,
+        severity: import_node13.DiagnosticSeverity.Error,
         range: symbol.selectionRange,
         message: `Ambiguous name '${symbol.name}': also declared as ${describeConflictingDeclarations(others, symbol.uri)}.`,
         source: "sysml",
@@ -130704,7 +131110,7 @@ function toFsPath(uri) {
   return void 0;
 }
 var connection = createServerConnection();
-var documents = new import_node12.TextDocuments(TextDocument);
+var documents = new import_node14.TextDocuments(TextDocument);
 var serverStartTime = Date.now();
 var documentManager = new DocumentManager();
 var modelProvider = new SysMLModelProvider(documentManager);
@@ -130869,7 +131275,7 @@ connection.onInitialize((params) => {
   };
   const result = {
     capabilities: {
-      textDocumentSync: import_node12.TextDocumentSyncKind.Incremental,
+      textDocumentSync: import_node14.TextDocumentSyncKind.Incremental,
       // Completion
       completionProvider: {
         resolveProvider: true,
@@ -130897,7 +131303,7 @@ connection.onInitialize((params) => {
       // Code actions (quick fixes)
       codeActionProvider: {
         codeActionKinds: [
-          import_node12.CodeActionKind.QuickFix
+          import_node14.CodeActionKind.QuickFix
         ]
       },
       // Document formatting
@@ -130918,7 +131324,7 @@ connection.onInitialize((params) => {
 connection.onInitialized(async () => {
   if (hasConfigurationCapability) {
     connection.client.register(
-      import_node12.DidChangeConfigurationNotification.type,
+      import_node14.DidChangeConfigurationNotification.type,
       void 0
     );
   }
@@ -131027,7 +131433,8 @@ function logFolderPrefixes(ownProjectIds) {
     if (loggedFolderPrefixes.get(folderUri) === prefix) continue;
     loggedFolderPrefixes.set(folderUri, prefix);
     const source = ownProjectIds.has(folderUri) ? "its projectId" : prefix === getUrlPrefix() ? prefix === DEFAULT_URL_PREFIX ? "the default prefix, no projectId" : "initializationOptions.projectId" : "an enclosing folder's projectId";
-    connection.console.info(`Folder ${folderUri}: top-level elements' URLs start with ${prefix} (${source})`);
+    const folderPath = toFsPath(folderUri) ?? folderUri;
+    connection.console.debug(`Folder ${folderPath}: element ID namespace ${prefix} (${source}; ID namespace only, no network access)`);
   }
   for (const folderUri of loggedFolderPrefixes.keys()) {
     if (!workspaceFolderUris.includes(folderUri)) loggedFolderPrefixes.delete(folderUri);