@likec4/language-server 1.39.4 → 1.40.0

package/dist/formatting/LikeC4Formatter.mjs

@@ -427,14 +427,19 @@ export class LikeC4Formatter extends AbstractFormatter {
     return (command, edits) => {
       const quotesToReplace = quoteStyle === "single" ? '"' : "'";
       const quotesToInsert = quoteStyle === "single" ? "'" : '"';
-      const newEdits = command.region.nodes.map((node) => ({
-        range: node.range,
-        newText: quotesToInsert + this.escapeQuotesInternalQuotes(
-          node.text.slice(1, -1),
-          quotesToReplace,
-          quotesToInsert
-        ) + quotesToInsert
-      }));
+      const markdownFence = quotesToInsert.repeat(3);
+      const plainFence = quotesToInsert;
+      const newEdits = command.region.nodes.map((node) => {
+        const fence = node.text.startsWith(`"""`) || node.text.startsWith(`'''`) ? markdownFence : plainFence;
+        return {
+          range: node.range,
+          newText: fence + this.escapeQuotesInternalQuotes(
+            node.text.slice(fence.length, -fence.length),
+            quotesToReplace,
+            quotesToInsert
+          ) + fence
+        };
+      });
       edits.push(...newEdits);
     };
   }

package/dist/generated/ast.d.ts

