@codemirror/language 6.12.0 → 6.12.2

package/CHANGELOG.md

@@ -1,8 +1,16 @@
-## 6.12.0 (2025-12-22)
+## 6.12.2 (2026-02-25)
 
-### New features
+### Bug fixes
+
+Make sure brackets are highlighted in the initial editor state.
+
+Pause bracket matching updates during composition, to avoid disrupting Mobile Safari's fragile composition handling.
+
+## 6.12.1 (2025-12-22)
+
+### Bug fixes
 
-`LRLanguage.reconfigure` now supports changing the language data associated with the language.
+Improve finding inner language in syntax tree when the nested parse has been marked as bracketed.
 
 ## 6.11.3 (2025-08-15)
 

package/dist/index.cjs

@@ -146,7 +146,7 @@ Language.setState = state.StateEffect.define();
 function topNodeAt(state, pos, side) {
     let topLang = state.facet(language), tree = syntaxTree(state).topNode;
     if (!topLang || topLang.allowsNesting) {
-        for (let node = tree; node; node = node.enter(pos, side, common.IterMode.ExcludeBuffers))
+        for (let node = tree; node; node = node.enter(pos, side, common.IterMode.ExcludeBuffers | common.IterMode.EnterBracketed))
             if (node.type.isTop)
                 tree = node;
     }
@@ -158,41 +158,25 @@ A subclass of [`Language`](https://codemirror.net/6/docs/ref/#language.Language)
 parsers.
 */
 class LRLanguage extends Language {
-    constructor(data, parser, languageData, name) {
-        super(data, parser, languageData ? [data.of(languageData)] : [], name);
+    constructor(data, parser, name) {
+        super(data, parser, [], name);
         this.parser = parser;
-        this.languageData = languageData;
     }
     /**
     Define a language from a parser.
     */
     static define(spec) {
-        let data = defineLanguageFacet();
+        let data = defineLanguageFacet(spec.languageData);
         return new LRLanguage(data, spec.parser.configure({
             props: [languageDataProp.add(type => type.isTop ? data : undefined)]
-        }), spec.languageData || null, spec.name);
+        }), spec.name);
     }
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser, language data, and name.
-    
-    When `languageData` is given, any property set to `undefined`
-    in it will be removed from the language's
-    [data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt), any other property
-    is added.
+    version of its parser and optionally a new name.
     */
     configure(options, name) {
-        let { languageData } = this;
-        if (options.languageData) {
-            languageData = {};
-            for (let prop in options.languageData)
-                if (options.languageData[prop] !== undefined)
-                    languageData[prop] = options.languageData[prop];
-            for (let prop in this.languageData)
-                if (!(prop in options.languageData))
-                    languageData[prop] = this.languageData[prop];
-        }
-        return new LRLanguage(this.data, this.parser.configure(options), languageData, name || this.name);
+        return new LRLanguage(this.data, this.parser.configure(options), name || this.name);
     }
     get allowsNesting() { return this.parser.hasWrappers(); }
 }
@@ -1878,30 +1862,44 @@ function defaultRenderMatch(match) {
         decorations.push(mark.range(match.end.from, match.end.to));
     return decorations;
 }
