sysml-v2-lsp 0.33.0 → 0.35.0

package/dist/server/server.js

@@ -121638,6 +121638,10 @@ var SYSML_KEYWORDS = new Set(SYSML_KEYWORDS_ARRAY);
 function canonicalUri(uri) {
   return uri.replace(/^file:\/\/\/([A-Za-z])(?::|%3[Aa])(?=\/|$)/, (_m, drive) => `file:///${drive.toLowerCase()}:`);
 }
+function isInFolder(uri, folderUri) {
+  const folder = canonicalUri(folderUri);
+  return canonicalUri(uri).startsWith(folder.endsWith("/") ? folder : `${folder}/`);
+}
 function isSameDocumentUri(a, b) {
   return a === b || canonicalUri(a) === canonicalUri(b);
 }
@@ -121740,6 +121744,7 @@ var v5_default = v5;
 var NAMESPACE_URL = v5_default.URL;
 var DEFAULT_URL_PREFIX = "https://github.com/daltskin/sysml-v2-lsp/";
 var urlPrefix = DEFAULT_URL_PREFIX;
+var folderPrefixes = [];
 function setProjectId(projectId) {
   if (projectId === void 0) {
     urlPrefix = DEFAULT_URL_PREFIX;
@@ -121749,8 +121754,14 @@ function setProjectId(projectId) {
   urlPrefix = `urn:uuid:${projectId.toLowerCase()}/`;
   return true;
 }
-function getUrlPrefix() {
-  return urlPrefix;
+function setFolderProjectIds(projectIds) {
+  const rejected = projectIds.filter((p) => !validate_default(p.projectId));
+  folderPrefixes = projectIds.filter((p) => validate_default(p.projectId)).map((p) => ({ folderUri: p.folderUri, prefix: `urn:uuid:${p.projectId.toLowerCase()}/` })).sort((a, b) => b.folderUri.length - a.folderUri.length);
+  return rejected;
+}
+function getUrlPrefix(uri) {
+  const match = uri === void 0 ? void 0 : folderPrefixes.find((f) => isInFolder(uri, f.folderUri));
+  return match?.prefix ?? urlPrefix;
 }
 function uuidV5(namespace, name) {
   return v5_default(name, namespace);
@@ -121832,6 +121843,10 @@ function toMetaclassName(kind) {
       return "RequirementDefinition";
     case "requirement" /* RequirementUsage */:
       return "RequirementUsage";
+    case "concern def" /* ConcernDef */:
+      return "ConcernDefinition";
+    case "concern" /* ConcernUsage */:
+      return "ConcernUsage";
     case "constraint def" /* ConstraintDef */:
       return "ConstraintDefinition";
     case "constraint" /* ConstraintUsage */:
@@ -121954,7 +121969,7 @@ var IdRegistry = class {
     declaration.parentId = owner?.symbolId;
     const path3 = declaration.qualifiedName !== void 0 ? this.qualifiedNameAsWritten(declaration) : owner ? `${this.paths.get(owner)}/${segmentOf(declaration)}` : segmentOf(declaration);
     const namespace = owner ? this.topLevelOf(owner).symbolId : NAMESPACE_URL;
-    const key = owner ? path3 : getUrlPrefix() + encodeURIComponent(path3);
+    const key = owner ? path3 : getUrlPrefix(declaration.uri) + encodeURIComponent(path3);
     const groupId = this.uuidOf(namespace, key);
     this.groupKeys.set(groupId, { namespace, key, path: path3 });
     this.groupOf.set(declaration, groupId);
@@ -122139,6 +122154,12 @@ var RULE_INDEX_TO_KIND = /* @__PURE__ */ new Map([
   // 343
   [SysMLv2Parser.RULE_requirementDefinition, "requirement def" /* RequirementDef */],
   // 384
+  [SysMLv2Parser.RULE_concernDefinition, "concern def" /* ConcernDef */],
+  // 405
+  [SysMLv2Parser.RULE_concernUsage, "concern" /* ConcernUsage */],
+  // 406
+  [SysMLv2Parser.RULE_framedConcernUsage, "concern" /* ConcernUsage */],
+  // 394
   [SysMLv2Parser.RULE_constraintDefinition, "constraint def" /* ConstraintDef */],
   // 380
   [SysMLv2Parser.RULE_itemDefinition, "item def" /* ItemDef */],
@@ -122211,6 +122232,10 @@ var RULE_INDEX_TO_KIND = /* @__PURE__ */ new Map([
   // 268
   [SysMLv2Parser.RULE_performActionUsage, "perform action" /* PerformActionUsage */],
   // 298
+  // A state's `entry`/`do`/`exit` action (`exit action a : A;`, `exit a;`): the
+  // StatePerformActionUsage production, a PerformActionUsage without `perform`.
+  [SysMLv2Parser.RULE_statePerformActionUsage, "perform action" /* PerformActionUsage */],
+  // 352
   [SysMLv2Parser.RULE_exhibitStateUsage, "exhibit state" /* ExhibitStateUsage */],
   // 359
   [SysMLv2Parser.RULE_transitionUsage, "transition" /* TransitionUsage */],
@@ -122334,8 +122359,10 @@ var TYPE_RECURSE_RULE_INDICES = /* @__PURE__ */ new Set([
   // 210
   SysMLv2Parser.RULE_definition,
   // 192
-  SysMLv2Parser.RULE_usage
+  SysMLv2Parser.RULE_usage,
   // 208
+  SysMLv2Parser.RULE_payloadFeatureSpecializationPart
+  // 157
 ]);
 var DOC_RULE_INDICES = /* @__PURE__ */ new Set([
   SysMLv2Parser.RULE_comment,
@@ -122960,7 +122987,7 @@ var SymbolTable = class {
     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 selectionRange = anonymous ? ctx.start ? tokenToRange(ctx.start) : range : this.extractNameRange(ctx) ?? range;
-    const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx) : this.extractTypeNames(ctx);
+    const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx) : transition ? this.extractTransitionTypeNames(ctx) : this.extractTypeNames(ctx);
     const specializationNames = this.extractSpecializationNames(ctx);
     const typeName = typeNames[0];
     const documentation = this.extractDocumentation(ctx);
@@ -123075,6 +123102,25 @@ var SymbolTable = class {
     const typeDeclaration = declaration && (this.findOwnHeaderRule(declaration, SysMLv2Parser.RULE_featureDeclaration) ?? this.findOwnHeaderRule(declaration, SysMLv2Parser.RULE_usageDeclaration));
     return typeDeclaration ? this.extractTypeNames(typeDeclaration) : [];
   }
+  /**
+   * A transition's own typing, then the types of the payload its trigger
+   * accepts (`accept cmd : Command`, `accept Command`; TriggerAction ->
+   * AcceptParameterPart -> PayloadParameter). Read from the parse tree only:
+   * the regex fallback of `extractTypeNames` runs on whitespace-free text, where
+   * the payload type runs into the guard, effect or target that follows it
+   * (`Commandifcmd`, `Commandthenbusy`).
+   */
+  extractTransitionTypeNames(ctx) {
+    const names = [];
+    this.collectTypeNamesFromTree(ctx, names, 0);
+    const trigger = this.findOwnHeaderRule(ctx, SysMLv2Parser.RULE_triggerActionMember);
+    const parameter = trigger && this.findRuleContext(trigger, SysMLv2Parser.RULE_payloadParameter);
+    if (parameter) {
+      const payload = this.findRuleContext(parameter, SysMLv2Parser.RULE_payloadFeature) ?? parameter;
+      this.collectTypeNamesFromTree(payload, names, 0);
+    }
+    return names;
+  }
   /** Find the first descendant of `ctx` with rule `ruleIndex`, in source order. */
   findRuleContext(ctx, ruleIndex) {
     const matches = [];
@@ -123168,7 +123214,7 @@ var SymbolTable = class {
       const child = ctx.getChild(i);
       if (child instanceof TerminalNode) {
         const token = child.symbol;
-        if (this.isIdentifierToken(token)) {
+        if (this.isNameTerminal(child)) {
           return this.unquoteName(token.text ?? "");
         }
       }
@@ -123200,7 +123246,7 @@ var SymbolTable = class {
    */
   anonymousDeclaration(ctx, kind, transition) {
     if (!isDefinition(kind) && !isUsage(kind)) return void 0;
-    if (transition && !(transition.source && transition.target) && this.extractTypeNames(ctx).length === 0) return void 0;
+    if (transition && !(transition.source && transition.target) && this.extractTransitionTypeNames(ctx).length === 0) return void 0;
     return this.declarationText(ctx);
   }
   /**
@@ -123220,14 +123266,15 @@ var SymbolTable = class {
   /**
    * The first node of rule `ruleIndex` in `ctx`'s own declaration: never
    * inside a nested element, its body, its value, a flow's payload or ends,
-   * or a prefix such as `#metadata`.
+   * a connector end's own multiplicity (`connect [2] a to b`), or a prefix
+   * such as `#metadata`.
    */
   findOwnHeaderRule(ctx, ruleIndex) {
     for (let i = 0; i < ctx.getChildCount(); i++) {
       const child = ctx.getChild(i);
       if (!(child instanceof ParserRuleContext)) continue;
       if (child.ruleIndex === ruleIndex) return child;
-      if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || this.isPrefixOrExtensionContext(child)) continue;
+      if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_ownedCrossMultiplicityMember || this.isPrefixOrExtensionContext(child)) continue;
       const found = this.findOwnHeaderRule(child, ruleIndex);
       if (found) return found;
     }
@@ -123391,7 +123438,7 @@ var SymbolTable = class {
   extractNameRange(ctx) {
     for (let i = 0; i < ctx.getChildCount(); i++) {
       const child = ctx.getChild(i);
-      if (child instanceof TerminalNode && this.isIdentifierToken(child.symbol)) {
+      if (child instanceof TerminalNode && this.isNameTerminal(child)) {
         return tokenToRange(child.symbol);
       }
       if (child instanceof ParserRuleContext) {
@@ -123576,12 +123623,12 @@ var SymbolTable = class {
     return lines.join("\n").trim();
   }
   /**
-   * Extract multiplicity from a context.
-   * Looks for MultiplicityBoundsContext in the subtree.
+   * Extract multiplicity from a context's own declaration, never from a
+   * nested element or its body.
    * Returns { multiplicity: "1..5", multiplicityRange: { lower: 1, upper: 5 } }
    */
   extractMultiplicity(ctx) {
-    const multCtx = this.findMultiplicityBounds(ctx);
+    const multCtx = this.findOwnHeaderRule(ctx, SysMLv2Parser.RULE_multiplicityBounds);
     if (!multCtx) {
       return {};
     }
@@ -123635,24 +123682,6 @@ var SymbolTable = class {
       multiplicityRange: { lower, upper }
     };
   }
-  /**
-   * Recursively search for a MultiplicityBoundsContext in the subtree.
-   */
-  findMultiplicityBounds(ctx) {
-    if (ctx.ruleIndex === SysMLv2Parser.RULE_multiplicityBounds) {
-      return ctx;
-    }
-    for (let i = 0; i < ctx.getChildCount(); i++) {
-      const child = ctx.getChild(i);
-      if (child instanceof ParserRuleContext) {
-        const result = this.findMultiplicityBounds(child);
-        if (result) {
-          return result;
-        }
-      }
-    }
-    return void 0;
-  }
   /**
    * Whether a context is a prefix metadata or definition/usage prefix rule.
    * These contain annotation identifiers (e.g. from `#product`) that should
@@ -123694,6 +123723,14 @@ var SymbolTable = class {
     if (this.isQuotedName(text)) return true;
     return /^[a-zA-Z_]/.test(text) && !this.isKeyword(text);
   }
+  /**
+   * Whether a terminal is (part of) a name: an identifier, a quoted name, or
+   * a KerML keyword such as `step` or `function` that the grammar parsed as a
+   * name (`name : IDENTIFIER | STRING | unreservedKeyword`).
+   */
+  isNameTerminal(node) {
+    return this.isIdentifierToken(node.symbol) || node.parent?.ruleIndex === SysMLv2Parser.RULE_unreservedKeyword;
+  }
   /**
    * Check if text is a SysML quoted name (single-quoted string).
    */
@@ -124063,7 +124100,7 @@ var SymbolTable = class {
       const child = ctx.getChild(i);
       if (child instanceof TerminalNode) {
         const text = child.symbol.text;
-        if (text && this.isIdentifierToken(child.symbol)) {
+        if (text && this.isNameTerminal(child)) {
           parts.push(this.unquoteName(text));
         }
       } else if (child instanceof ParserRuleContext) {
@@ -124289,6 +124326,17 @@ var DocumentManager = class {
     }
     return this.wsSymbolTable;
   }
+  /**
+   * Rebuild the symbol tables of `uris` on next use, e.g. after their projectId
+   * changed, which changes their symbol IDs (see `setFolderProjectIds`).
+   */
+  invalidateSymbols(uris) {
+    for (const uri of uris) {
+      const cached = this.cache.get(uri);
+      if (cached) cached.symbolTable = void 0;
+      this.wsBuiltVersions.delete(uri);
+    }
+  }
   /**
    * Cache semantic diagnostics for the current document version.
    */
@@ -126020,9 +126068,8 @@ var SysMLModelProvider = class {
     if (direction) {
       attributes["direction"] = direction;
     }
-    const multiplicity = this.extractMultiplicity(symbol, lines);
-    if (multiplicity) {
-      attributes["multiplicity"] = multiplicity;
+    if (symbol.multiplicity) {
+      attributes["multiplicity"] = symbol.multiplicity;
     }
     const modifier = this.extractModifier(symbol, lines);
     if (modifier) {
@@ -126640,7 +126687,7 @@ var SysMLModelProvider = class {
           name: c.name,
           kind: toMetaclassName(c.kind),
           type: c.typeNames.join(", ") || void 0,
-          multiplicity: c.multiplicity ?? this.extractMultiplicity(c, lines),
+          multiplicity: c.multiplicity,
           direction,
           visibility: c.visibility,
           isDerived: modifier?.split(", ").includes("derived") ?? false,
@@ -126764,15 +126811,6 @@ var SysMLModelProvider = class {
     if (containsWord(elementText, "out")) return "out";
     return void 0;
   }
-  /** Extract multiplicity (e.g., [4], [0..*]) from source text. */
-  extractMultiplicity(symbol, lines) {
-    const elementText = this.getElementText(symbol, lines);
-    const open = elementText.indexOf("[");
-    if (open < 0) return void 0;
-    const close = elementText.indexOf("]", open + 1);
-    if (close < 0) return void 0;
-    return elementText.substring(open + 1, close);
-  }
   /** Extract modifiers (abstract, readonly, derived, etc.) from source text. */
   extractModifier(symbol, lines) {
     const elementText = this.getElementText(symbol, lines);
@@ -128292,6 +128330,8 @@ function toSysMLSymbolKind(kind) {
     // Requirements → Object
     case "requirement def" /* RequirementDef */:
     case "requirement" /* RequirementUsage */:
+    case "concern def" /* ConcernDef */:
+    case "concern" /* ConcernUsage */:
     case "actor" /* ActorUsage */:
     case "subject" /* SubjectUsage */:
     case "stakeholder" /* StakeholderUsage */:
@@ -130685,6 +130725,10 @@ hoverProvider.setSemanticValidator(semanticValidator);
 var hasConfigurationCapability = false;
 var hasWorkspaceFolderCapability = false;
 var workspaceRoots = [];
+var workspaceFolderUris = [];
+function rootsOf(folderUris) {
+  return folderUris.map((uri) => toFsPath(uri)).filter((p) => p !== void 0);
+}
 var isWorkspaceFile = false;
 var preloadOnOpen = "workspaceOnly";
 var disabledDiagnosticCodes = /* @__PURE__ */ new Set();
@@ -130696,6 +130740,10 @@ function publishDiagnostics(uri, diagnostics) {
 }
 var skipDirs = new Set(DEFAULT_SKIP_DIRS);
 var serverReady = false;
+var resolveInitialization;
+var initialization = new Promise((resolve2) => {
+  resolveInitialization = resolve2;
+});
 var earlyOpenUris = /* @__PURE__ */ new Set();
 var workerRequestId = 0;
 var isBrowserServer = typeof __SYSML_BROWSER_SERVER__ !== "undefined" && __SYSML_BROWSER_SERVER__;
@@ -130809,7 +130857,8 @@ connection.onInitialize((params) => {
     connection.console.warn(`projectId is not a UUID: ${initOpts.projectId}; symbol IDs are unique only within this workspace`);
   }
   if (params.workspaceFolders) {
-    workspaceRoots = params.workspaceFolders.map((f) => toFsPath(f.uri)).filter((p) => p !== void 0);
+    workspaceFolderUris = params.workspaceFolders.map((f) => f.uri);
+    workspaceRoots = rootsOf(workspaceFolderUris);
   } else if (params.rootUri) {
     const root = toFsPath(params.rootUri);
     if (root) workspaceRoots = [root];
@@ -130859,7 +130908,8 @@ connection.onInitialize((params) => {
   if (hasWorkspaceFolderCapability) {
     result.capabilities.workspace = {
       workspaceFolders: {
-        supported: true
+        supported: true,
+        changeNotifications: true
       }
     };
   }
@@ -130871,8 +130921,17 @@ connection.onInitialized(async () => {
       import_node12.DidChangeConfigurationNotification.type,
       void 0
     );
+  }
+  if (hasWorkspaceFolderCapability) {
+    connection.workspace.onDidChangeWorkspaceFolders((event) => {
+      onWorkspaceFoldersChanged(event).catch((e) => connection.console.error(`Workspace folder change failed: ${e}`));
+    });
+  }
+  if (hasConfigurationCapability) {
     await pullSettings().catch(() => {
     });
+    await pullFolderProjectIds().catch(() => {
+    });
   }
   const libCount = initLibraryIndex(__dirname);
   connection.console.log(`SysML v2 Language Server initialized (${libCount} library packages indexed)`);
@@ -130888,14 +130947,13 @@ connection.onInitialized(async () => {
     );
   }
   serverReady = true;
+  resolveInitialization();
   spawnParseWorker();
   if (workspaceRoots.length > 0 && (preloadOnOpen === "always" || preloadOnOpen === "workspaceOnly" && isWorkspaceFile)) {
-    documentManager.setWorkspaceScanComplete(false);
-    scanWorkspaceFoldersAsync(workspaceRoots).then(({ fileCount, scanMs }) => {
+    scanWorkspaceFolders(workspaceRoots).then(({ fileCount, scanMs }) => {
       connection.console.log(
         `Workspace scan: pre-parsed ${fileCount} .sysml files in ${scanMs} ms`
       );
-      documentManager.setWorkspaceScanComplete(true);
       revalidateOpenDocuments();
     });
   }
@@ -130930,9 +130988,79 @@ function applySettings(config) {
   }
 }
 connection.onDidChangeConfiguration((_change) => {
-  pullSettings().then(() => revalidateOpenDocuments()).catch(() => {
+  pullSettings().then(() => pullFolderProjectIds()).then(() => revalidateOpenDocuments()).catch(() => {
+  });
+});
+function latestWins(task) {
+  let calls = 0;
+  let latest = Promise.resolve();
+  return () => {
+    const call = ++calls;
+    const isSuperseded = () => call !== calls;
+    const run = task(isSuperseded).then(() => isSuperseded() ? latest : void 0);
+    latest = run;
+    return run;
+  };
+}
+var pullFolderProjectIds = latestWins(async (isSuperseded) => {
+  if (!hasConfigurationCapability) return;
+  const folderUris = [...workspaceFolderUris];
+  const answers = folderUris.length === 0 ? [] : await connection.workspace.getConfiguration(folderUris.map((scopeUri) => ({ scopeUri, section: "sysml.project" })));
+  if (isSuperseded()) return;
+  const projectIds = folderUris.flatMap((folderUri, i) => {
+    const projectId = answers[i]?.projectId;
+    return typeof projectId === "string" ? [{ folderUri, projectId }] : [];
   });
+  const uris = documentManager.getUris();
+  const prefixBefore = new Map(uris.map((uri) => [uri, getUrlPrefix(uri)]));
+  const rejected = setFolderProjectIds(projectIds);
+  for (const entry of rejected) {
+    connection.console.warn(`projectId of ${entry.folderUri} is not a UUID: ${entry.projectId}; ignored, so its documents use the projectId of an enclosing folder, else initializationOptions.projectId, else the default prefix`);
+  }
+  documentManager.invalidateSymbols(uris.filter((uri) => getUrlPrefix(uri) !== prefixBefore.get(uri)));
+  logFolderPrefixes(new Set(projectIds.filter((p) => !rejected.includes(p)).map((p) => p.folderUri)));
 });
+var loggedFolderPrefixes = /* @__PURE__ */ new Map();
+function logFolderPrefixes(ownProjectIds) {
+  for (const folderUri of workspaceFolderUris) {
+    const prefix = getUrlPrefix(`${folderUri.endsWith("/") ? folderUri : `${folderUri}/`}_.sysml`);
+    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})`);
+  }
+  for (const folderUri of loggedFolderPrefixes.keys()) {
+    if (!workspaceFolderUris.includes(folderUri)) loggedFolderPrefixes.delete(folderUri);
+  }
+}
+async function onWorkspaceFoldersChanged(event) {
+  const initialScanPending = !serverReady;
+  const removed = new Set(event.removed.map((f) => f.uri));
+  workspaceFolderUris = [...workspaceFolderUris.filter((uri) => !removed.has(uri)), ...event.added.map((f) => f.uri)];
+  workspaceRoots = rootsOf(workspaceFolderUris);
+  dropDocumentsOutsideWorkspace(event.removed.map((f) => f.uri));
+  await pullFolderProjectIds().catch(() => {
+  });
+  if (initialScanPending) return;
+  const addedRoots = rootsOf(event.added.map((f) => f.uri).filter((uri) => workspaceFolderUris.includes(uri)));
+  if (addedRoots.length > 0 && (preloadOnOpen === "always" || preloadOnOpen === "workspaceOnly" && isWorkspaceFile)) {
+    const { fileCount, scanMs } = await scanWorkspaceFolders(addedRoots);
+    connection.console.log(`Workspace scan: pre-parsed ${fileCount} .sysml files of ${addedRoots.length} added folder(s) in ${scanMs} ms`);
+  }
+  revalidateOpenDocuments();
+}
+function dropDocumentsOutsideWorkspace(folderUris) {
+  for (const uri of documentManager.getUris()) {
+    if (openDocumentFor(uri)) continue;
+    if (folderUris.some((f) => isInFolder(uri, f)) && !isInWorkspace(uri)) {
+      documentManager.remove(uri);
+      modelProvider.removeUri(uri);
+    }
+  }
+}
+function isInWorkspace(uri) {
+  return workspaceRoots.some((root) => isInFolder(uri, (0, import_node_url2.pathToFileURL)(root).toString()));
+}
 function openDocumentFor(uri) {
   return documents.get(uri) ?? documents.all().find((d) => isSameDocumentUri(d.uri, uri));
 }
@@ -130957,6 +131085,16 @@ function parseWorkspaceFile(filePath, uri = (0, import_node_url2.pathToFileURL)(
   documentManager.parse(doc);
   return true;
 }
+var runningScans = 0;
+async function scanWorkspaceFolders(roots) {
+  runningScans++;
+  documentManager.setWorkspaceScanComplete(false);
+  try {
+    return await scanWorkspaceFoldersAsync(roots);
+  } finally {
+    if (--runningScans === 0) documentManager.setWorkspaceScanComplete(true);
+  }
+}
 async function scanWorkspaceFoldersAsync(roots) {
   const scanT0 = Date.now();
   const fileArrays = await Promise.all(roots.map((r) => findSysMLFilesAsync(r, skipDirs)));
@@ -130968,6 +131106,7 @@ async function scanWorkspaceFoldersAsync(roots) {
     const filePath = allFiles[i];
     const uri = (0, import_node_url2.pathToFileURL)(filePath).toString();
     if (openDocumentFor(uri)) continue;
+    if (!isInWorkspace(uri)) continue;
     const content = fileContents.get(filePath);
     if (content === void 0) continue;
     documentManager.parseBatch(uri, 0, content);
@@ -131180,14 +131319,16 @@ connection.onDocumentRangeFormatting(
     return formattingProvider.provideRangeFormatting(params);
   }
 );
-connection.onRequest("sysml/model", (params) => {
+connection.onRequest("sysml/model", async (params) => {
+  await initialization;
   return modelProvider.getModel(
     params.textDocument.uri,
     documentManager.getVersion(params.textDocument.uri),
     params.scope
   );
 });
-connection.onRequest("sysml/elementLookup", (params) => {
+connection.onRequest("sysml/elementLookup", async (params) => {
+  await initialization;
   return elementLookupProvider.elementLookup(params);
 });
 connection.onRequest("sysml/serverStats", () => {

package/package.json

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