@@ -29,7 +29,7 @@ export declare const LikeC4Terminals: {
     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" | "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 LikeC4KeywordNames = "(" | ")" | "*" | "," | "->" | "-[" | ":" | ";" | "<-" | "<->" | "BottomTop" | "LeftRight" | "RightLeft" | "TopBottom" | "]->" | "amber" | "and" | "autoLayout" | "blue" | "border" | "browser" | "color" | "crow" | "cylinder" | "dashed" | "deployment" | "deploymentNode" | "description" | "diagram" | "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" | "sequence" | "shape" | "size" | "sky" | "slate" | "sm" | "small" | "solid" | "source" | "specification" | "storage" | "style" | "styleGroup" | "tag" | "tail" | "target" | "technology" | "textSize" | "title" | "variant" | "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;
@@ -49,6 +49,11 @@ export declare function isDeploymentNodeOrElementKind(item: unknown): item is De
 export type DeploymentViewRule = DeploymentViewRulePredicate | DeploymentViewRuleStyle | ViewRuleAutoLayout;
 export declare const DeploymentViewRule = "DeploymentViewRule";
 export declare function isDeploymentViewRule(item: unknown): item is DeploymentViewRule;
+export type DynamicViewDisplayVariantValue = 'diagram' | 'sequence';
+export declare function isDynamicViewDisplayVariantValue(item: unknown): item is DynamicViewDisplayVariantValue;
+export type DynamicViewProperty = DynamicViewDisplayVariantProperty | ViewProperty;
+export declare const DynamicViewProperty = "DynamicViewProperty";
+export declare function isDynamicViewProperty(item: unknown): item is DynamicViewProperty;
 export type DynamicViewRule = DynamicViewGlobalPredicateRef | DynamicViewIncludePredicate | ViewRuleAutoLayout | ViewRuleStyleOrGlobalRef;
 export declare const DynamicViewRule = "DynamicViewRule";
 export declare function isDynamicViewRule(item: unknown): item is DynamicViewRule;
@@ -77,7 +82,7 @@ export declare const FqnReferenceable = "FqnReferenceable";
 export declare function isFqnReferenceable(item: unknown): item is FqnReferenceable;
 export type IconId = string;
 export declare function isIconId(item: unknown): item is IconId;
-export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | ElementShape | LineOptions | Participant | SizeValue | ThemeColor | string;
+export type Id = 'deployment' | 'element' | 'group' | 'instance' | 'model' | 'node' | ArrowType | DynamicViewDisplayVariantValue | ElementShape | LineOptions | Participant | SizeValue | ThemeColor | string;
 export declare function isId(item: unknown): item is Id;
 export type LikeC4View = DeploymentView | DynamicView | ElementView;
 export declare const LikeC4View = "LikeC4View";
@@ -323,13 +328,21 @@ export declare function isDynamicView(item: unknown): item is DynamicView;
 export interface DynamicViewBody extends langium.AstNode {
     readonly $container: DynamicView;
     readonly $type: 'DynamicViewBody';
-    props: Array<ViewProperty>;
+    props: Array<DynamicViewProperty>;
     rules: Array<DynamicViewRule>;
     steps: Array<DynamicViewParallelSteps | DynamicViewStep>;
     tags?: Tags;
 }
 export declare const DynamicViewBody = "DynamicViewBody";
 export declare function isDynamicViewBody(item: unknown): item is DynamicViewBody;
+export interface DynamicViewDisplayVariantProperty extends langium.AstNode {
+    readonly $container: DynamicViewBody;
+    readonly $type: 'DynamicViewDisplayVariantProperty';
+    key: 'variant';
+    value: DynamicViewDisplayVariantValue;
+}
+export declare const DynamicViewDisplayVariantProperty = "DynamicViewDisplayVariantProperty";
+export declare function isDynamicViewDisplayVariantProperty(item: unknown): item is DynamicViewDisplayVariantProperty;
 export interface DynamicViewGlobalPredicateRef extends langium.AstNode {
     readonly $container: DynamicViewBody;
     readonly $type: 'DynamicViewGlobalPredicateRef';
@@ -1182,9 +1195,11 @@ export type LikeC4AstType = {
     DirectedRelationExpr: DirectedRelationExpr;
     DynamicView: DynamicView;
     DynamicViewBody: DynamicViewBody;
+    DynamicViewDisplayVariantProperty: DynamicViewDisplayVariantProperty;
     DynamicViewGlobalPredicateRef: DynamicViewGlobalPredicateRef;
     DynamicViewIncludePredicate: DynamicViewIncludePredicate;
     DynamicViewParallelSteps: DynamicViewParallelSteps;
+    DynamicViewProperty: DynamicViewProperty;
     DynamicViewRef: DynamicViewRef;
     DynamicViewRule: DynamicViewRule;
     DynamicViewStep: DynamicViewStep;

package/dist/generated/ast.mjs

@@ -49,6 +49,13 @@ export const DeploymentViewRule = "DeploymentViewRule";
 export function isDeploymentViewRule(item) {
   return reflection.isInstance(item, DeploymentViewRule);
 }
+export function isDynamicViewDisplayVariantValue(item) {
+  return item === "diagram" || item === "sequence";
+}
+export const DynamicViewProperty = "DynamicViewProperty";
+export function isDynamicViewProperty(item) {
+  return reflection.isInstance(item, DynamicViewProperty);
+}
 export const DynamicViewRule = "DynamicViewRule";
 export function isDynamicViewRule(item) {
   return reflection.isInstance(item, DynamicViewRule);
@@ -88,7 +95,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" && /[_]*[a-zA-Z][-\w]*/.test(item);
+  return isElementShape(item) || isThemeColor(item) || isArrowType(item) || isLineOptions(item) || isParticipant(item) || isSizeValue(item) || isDynamicViewDisplayVariantValue(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) {
@@ -276,6 +283,10 @@ export const DynamicViewBody = "DynamicViewBody";
 export function isDynamicViewBody(item) {
   return reflection.isInstance(item, DynamicViewBody);
 }
+export const DynamicViewDisplayVariantProperty = "DynamicViewDisplayVariantProperty";
+export function isDynamicViewDisplayVariantProperty(item) {
+  return reflection.isInstance(item, DynamicViewDisplayVariantProperty);
+}
 export const DynamicViewGlobalPredicateRef = "DynamicViewGlobalPredicateRef";
 export function isDynamicViewGlobalPredicateRef(item) {
   return reflection.isInstance(item, DynamicViewGlobalPredicateRef);
@@ -678,7 +689,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, 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];
+    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, DynamicViewDisplayVariantProperty, DynamicViewGlobalPredicateRef, DynamicViewIncludePredicate, DynamicViewParallelSteps, DynamicViewProperty, 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) {
@@ -718,6 +729,10 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
       case OutgoingRelationExpr: {
         return this.isSubtype(RelationExpr, supertype);
       }
+      case DynamicViewDisplayVariantProperty:
+      case ViewProperty: {
+        return this.isSubtype(DynamicViewProperty, supertype);
+      }
       case DynamicViewGlobalPredicateRef:
       case DynamicViewIncludePredicate: {
         return this.isSubtype(DynamicViewRule, supertype);
@@ -1109,6 +1124,15 @@ export class LikeC4AstReflection extends langium.AbstractAstReflection {
           ]
         };
       }
+      case DynamicViewDisplayVariantProperty: {
+        return {
+          name: DynamicViewDisplayVariantProperty,
+          properties: [
+            { name: "key" },
+            { name: "value" }
+          ]
+        };
+      }
       case DynamicViewGlobalPredicateRef: {
         return {
           name: DynamicViewGlobalPredicateRef,