@mirror-physics/fractal-ui 0.2.0-next.55 → 0.2.0-next.57

package/dist/index.js

@@ -173,6 +173,7 @@ import { json } from "@codemirror/lang-json";
 import {
   Decoration,
   EditorView,
+  MatchDecorator,
   ViewPlugin,
   lineNumbers as lineNumberGutter
 } from "@codemirror/view";
@@ -222,10 +223,11 @@ var codeTheme = EditorView.theme({
     padding: "0",
     color: "var(--fg-tertiary)",
     lineHeight: "14px",
-    transform: "translateY(-3px)",
     transition: "color 120ms ease"
   },
+  '.cm-foldGutter .cm-gutterElement > span[title="Fold line"]': { transform: "translateY(-3px)" },
   ".cm-foldGutter .cm-gutterElement > span:hover": { color: "var(--fg-secondary)" },
+  ".fractal-code-block__escape": { color: "var(--fg-secondary)" },
   ".cm-activeLine, .cm-activeLineGutter": { backgroundColor: "var(--bg-surface-1)" },
   ".cm-selectionBackground, &.cm-focused .cm-selectionBackground, ::selection": {
     backgroundColor: "var(--accent-surface-stroke) !important"
@@ -268,9 +270,8 @@ function countVisualColumns(value) {
   return columns;
 }
 function getWrappedLineIndent(line) {
-  const propertyPrefix = line.match(JSON_PROPERTY_PREFIX)?.[1];
-  if (propertyPrefix) return Math.min(countVisualColumns(propertyPrefix), 24);
   const leadingWhitespace = line.match(/^\s*/)?.[0] ?? "";
+  if (JSON_PROPERTY_PREFIX.test(line)) return Math.min(countVisualColumns(leadingWhitespace), 24);
   return Math.min(countVisualColumns(leadingWhitespace) + 2, 12);
 }
 function buildWrappedLineIndentation(view) {
@@ -303,6 +304,20 @@ var wrappedLineIndentation = ViewPlugin.fromClass(class {
 }, {
   decorations: (plugin) => plugin.decorations
 });
+var jsonEscapeMatcher = new MatchDecorator({
+  regexp: /\\(?:["\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+  decoration: Decoration.mark({ class: "fractal-code-block__escape" })
+});
+var jsonEscapeHighlighting = ViewPlugin.fromClass(class {
+  constructor(view) {
+    this.decorations = jsonEscapeMatcher.createDeco(view);
+  }
+  update(update) {
+    this.decorations = jsonEscapeMatcher.updateDeco(update, this.decorations);
+  }
+}, {
+  decorations: (plugin) => plugin.decorations
+});
 function formatJsonLinesForDisplay(value) {
   return value.split(/\r?\n/).map((line) => {
     const firstContentIndex = line.search(/\S/);
@@ -416,6 +431,7 @@ function CodeBlock({
     codeTheme,
     syntaxHighlighting(fractalHighlightStyle),
     ...resolvedLanguage.support ? [resolvedLanguage.support] : [],
+    ...resolvedLanguage.support ? [jsonEscapeHighlighting] : [],
     ...resolvedLanguage.isJsonLines ? [jsonLinesFoldSupport] : [],
     ...lineNumbers ? [foldGutter(), lineNumberGutter()] : [],
     ...wrap ? [EditorView.lineWrapping, wrappedLineIndentation] : []