-const bracketMatchingState = state.StateField.define({
-    create() { return view.Decoration.none; },
-    update(deco, tr) {
-        if (!tr.docChanged && !tr.selection)
-            return deco;
-        let decorations = [];
-        let config = tr.state.facet(bracketMatchingConfig);
-        for (let range of tr.state.selection.ranges) {
-            if (!range.empty)
-                continue;
-            let match = matchBrackets(tr.state, range.head, -1, config)
-                || (range.head > 0 && matchBrackets(tr.state, range.head - 1, 1, config))
-                || (config.afterCursor &&
-                    (matchBrackets(tr.state, range.head, 1, config) ||
-                        (range.head < tr.state.doc.length && matchBrackets(tr.state, range.head + 1, -1, config))));
-            if (match)
-                decorations = decorations.concat(config.renderMatch(match, tr.state));
+function bracketDeco(state) {
+    let decorations = [];
+    let config = state.facet(bracketMatchingConfig);
+    for (let range of state.selection.ranges) {
+        if (!range.empty)
+            continue;
+        let match = matchBrackets(state, range.head, -1, config)
+            || (range.head > 0 && matchBrackets(state, range.head - 1, 1, config))
+            || (config.afterCursor &&
+                (matchBrackets(state, range.head, 1, config) ||
+                    (range.head < state.doc.length && matchBrackets(state, range.head + 1, -1, config))));
+        if (match)
+            decorations = decorations.concat(config.renderMatch(match, state));
+    }
+    return view.Decoration.set(decorations, true);
+}
+const bracketMatcher = view.ViewPlugin.fromClass(class {
+    constructor(view) {
+        this.paused = false;
+        this.decorations = bracketDeco(view.state);
+    }
+    update(update) {
+        if (update.docChanged || update.selectionSet || this.paused) {
+            if (update.view.composing) {
+                this.decorations = this.decorations.map(update.changes);
+                this.paused = true;
+            }
+            else {
+                this.decorations = bracketDeco(update.state);
+                this.paused = false;
+            }
         }
-        return view.Decoration.set(decorations, true);
-    },
-    provide: f => view.EditorView.decorations.from(f)
+    }
+}, {
+    decorations: v => v.decorations
 });
 const bracketMatchingUnique = [
-    bracketMatchingState,
+    bracketMatcher,
     baseTheme
 ];
 /**
@@ -2225,14 +2223,14 @@ A [language](https://codemirror.net/6/docs/ref/#language.Language) class based o
 */
 class StreamLanguage extends Language {
     constructor(parser) {
-        let data = defineLanguageFacet();
+        let data = defineLanguageFacet(parser.languageData);
         let p = fullParser(parser), self;
         let impl = new class extends common.Parser {
             createParse(input, fragments, ranges) {
                 return new Parse(self, input, fragments, ranges);
             }
         };
-        super(data, impl, parser.languageData ? [data.of(parser.languageData)] : [], parser.name);
+        super(data, impl, [], parser.name);
         this.topNode = docID(data, this);
         self = this;
         this.streamParser = p;

package/dist/index.d.cts

@@ -143,7 +143,6 @@ parsers.
 */
 declare class LRLanguage extends Language {
     readonly parser: LRParser;
-    private languageData;
     private constructor();
     /**
     Define a language from a parser.
@@ -169,18 +168,9 @@ declare class LRLanguage extends Language {
     }): LRLanguage;
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser, language data, and name.
-    
-    When `languageData` is given, any property set to `undefined`
-    in it will be removed from the language's
-    [data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt), any other property
-    is added.
+    version of its parser and optionally a new name.
     */
-    configure(options: ParserConfig & {
-        languageData?: {
-            [name: string]: any;
-        };
-    }, name?: string): LRLanguage;
+    configure(options: ParserConfig, name?: string): LRLanguage;
     get allowsNesting(): boolean;
 }
 /**

package/dist/index.d.ts

@@ -143,7 +143,6 @@ parsers.
 */
 declare class LRLanguage extends Language {
     readonly parser: LRParser;
-    private languageData;
     private constructor();
     /**
     Define a language from a parser.
@@ -169,18 +168,9 @@ declare class LRLanguage extends Language {
     }): LRLanguage;
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser, language data, and name.
-    
-    When `languageData` is given, any property set to `undefined`
-    in it will be removed from the language's
-    [data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt), any other property
-    is added.
+    version of its parser and optionally a new name.
     */
-    configure(options: ParserConfig & {
-        languageData?: {
-            [name: string]: any;
-        };
-    }, name?: string): LRLanguage;
+    configure(options: ParserConfig, name?: string): LRLanguage;
     get allowsNesting(): boolean;
 }
 /**

package/dist/index.js

@@ -144,7 +144,7 @@ Language.setState = /*@__PURE__*/StateEffect.define();
 function topNodeAt(state, pos, side) {
     let topLang = state.facet(language), tree = syntaxTree(state).topNode;
     if (!topLang || topLang.allowsNesting) {
-        for (let node = tree; node; node = node.enter(pos, side, IterMode.ExcludeBuffers))
+        for (let node = tree; node; node = node.enter(pos, side, IterMode.ExcludeBuffers | IterMode.EnterBracketed))
             if (node.type.isTop)
                 tree = node;
     }
@@ -156,41 +156,25 @@ A subclass of [`Language`](https://codemirror.net/6/docs/ref/#language.Language)
 parsers.
 */
 class LRLanguage extends Language {
-    constructor(data, parser, languageData, name) {
-        super(data, parser, languageData ? [data.of(languageData)] : [], name);
+    constructor(data, parser, name) {
+        super(data, parser, [], name);
         this.parser = parser;
-        this.languageData = languageData;
     }
     /**
     Define a language from a parser.
     */
     static define(spec) {
-        let data = defineLanguageFacet();
+        let data = defineLanguageFacet(spec.languageData);
         return new LRLanguage(data, spec.parser.configure({
             props: [languageDataProp.add(type => type.isTop ? data : undefined)]
-        }), spec.languageData || null, spec.name);
+        }), spec.name);
     }
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser, language data, and name.
-    
-    When `languageData` is given, any property set to `undefined`
-    in it will be removed from the language's
-    [data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt), any other property
-    is added.
+    version of its parser and optionally a new name.
     */
     configure(options, name) {
-        let { languageData } = this;
-        if (options.languageData) {
-            languageData = {};
-            for (let prop in options.languageData)
-                if (options.languageData[prop] !== undefined)
-                    languageData[prop] = options.languageData[prop];
-            for (let prop in this.languageData)
-                if (!(prop in options.languageData))
-                    languageData[prop] = this.languageData[prop];
-        }
-        return new LRLanguage(this.data, this.parser.configure(options), languageData, name || this.name);
+        return new LRLanguage(this.data, this.parser.configure(options), name || this.name);
     }
     get allowsNesting() { return this.parser.hasWrappers(); }
 }
@@ -1876,30 +1860,44 @@ function defaultRenderMatch(match) {
         decorations.push(mark.range(match.end.from, match.end.to));
     return decorations;
 }
-const bracketMatchingState = /*@__PURE__*/StateField.define({
-    create() { return Decoration.none; },
-    update(deco, tr) {
-        if (!tr.docChanged && !tr.selection)
-            return deco;
-        let decorations = [];
-        let config = tr.state.facet(bracketMatchingConfig);
-        for (let range of tr.state.selection.ranges) {
-            if (!range.empty)
-                continue;
-            let match = matchBrackets(tr.state, range.head, -1, config)
-                || (range.head > 0 && matchBrackets(tr.state, range.head - 1, 1, config))
-                || (config.afterCursor &&
-                    (matchBrackets(tr.state, range.head, 1, config) ||
-                        (range.head < tr.state.doc.length && matchBrackets(tr.state, range.head + 1, -1, config))));
-            if (match)
-                decorations = decorations.concat(config.renderMatch(match, tr.state));
+function bracketDeco(state) {
+    let decorations = [];
+    let config = state.facet(bracketMatchingConfig);
+    for (let range of state.selection.ranges) {
+        if (!range.empty)
+            continue;
+        let match = matchBrackets(state, range.head, -1, config)
+            || (range.head > 0 && matchBrackets(state, range.head - 1, 1, config))
+            || (config.afterCursor &&
+                (matchBrackets(state, range.head, 1, config) ||
+                    (range.head < state.doc.length && matchBrackets(state, range.head + 1, -1, config))));
+        if (match)
+            decorations = decorations.concat(config.renderMatch(match, state));
+    }
+    return Decoration.set(decorations, true);
+}
+const bracketMatcher = /*@__PURE__*/ViewPlugin.fromClass(class {
+    constructor(view) {
+        this.paused = false;
+        this.decorations = bracketDeco(view.state);
+    }
+    update(update) {
+        if (update.docChanged || update.selectionSet || this.paused) {
+            if (update.view.composing) {
+                this.decorations = this.decorations.map(update.changes);
+                this.paused = true;
+            }
+            else {
+                this.decorations = bracketDeco(update.state);
+                this.paused = false;
+            }
         }
-        return Decoration.set(decorations, true);
-    },
-    provide: f => EditorView.decorations.from(f)
+    }
+}, {
+    decorations: v => v.decorations
 });
 const bracketMatchingUnique = [
-    bracketMatchingState,
+    bracketMatcher,
     baseTheme
 ];
 /**
@@ -2223,14 +2221,14 @@ A [language](https://codemirror.net/6/docs/ref/#language.Language) class based o
 */
 class StreamLanguage extends Language {
     constructor(parser) {
-        let data = defineLanguageFacet();
+        let data = defineLanguageFacet(parser.languageData);
         let p = fullParser(parser), self;
         let impl = new class extends Parser {
             createParse(input, fragments, ranges) {
                 return new Parse(self, input, fragments, ranges);
             }
         };
-        super(data, impl, parser.languageData ? [data.of(parser.languageData)] : [], parser.name);
+        super(data, impl, [], parser.name);
         this.topNode = docID(data, this);
         self = this;
         this.streamParser = p;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "6.12.0",
+  "version": "6.12.2",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",
@@ -28,7 +28,7 @@
   "dependencies": {
     "@codemirror/state": "^6.0.0",
     "@codemirror/view": "^6.23.0",
-    "@lezer/common": "^1.1.0",
+    "@lezer/common": "^1.5.0",
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.0.0",
     "style-mod": "^4.0.0"
@@ -39,6 +39,6 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/codemirror/language.git"
+    "url": "git+https://github.com/codemirror/language.git"
   }
 }