@likec4/language-server 1.32.2 → 1.34.0

package/dist/formatting/LikeC4Formatter.d.ts

@@ -52,6 +52,7 @@ export declare class LikeC4Formatter extends AbstractFormatter {
     private doExtendedFormatting;
     protected normalizeQuotes(node: AstNode): void;
     private quotesNormalizerFactory;
+    private escapeQuotesInternalQuotes;
     private getAutoQuoteStyle;
     private onConfigurationUpdate;
 }

package/dist/formatting/LikeC4Formatter.js

@@ -429,11 +429,35 @@ export class LikeC4Formatter extends AbstractFormatter {
       const quotesToInsert = quoteStyle === "single" ? "'" : '"';
       const newEdits = command.region.nodes.map((node) => ({
         range: node.range,
-        newText: node.text.replaceAll(quotesToReplace, quotesToInsert)
+        newText: quotesToInsert + this.escapeQuotesInternalQuotes(
+          node.text.slice(1, -1),
+          quotesToReplace,
+          quotesToInsert
+        ) + quotesToInsert
       }));
       edits.push(...newEdits);
     };
   }
+  escapeQuotesInternalQuotes(text, quotesToReplace, quoteToInsert) {
+    let result = "";
+    let start = 0;
+    while (start >= 0) {
+      let pos = text.indexOf(quoteToInsert, start);
+      if (pos < 0) {
+        result += text.slice(start);
+        break;
+      }
+      result += text.slice(start, pos);
+      start = pos + 1;
+      let escaped = false;
+      while (pos > 0 && text[pos - 1] == "\\") {
+        escaped = !escaped;
+        pos--;
+      }
+      result += escaped ? quoteToInsert : `\\${quoteToInsert}`;
+    }
+    return result;
+  }
   getAutoQuoteStyle(commands) {
     const nodes = commands.flatMap((x) => x.region.nodes);
     const doubleQuotesCount = nodes.filter((x) => x.text[0] == '"').length;

package/dist/generated/ast.d.ts

@@ -8,6 +8,7 @@ export declare const LikeC4Terminals: {
     LINE_COMMENT: RegExp;
     WS: RegExp;
     NL: RegExp;
+    BOOLEAN: RegExp;
     LIB_ICON: RegExp;
     URI_WITH_SCHEMA: RegExp;
     URI_RELATIVE: RegExp;
@@ -19,19 +20,18 @@ export declare const LikeC4Terminals: {
     NotEqual: RegExp;
     Eq: RegExp;
     Percent: RegExp;
+    MarkdownString: RegExp;
     String: RegExp;
     Float: RegExp;
     Number: RegExp;
-    Hex: RegExp;
     IdTerminal: RegExp;
+    Hex: RegExp;
 };
 export type LikeC4TerminalNames = keyof typeof LikeC4Terminals;
-export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "false" | "from" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "import" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "large" | "lg" | "likec4lib" | "line" | "link" | "md" | "medium" | "metadata" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "padding" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "rgb" | "rgba" | "secondary" | "shape" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "true" | "vee" | "view" | "views" | "where" | "with" | "xl" | "xlarge" | "xs" | "xsmall" | "{" | "}";
+export type LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diamond" | "dot" | "dotted" | "dynamic" | "dynamicPredicateGroup" | "element" | "element.kind" | "element.tag" | "exclude" | "extend" | "extends" | "from" | "global" | "gray" | "green" | "group" | "head" | "icon" | "icons" | "import" | "include" | "indigo" | "instance" | "instanceOf" | "is" | "kind" | "large" | "lg" | "likec4lib" | "line" | "link" | "md" | "medium" | "metadata" | "mobile" | "model" | "multiple" | "muted" | "navigateTo" | "node" | "none" | "normal" | "not" | "notation" | "notes" | "odiamond" | "odot" | "of" | "onormal" | "opacity" | "open" | "or" | "padding" | "par" | "parallel" | "person" | "predicate" | "predicateGroup" | "primary" | "queue" | "rectangle" | "red" | "relationship" | "rgb" | "rgba" | "secondary" | "shape" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "vee" | "view" | "views" | "where" | "with" | "xl" | "xlarge" | "xs" | "xsmall" | "{" | "}";
 export type LikeC4TokenNames = LikeC4TerminalNames | LikeC4KeywordNames;
 export type ArrowType = 'crow' | 'diamond' | 'dot' | 'none' | 'normal' | 'odiamond' | 'odot' | 'onormal' | 'open' | 'vee';
 export declare function isArrowType(item: unknown): item is ArrowType;
-export type Boolean = boolean;
-export declare function isBoolean(item: unknown): item is Boolean;
 export type BorderStyleValue = 'none' | LineOptions;
 export declare function isBorderStyleValue(item: unknown): item is BorderStyleValue;
 export type ColorLiteral = HexColor | RGBAColor;
@@ -415,7 +415,7 @@ export interface ElementStringProperty extends langium.AstNode {
     readonly $container: CustomElementProperties | DeployedInstanceBody | DeploymentNodeBody | ElementBody;
     readonly $type: 'ElementStringProperty';
     key: 'description' | 'technology' | 'title';
-    value: string;
+    value: MarkdownOrString;
 }
 export declare const ElementStringProperty = "ElementStringProperty";
 export declare function isElementStringProperty(item: unknown): item is ElementStringProperty;
@@ -681,11 +681,19 @@ export interface LinkProperty extends langium.AstNode {
 }
 export declare const LinkProperty = "LinkProperty";
 export declare function isLinkProperty(item: unknown): item is LinkProperty;
+export interface MarkdownOrString extends langium.AstNode {
+    readonly $container: ElementStringProperty | MetadataAttribute | NotationProperty | NotesProperty | RelationStringProperty | SpecificationRelationshipStringProperty | ViewStringProperty;
+    readonly $type: 'MarkdownOrString';
+    markdown?: string;
+    text?: string;
+}
+export declare const MarkdownOrString = "MarkdownOrString";
+export declare function isMarkdownOrString(item: unknown): item is MarkdownOrString;
 export interface MetadataAttribute extends langium.AstNode {
     readonly $container: MetadataBody;
     readonly $type: 'MetadataAttribute';
     key: string;
-    value: string;
+    value: MarkdownOrString;
 }
 export declare const MetadataAttribute = "MetadataAttribute";
 export declare function isMetadataAttribute(item: unknown): item is MetadataAttribute;
@@ -725,7 +733,7 @@ export interface MultipleProperty extends langium.AstNode {
     readonly $container: CustomElementProperties | DeploymentViewRuleStyle | ElementStyleProperty | GlobalStyle | ViewRuleStyle;
     readonly $type: 'MultipleProperty';
     key: 'multiple';
-    value: Boolean;
+    value: boolean;
 }
 export declare const MultipleProperty = "MultipleProperty";
 export declare function isMultipleProperty(item: unknown): item is MultipleProperty;
@@ -741,7 +749,7 @@ export interface NotationProperty extends langium.AstNode {
     readonly $container: CustomElementProperties | CustomRelationProperties | DeploymentViewRuleStyle | GlobalStyle | ViewRuleStyle;
     readonly $type: 'NotationProperty';
     key: 'notation';
-    value: string;
+    value: MarkdownOrString;
 }
 export declare const NotationProperty = "NotationProperty";
 export declare function isNotationProperty(item: unknown): item is NotationProperty;
@@ -749,7 +757,7 @@ export interface NotesProperty extends langium.AstNode {
     readonly $container: CustomRelationProperties;
     readonly $type: 'NotesProperty';
     key: 'notes';
-    value: string;
+    value: MarkdownOrString;
 }
 export declare const NotesProperty = "NotesProperty";
 export declare function isNotesProperty(item: unknown): item is NotesProperty;
@@ -844,7 +852,7 @@ export interface RelationStringProperty extends langium.AstNode {
     readonly $container: CustomRelationProperties | DeploymentRelationBody | RelationBody;
     readonly $type: 'RelationStringProperty';
     key: 'description' | 'technology' | 'title';
-    value: string;
+    value: MarkdownOrString;
 }
 export declare const RelationStringProperty = "RelationStringProperty";
 export declare function isRelationStringProperty(item: unknown): item is RelationStringProperty;
@@ -928,7 +936,7 @@ export interface SpecificationRelationshipStringProperty extends langium.AstNode
     readonly $container: SpecificationRelationshipKind;
     readonly $type: 'SpecificationRelationshipStringProperty';
     key: 'notation' | 'technology';
-    value: string;
+    value: MarkdownOrString;
 }
 export declare const SpecificationRelationshipStringProperty = "SpecificationRelationshipStringProperty";
 export declare function isSpecificationRelationshipStringProperty(item: unknown): item is SpecificationRelationshipStringProperty;
@@ -1057,7 +1065,7 @@ export interface ViewStringProperty extends langium.AstNode {
     readonly $container: DeploymentViewBody | DynamicViewBody | ElementViewBody;
     readonly $type: 'ViewStringProperty';
     key: 'description' | 'title';
-    value: string;
+    value: MarkdownOrString;
 }
 export declare const ViewStringProperty = "ViewStringProperty";
 export declare function isViewStringProperty(item: unknown): item is ViewStringProperty;
@@ -1224,6 +1232,7 @@ export type LikeC4AstType = {
     LikeC4View: LikeC4View;
     LineProperty: LineProperty;
     LinkProperty: LinkProperty;
+    MarkdownOrString: MarkdownOrString;
     MetadataAttribute: MetadataAttribute;
     MetadataBody: MetadataBody;
     MetadataProperty: MetadataProperty;

package/dist/generated/ast.js

@@ -4,6 +4,7 @@ export const LikeC4Terminals = {
   LINE_COMMENT: /\/\/[^\n\r]*/,
   WS: /[\t ]+/,
   NL: /[\r\n]+/,
+  BOOLEAN: /\b(true|false)\b/,
   LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/,
   URI_WITH_SCHEMA: /\w+:\/{2}\S+/,
   URI_RELATIVE: /\.{0,2}\/[^\/]\S+/,
@@ -15,18 +16,16 @@ export const LikeC4Terminals = {
   NotEqual: /\!\={1,2}/,
   Eq: /\={1,2}/,
   Percent: /\b\d+%/,
+  MarkdownString: /(('''([\s\S]*?'''))|("""([\s\S]*?""")))/,
   String: /"(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'/,
   Float: /\b\d+\.\d+\b/,
   Number: /\b\d+\b/,
-  Hex: /\b[a-fA-F0-9]{3,}\b/,
-  IdTerminal: /[_]*[a-zA-Z][-\w]*/
+  IdTerminal: /[_]*[a-zA-Z][-\w]*/,
+  Hex: /[a-fA-F0-9]{3,}(?![-_g-zG-Z])/
 };
 export function isArrowType(item) {
   return item === "none" || item === "normal" || item === "onormal" || item === "dot" || item === "odot" || item === "diamond" || item === "odiamond" || item === "crow" || item === "open" || item === "vee";
 }
-export function isBoolean(item) {
-  return typeof item === "boolean";
-}
 export function isBorderStyleValue(item) {
   return isLineOptions(item) || item === "none";
 }
@@ -35,7 +34,7 @@ export function isColorLiteral(item) {
   return reflection.isInstance(item, ColorLiteral);
 }
 export function isCustomColorId(item) {
-  return isElementShape(item) || isArrowType(item) || isLineOptions(item) || item === "element" || item === "model" || typeof item === "string" && (/\b[a-fA-F0-9]{3,}\b/.test(item) || /[_]*[a-zA-Z][-\w]*/.test(item));
+  return isElementShape(item) || isArrowType(item) || isLineOptions(item) || item === "element" || item === "model" || typeof item === "string" && /[_]*[a-zA-Z][-\w]*/.test(item);
 }
 export const DeploymentElement = "DeploymentElement";
 export function isDeploymentElement(item) {
@@ -88,7 +87,7 @@ export function isIconId(item) {
   return typeof item === "string" && /(aws|azure|gcp|tech):[-\w]*/.test(item);
 }
 export function isId(item) {
-  return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || isSizeValue(item) || item === "element" || item === "model" || item === "group" || item === "node" || item === "deployment" || item === "instance" || typeof item === "string" && (/\b[a-fA-F0-9]{3,}\b/.test(item) || /[_]*[a-zA-Z][-\w]*/.test(item));
+  return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || isSizeValue(item) || item === "element" || item === "model" || item === "group" || item === "node" || item === "deployment" || item === "instance" || typeof item === "string" && /[_]*[a-zA-Z][-\w]*/.test(item);
 }
 export const LikeC4View = "LikeC4View";
 export function isLikeC4View(item) {
@@ -448,6 +447,10 @@ export const LinkProperty = "LinkProperty";
 export function isLinkProperty(item) {
   return reflection.isInstance(item, LinkProperty);
 }
+export const MarkdownOrString = "MarkdownOrString";
+export function isMarkdownOrString(item) {
+  return reflection.isInstance(item, MarkdownOrString);
+}
 export const MetadataAttribute = "MetadataAttribute";
 export function isMetadataAttribute(item) {
   return reflection.isInstance(item, MetadataAttribute);
@@ -674,7 +677,7 @@ export function isWildcardExpression(item) {
 }
 export class LikeC4AstReflection extends langium.AbstractAstReflection {
   getAllTypes() {
-    return [ArrowProperty, BorderProperty, ColorLiteral, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRuleStyle, DirectedRelationExpr, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementKind, ElementKindExpression, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExpressionV2, Expressions, ExtendDeployment, ExtendDeploymentBody, ExtendElement, ExtendElementBody, ExtendElementProperty, FqnExpr, FqnExprOrWhere, FqnExprOrWith, FqnExprWhere, FqnExprWith, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, HexColor, IconProperty, Imported, ImportsFromPoject, InOutRelationExpr, IncomingRelationExpr, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelReferenceable, ModelViews, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, PaddingSizeProperty, RGBAColor, Referenceable, Relation, RelationBody, RelationExpr, RelationExprOrWhere, RelationExprOrWith, RelationExprWhere, RelationExprWith, RelationKindDotRef, RelationNavigateToProperty, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StrictFqnRef, StringProperty, StyleProperty, Tag, TagRef, Tags, TextSizeProperty, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
+    return [ArrowProperty, BorderProperty, ColorLiteral, ColorProperty, CustomColor, CustomElementProperties, CustomRelationProperties, DeployedInstance, DeployedInstanceBody, DeploymentElement, DeploymentNode, DeploymentNodeBody, DeploymentNodeKind, DeploymentNodeOrElementKind, DeploymentRelation, DeploymentRelationBody, DeploymentView, DeploymentViewBody, DeploymentViewRule, DeploymentViewRulePredicate, DeploymentViewRuleStyle, DirectedRelationExpr, DynamicView, DynamicViewBody, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewRef, DynamicViewRule, DynamicViewStep, Element, ElementBody, ElementKind, ElementKindExpression, ElementProperty, ElementRef, ElementStringProperty, ElementStyleProperty, ElementTagExpression, ElementView, ElementViewBody, ElementViewRef, ExpressionV2, Expressions, ExtendDeployment, ExtendDeploymentBody, ExtendElement, ExtendElementBody, ExtendElementProperty, FqnExpr, FqnExprOrWhere, FqnExprOrWith, FqnExprWhere, FqnExprWith, FqnExpressions, FqnRef, FqnRefExpr, FqnReferenceable, GlobalDynamicPredicateGroup, GlobalPredicateGroup, GlobalStyle, GlobalStyleGroup, GlobalStyleId, Globals, HexColor, IconProperty, Imported, ImportsFromPoject, InOutRelationExpr, IncomingRelationExpr, LibIcon, LikeC4Grammar, LikeC4Lib, LikeC4View, LineProperty, LinkProperty, MarkdownOrString, MetadataAttribute, MetadataBody, MetadataProperty, Model, ModelDeployments, ModelReferenceable, ModelViews, MultipleProperty, NavigateToProperty, NotationProperty, NotesProperty, OpacityProperty, OutgoingRelationExpr, PaddingSizeProperty, RGBAColor, Referenceable, Relation, RelationBody, RelationExpr, RelationExprOrWhere, RelationExprOrWith, RelationExprWhere, RelationExprWith, RelationKindDotRef, RelationNavigateToProperty, RelationProperty, RelationStringProperty, RelationStyleProperty, RelationshipKind, RelationshipStyleProperty, ShapeProperty, ShapeSizeProperty, SizeProperty, SpecificationColor, SpecificationDeploymentNodeKind, SpecificationElementKind, SpecificationElementStringProperty, SpecificationRelationshipKind, SpecificationRelationshipStringProperty, SpecificationRule, SpecificationTag, StrictFqnElementRef, StrictFqnRef, StringProperty, StyleProperty, Tag, TagRef, Tags, TextSizeProperty, ViewProperty, ViewRef, ViewRule, ViewRuleAutoLayout, ViewRuleGlobalPredicateRef, ViewRuleGlobalStyle, ViewRuleGroup, ViewRulePredicate, ViewRuleStyle, ViewRuleStyleOrGlobalRef, ViewStringProperty, WhereBinaryExpression, WhereElement, WhereElementExpression, WhereElementKind, WhereElementNegation, WhereElementTag, WhereExpression, WhereKindEqual, WhereRelation, WhereRelationExpression, WhereRelationKind, WhereRelationNegation, WhereRelationParticipantKind, WhereRelationParticipantTag, WhereRelationTag, WhereTagEqual, WildcardExpression];
   }
   computeIsSubtype(subtype, supertype) {
     switch (subtype) {
@@ -1501,6 +1504,15 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           ]
         };
       }
+      case MarkdownOrString: {
+        return {
+          name: MarkdownOrString,
+          properties: [
+            { name: "markdown" },
+            { name: "text" }
+          ]
+        };
+      }
       case MetadataAttribute: {
         return {
           name: MetadataAttribute,
@@ -1551,7 +1563,7 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           name: MultipleProperty,
           properties: [
             { name: "key" },
-            { name: "value" }
+            { name: "value", defaultValue: false }
           ]
         };
       }