@reqlan/language 1.8.2 → 1.9.0

package/src/reqlan-reference-search-site.ts

@@ -60,6 +60,19 @@ export function toReferenceSearchCommandArgs(
     };
 }
 
+/**
+ * Shared path for the LSP `reqlan/referenceSearchSite` handler and the
+ * extension-host fallback when the language client is not yet running.
+ */
+export function resolveReferenceSearchSiteFromDocument(
+    documentUri: string,
+    document: LangiumDocument,
+    range: Range
+): ReferenceSearchSiteRequestResult | undefined {
+    const site = findReferenceSearchSite(document, range);
+    return site ? toReferenceSearchCommandArgs(documentUri, site) : undefined;
+}
+
 /**
  * Prefer an existing [reference]/[[wikilink]] under the cursor; otherwise a
  * selection or word in idea-body prose that can be wrapped as `[name]`.

package/src/reqlan-token-builder.ts

@@ -164,7 +164,11 @@ function isStructuralOpenBraceAtDepth(text: string, offset: number, depth: numbe
     if (depth === 0 && (blockOpenerLine.test(before) || (isLineStartAt(text, offset) && before.trim().length === 0))) {
         return true;
     }
-    if (/@[A-Za-z_][\w-]*(?::)?\s*$/.test(before)) {
+    // `@name {` opens an attribute block only when `@` is the first non-whitespace
+    // on the line — same contract as the `@` token and Rust `is_attribute_opener`.
+    // Mid-line prose such as `code @plan { goal: … }` must stay a prose brace so
+    // nested `@slides` lists (tutorials.rq) do not abort the rest of the file.
+    if (/^[ \t]*@[A-Za-z_][\w-]*(?::)?\s*$/.test(before)) {
         return true;
     }
     if (depth >= 1 && isLineStartAt(text, offset)) {

package/src/reqlan-validator.ts

@@ -1,6 +1,6 @@
 import type { AstNode, ValidationAcceptor, ValidationChecks } from 'langium';
 import { AstUtils } from 'langium';
-import type { ReqlanAstType } from './generated/ast.js';
+import type { reqlanAstType } from './generated/ast.js';
 import {
     isFromImport,
     isIdea,
@@ -40,7 +40,7 @@ import {
 export function registerValidationChecks(services: ReqlanServices) {
     const registry = services.validation.ValidationRegistry;
     const validator = services.validation.ReqlanValidator;
-    const checks: ValidationChecks<ReqlanAstType> = {
+    const checks: ValidationChecks<reqlanAstType> = {
         Model: validator.checkModelDuplicates,
         AnonymousBlock: validator.checkNamelessIdeaBlock
     };

package/src/reqlan.langium

@@ -1,5 +1,11 @@
 /**
  * Implementation of the rules described in reqlan rq/language/syntax.rq.
+ * rq:["../../../reqlan rq/ontology.rq".grammar_rule]
+ * rq:["../../../reqlan rq/ontology.rq".idea]
+ * rq:["../../../reqlan rq/ontology.rq".ideaset]
+ * rq:["../../../reqlan rq/ontology.rq".keyword]
+ * rq:["../../../reqlan rq/ontology.rq".import_statement]
+ * rq:["../../../reqlan rq/ontology.rq".reference]
  *
  * Design:
  * - Imports and top-level declarations are line-oriented; import/from/as are keywords only there.