@likec4/language-server 1.33.0 → 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

@@ -24,8 +24,8 @@ export declare const LikeC4Terminals: {
     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" | "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" | "{" | "}";

package/dist/generated/ast.js

@@ -4,7 +4,7 @@ export const LikeC4Terminals = {
   LINE_COMMENT: /\/\/[^\n\r]*/,
   WS: /[\t ]+/,
   NL: /[\r\n]+/,
-  BOOLEAN: /true|false/,
+  BOOLEAN: /\b(true|false)\b/,
   LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/,
   URI_WITH_SCHEMA: /\w+:\/{2}\S+/,
   URI_RELATIVE: /\.{0,2}\/[^\/]\S+/,
@@ -20,8 +20,8 @@ export const LikeC4Terminals = {
   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";
@@ -34,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) {
@@ -87,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) {