@codemirror/language 6.10.1 → 6.10.3

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.10.3 (2024-09-19)
+
+### Bug fixes
+
+Fix a TypeScript error when using `HighlightStyle` with the `exactOptionalPropertyTypes` typechecking option enabled.
+
+Make `delimitedIndent` align to spaces after the opening token.
+
+## 6.10.2 (2024-06-03)
+
+### Bug fixes
+
+Fix an infinite loop that could occur when enabling `bidiIsolates` in documents with both bidirectional text and very long lines.
+
 ## 6.10.1 (2024-02-02)
 
 ### Bug fixes

package/dist/index.cjs

@@ -1121,8 +1121,12 @@ function bracketedAligned(context) {
         let next = tree.childAfter(pos);
         if (!next || next == last)
             return null;
-        if (!next.type.isSkipped)
-            return next.from < lineEnd ? openToken : null;
+        if (!next.type.isSkipped) {
+            if (next.from >= lineEnd)
+                return null;
+            let space = /^ */.exec(openLine.text.slice(openToken.to - openLine.from))[0].length;
+            return { from: openToken.from, to: openToken.to + space };
+        }
         pos = next.to;
     }
 }
@@ -2619,9 +2623,13 @@ function buildDeco(view, tree, always) {
 function clipRTLLines(ranges, doc) {
     let cur = doc.iter(), pos = 0, result = [], last = null;
     for (let { from, to } of ranges) {
-        if (from != pos) {
-            if (pos < from)
-                cur.next(from - pos);
+        if (last && last.to > from) {
+            from = last.to;
+            if (from >= to)
+                continue;
+        }
+        if (pos + cur.value.length < from) {
+            cur.next(from - (pos + cur.value.length));
             pos = from;
         }
         for (;;) {
@@ -2632,7 +2640,7 @@ function clipRTLLines(ranges, doc) {
                 else
                     result.push(last = { from: start, to: Math.min(to, end) });
             }
-            if (pos >= to)
+            if (end >= to)
                 break;
             pos = end;
             cur.next();

package/dist/index.d.cts

@@ -845,7 +845,7 @@ declare class HighlightStyle implements Highlighter {
     */
     readonly module: StyleModule | null;
     readonly style: (tags: readonly Tag[]) => string | null;
-    readonly scope: ((type: NodeType) => boolean) | undefined;
+    readonly scope?: (type: NodeType) => boolean;
     private constructor();
     /**
     Create a highlighter style that associates the given styles to

package/dist/index.d.ts

@@ -845,7 +845,7 @@ declare class HighlightStyle implements Highlighter {
     */
     readonly module: StyleModule | null;
     readonly style: (tags: readonly Tag[]) => string | null;
-    readonly scope: ((type: NodeType) => boolean) | undefined;
+    readonly scope?: (type: NodeType) => boolean;
     private constructor();
     /**
     Create a highlighter style that associates the given styles to

package/dist/index.js

@@ -1119,8 +1119,12 @@ function bracketedAligned(context) {
         let next = tree.childAfter(pos);
         if (!next || next == last)
             return null;
-        if (!next.type.isSkipped)
-            return next.from < lineEnd ? openToken : null;
+        if (!next.type.isSkipped) {
+            if (next.from >= lineEnd)
+                return null;
+            let space = /^ */.exec(openLine.text.slice(openToken.to - openLine.from))[0].length;
+            return { from: openToken.from, to: openToken.to + space };
+        }
         pos = next.to;
     }
 }
@@ -2617,9 +2621,13 @@ function buildDeco(view, tree, always) {
 function clipRTLLines(ranges, doc) {
     let cur = doc.iter(), pos = 0, result = [], last = null;
     for (let { from, to } of ranges) {
-        if (from != pos) {
-            if (pos < from)
-                cur.next(from - pos);
+        if (last && last.to > from) {
+            from = last.to;
+            if (from >= to)
+                continue;
+        }
+        if (pos + cur.value.length < from) {
+            cur.next(from - (pos + cur.value.length));
             pos = from;
         }
         for (;;) {
@@ -2630,7 +2638,7 @@ function clipRTLLines(ranges, doc) {
                 else
                     result.push(last = { from: start, to: Math.min(to, end) });
             }
-            if (pos >= to)
+            if (end >= to)
                 break;
             pos = end;
             cur.next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "6.10.1",
+  "version": "6.10.3",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",