@codemirror/language 6.2.0 → 6.3.0

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 6.3.0 (2022-10-24)
+
+### New features
+
+`HighlightStyle` objects now have a `specs` property holding the tag styles that were used to define them.
+
+`Language` objects now have a `name` field holding the language name.
+
+## 6.2.1 (2022-07-21)
+
+### Bug fixes
+
+Fix a bug where `bracketMatching` would incorrectly match nested brackets in syntax trees that put multiple pairs of brackets in the same parent node.
+
+Fix a bug that could cause `indentRange` to loop infinitely.
+
 ## 6.2.0 (2022-06-30)
 
 ### Bug fixes

package/dist/index.cjs

@@ -49,8 +49,13 @@ class Language {
     The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) facet
     used for this language.
     */
-    data, parser, extraExtensions = []) {
+    data, parser, extraExtensions = [], 
+    /**
+    A language name.
+    */
+    name = "") {
         this.data = data;
+        this.name = name;
         // Kludge to define EditorState.tree as a debugging helper,
         // without the EditorState package actually knowing about
         // languages and lezer trees.
@@ -138,8 +143,8 @@ A subclass of [`Language`](https://codemirror.net/6/docs/ref/#language.Language)
 parsers.
 */
 class LRLanguage extends Language {
-    constructor(data, parser) {
-        super(data, parser);
+    constructor(data, parser, name) {
+        super(data, parser, [], name);
         this.parser = parser;
     }
     /**
@@ -149,14 +154,14 @@ class LRLanguage extends Language {
         let data = defineLanguageFacet(spec.languageData);
         return new LRLanguage(data, spec.parser.configure({
             props: [languageDataProp.add(type => type.isTop ? data : undefined)]
-        }));
+        }), spec.name);
     }
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser.
+    version of its parser and optionally a new name.
     */
-    configure(options) {
-        return new LRLanguage(this.data, this.parser.configure(options));
+    configure(options, name) {
+        return new LRLanguage(this.data, this.parser.configure(options), name || this.name);
     }
     get allowsNesting() { return this.parser.hasWrappers(); }
 }
@@ -503,14 +508,14 @@ class LanguageState {
         // state updates with parse work beyond the viewport.
         let upto = this.context.treeLen == tr.startState.doc.length ? undefined
             : Math.max(tr.changes.mapPos(this.context.treeLen), newCx.viewport.to);
-        if (!newCx.work(20 /* Apply */, upto))
+        if (!newCx.work(20 /* Work.Apply */, upto))
             newCx.takeTree();
         return new LanguageState(newCx);
     }
     static init(state) {
-        let vpTo = Math.min(3000 /* InitViewport */, state.doc.length);
+        let vpTo = Math.min(3000 /* Work.InitViewport */, state.doc.length);
         let parseState = ParseContext.create(state.facet(language).parser, state, { from: 0, to: vpTo });
-        if (!parseState.work(20 /* Apply */, vpTo))
+        if (!parseState.work(20 /* Work.Apply */, vpTo))
             parseState.takeTree();
         return new LanguageState(parseState);
     }
@@ -527,14 +532,14 @@ Language.state = state.StateField.define({
     }
 });
 let requestIdle = (callback) => {
-    let timeout = setTimeout(() => callback(), 500 /* MaxPause */);
+    let timeout = setTimeout(() => callback(), 500 /* Work.MaxPause */);
     return () => clearTimeout(timeout);
 };
 if (typeof requestIdleCallback != "undefined")
     requestIdle = (callback) => {
         let idle = -1, timeout = setTimeout(() => {
-            idle = requestIdleCallback(callback, { timeout: 500 /* MaxPause */ - 100 /* MinPause */ });
-        }, 100 /* MinPause */);
+            idle = requestIdleCallback(callback, { timeout: 500 /* Work.MaxPause */ - 100 /* Work.MinPause */ });
+        }, 100 /* Work.MinPause */);
         return () => idle < 0 ? clearTimeout(timeout) : cancelIdleCallback(idle);
     };
 const isInputPending = typeof navigator != "undefined" && ((_a = navigator.scheduling) === null || _a === void 0 ? void 0 : _a.isInputPending)
@@ -557,7 +562,7 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
             this.scheduleWork();
         if (update.docChanged) {
             if (this.view.hasFocus)
-                this.chunkBudget += 50 /* ChangeBonus */;
+                this.chunkBudget += 50 /* Work.ChangeBonus */;
             this.scheduleWork();
         }
         this.checkAsyncSchedule(cx);
@@ -573,19 +578,19 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
         this.working = null;
         let now = Date.now();
         if (this.chunkEnd < now && (this.chunkEnd < 0 || this.view.hasFocus)) { // Start a new chunk
-            this.chunkEnd = now + 30000 /* ChunkTime */;
-            this.chunkBudget = 3000 /* ChunkBudget */;
+            this.chunkEnd = now + 30000 /* Work.ChunkTime */;
+            this.chunkBudget = 3000 /* Work.ChunkBudget */;
         }
         if (this.chunkBudget <= 0)
             return; // No more budget
         let { state, viewport: { to: vpTo } } = this.view, field = state.field(Language.state);
-        if (field.tree == field.context.tree && field.context.isDone(vpTo + 100000 /* MaxParseAhead */))
+        if (field.tree == field.context.tree && field.context.isDone(vpTo + 100000 /* Work.MaxParseAhead */))
             return;
-        let endTime = Date.now() + Math.min(this.chunkBudget, 100 /* Slice */, deadline && !isInputPending ? Math.max(25 /* MinSlice */, deadline.timeRemaining() - 5) : 1e9);
+        let endTime = Date.now() + Math.min(this.chunkBudget, 100 /* Work.Slice */, deadline && !isInputPending ? Math.max(25 /* Work.MinSlice */, deadline.timeRemaining() - 5) : 1e9);
         let viewportFirst = field.context.treeLen < vpTo && state.doc.length > vpTo + 1000;
         let done = field.context.work(() => {
             return isInputPending && isInputPending() || Date.now() > endTime;
-        }, vpTo + (viewportFirst ? 0 : 100000 /* MaxParseAhead */));
+        }, vpTo + (viewportFirst ? 0 : 100000 /* Work.MaxParseAhead */));
         this.chunkBudget -= Date.now() - now;
         if (done || this.chunkBudget <= 0) {
             field.context.takeTree();
@@ -623,7 +628,14 @@ current language on a state.
 */
 const language = state.Facet.define({
     combine(languages) { return languages.length ? languages[0] : null; },
-    enables: [Language.state, parseWorker]
+    enables: language => [
+        Language.state,
+        parseWorker,
+        view.EditorView.contentAttributes.compute([language], state => {
+            let lang = state.facet(language);
+            return lang && lang.name ? { "data-language": lang.name } : {};
+        })
+    ]
 });
 /**
 This class bundles a [language](https://codemirror.net/6/docs/ref/#language.Language) with an
@@ -753,8 +765,10 @@ class LanguageDescription {
 
 /**
 Facet that defines a way to provide a function that computes the
-appropriate indentation depth at the start of a given line, or
-`null` to indicate no appropriate indentation could be determined.
+appropriate indentation depth, as a column number (see
+[`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)), at the start of a given
+line, or `null` to indicate no appropriate indentation could be
+determined.
 */
 const indentService = state.Facet.define();
 /**
@@ -799,12 +813,13 @@ function indentString(state, cols) {
     return result;
 }
 /**
-Get the indentation at the given position. Will first consult any
-[indent services](https://codemirror.net/6/docs/ref/#language.indentService) that are registered,
-and if none of those return an indentation, this will check the
-syntax tree for the [indent node prop](https://codemirror.net/6/docs/ref/#language.indentNodeProp)
-and use that if found. Returns a number when an indentation could
-be determined, and null otherwise.
+Get the indentation, as a column number, at the given position.
+Will first consult any [indent services](https://codemirror.net/6/docs/ref/#language.indentService)
+that are registered, and if none of those return an indentation,
+this will check the syntax tree for the [indent node
+prop](https://codemirror.net/6/docs/ref/#language.indentNodeProp) and use that if found. Returns a
+number when an indentation could be determined, and null
+otherwise.
 */
 function getIndentation(context, pos) {
     if (context instanceof state.EditorState)
@@ -827,6 +842,7 @@ function indentRange(state, from, to) {
     let changes = [];
     for (let pos = from; pos <= to;) {
         let line = state.doc.lineAt(pos);
+        pos = line.to + 1;
         let indent = getIndentation(context, line.from);
         if (indent == null)
             continue;
@@ -838,7 +854,6 @@ function indentRange(state, from, to) {
             updated[line.from] = indent;
             changes.push({ from: line.from, to: line.from + cur.length, insert: norm });
         }
-        pos = line.to + 1;
     }
     return state.changes(changes);
 }
@@ -939,8 +954,9 @@ class IndentContext {
 /**
 A syntax tree node prop used to associate indentation strategies
 with node types. Such a strategy is a function from an indentation
-context to a column number or null, where null indicates that no
-definitive indentation can be determined.
+context to a column number (see also
+[`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)) or null, where null
+indicates that no definitive indentation can be determined.
 */
 const indentNodeProp = new common.NodeProp();
 // Compute the indentation for a given position from the syntax tree.
@@ -1531,7 +1547,12 @@ A highlight style associates CSS styles with higlighting
 [tags](https://lezer.codemirror.net/docs/ref#highlight.Tag).
 */
 class HighlightStyle {
-    constructor(spec, options) {
+    constructor(
+    /**
+    The tag styles used to create this highlight style.
+    */
+    specs, options) {
+        this.specs = specs;
         let modSpec;
         function def(spec) {
             let cls = styleMod.StyleModule.newName();
@@ -1542,7 +1563,7 @@ class HighlightStyle {
         const scopeOpt = options.scope;
         this.scope = scopeOpt instanceof Language ? (type) => type.prop(languageDataProp) == scopeOpt.data
             : scopeOpt ? (type) => type == scopeOpt : undefined;
-        this.style = highlight.tagHighlighter(spec.map(style => ({
+        this.style = highlight.tagHighlighter(specs.map(style => ({
             tag: style.tag,
             class: style.class || def(Object.assign({}, style, { tag: null }))
         })), {
@@ -1798,13 +1819,13 @@ function matchMarkedBrackets(_state, _pos, dir, token, matching, brackets) {
                     depth++;
                 }
                 else if (matchingNodes(cursor.type, -dir, brackets)) {
-                    depth--;
                     if (depth == 0)
                         return {
                             start: firstToken,
                             end: cursor.from == cursor.to ? undefined : { from: cursor.from, to: cursor.to },
                             matched: false
                         };
+                    depth--;
                 }
             }
         } while (dir < 0 ? cursor.prevSibling() : cursor.nextSibling());
@@ -2021,6 +2042,7 @@ class StringStream {
 
 function fullParser(spec) {
     return {
+        name: spec.name || "",
         token: spec.token,
         blankLine: spec.blankLine || (() => { }),
         startState: spec.startState || (() => true),
@@ -2053,7 +2075,7 @@ class StreamLanguage extends Language {
                 return new Parse(self, input, fragments, ranges);
             }
         };
-        super(data, impl, [indentService.of((cx, pos) => this.getIndent(cx, pos))]);
+        super(data, impl, [indentService.of((cx, pos) => this.getIndent(cx, pos))], parser.name);
         this.topNode = docID(data);
         self = this;
         this.streamParser = p;
@@ -2079,7 +2101,7 @@ class StreamLanguage extends Language {
             state = this.streamParser.startState(cx.unit);
             statePos = 0;
         }
-        if (pos - statePos > 10000 /* MaxIndentScanDist */)
+        if (pos - statePos > 10000 /* C.MaxIndentScanDist */)
             return null;
         while (statePos < pos) {
             let line = cx.state.doc.lineAt(statePos), end = Math.min(pos, line.to);
@@ -2158,7 +2180,7 @@ class Parse {
             this.chunks.push(tree.children[i]);
             this.chunkPos.push(tree.positions[i]);
         }
-        if (context && this.parsedPos < context.viewport.from - 100000 /* MaxDistanceBeforeViewport */) {
+        if (context && this.parsedPos < context.viewport.from - 100000 /* C.MaxDistanceBeforeViewport */) {
             this.state = this.lang.streamParser.startState(getIndentUnit(context.state));
             context.skipUntilInView(this.parsedPos, context.viewport.from);
             this.parsedPos = context.viewport.from;
@@ -2168,7 +2190,7 @@ class Parse {
     advance() {
         let context = ParseContext.get();
         let parseEnd = this.stoppedAt == null ? this.to : Math.min(this.to, this.stoppedAt);
-        let end = Math.min(parseEnd, this.chunkStart + 2048 /* ChunkSize */);
+        let end = Math.min(parseEnd, this.chunkStart + 2048 /* C.ChunkSize */);
         if (context)
             end = Math.min(end, context.viewport.to);
         while (this.parsedPos < end)
@@ -2252,7 +2274,7 @@ class Parse {
                 let token = readToken(streamParser.token, stream, this.state);
                 if (token)
                     offset = this.emitToken(this.lang.tokenTable.resolve(token), this.parsedPos + stream.start, this.parsedPos + stream.pos, 4, offset);
-                if (stream.start > 10000 /* MaxLineLength */)
+                if (stream.start > 10000 /* C.MaxLineLength */)
                     break;
             }
         }
@@ -2268,7 +2290,7 @@ class Parse {
             length: this.parsedPos - this.chunkStart,
             nodeSet,
             topID: 0,
-            maxBufferLength: 2048 /* ChunkSize */,
+            maxBufferLength: 2048 /* C.ChunkSize */,
             reused: this.chunkReused
         });
         tree = new common.Tree(tree.type, tree.children, tree.positions, tree.length, [[this.lang.stateAfter, this.lang.streamParser.copyState(this.state)]]);

package/dist/index.d.ts

@@ -48,6 +48,10 @@ declare class Language {
         [name: string]: any;
     }>;
     /**
+    A language name.
+    */
+    readonly name: string;
+    /**
     The extension value to install this as the document language.
     */
     readonly extension: Extension;
@@ -70,7 +74,11 @@ declare class Language {
     */
     data: Facet<{
         [name: string]: any;
-    }>, parser: Parser, extraExtensions?: Extension[]);
+    }>, parser: Parser, extraExtensions?: Extension[], 
+    /**
+    A language name.
+    */
+    name?: string);
     /**
     Query whether this language is active at the given position.
     */
@@ -102,6 +110,10 @@ declare class LRLanguage extends Language {
     Define a language from a parser.
     */
     static define(spec: {
+        /**
+        The [name](https://codemirror.net/6/docs/ref/#Language.name) of the language.
+        */
+        name?: string;
         /**
         The parser to use. Should already have added editor-relevant
         node props (and optionally things like dialect and top rule)
@@ -118,9 +130,9 @@ declare class LRLanguage extends Language {
     }): LRLanguage;
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser.
+    version of its parser and optionally a new name.
     */
-    configure(options: ParserConfig): LRLanguage;
+    configure(options: ParserConfig, name?: string): LRLanguage;
     get allowsNesting(): boolean;
 }
 /**
@@ -349,8 +361,10 @@ declare class LanguageDescription {
 
 /**
 Facet that defines a way to provide a function that computes the
-appropriate indentation depth at the start of a given line, or
-`null` to indicate no appropriate indentation could be determined.
+appropriate indentation depth, as a column number (see
+[`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)), at the start of a given
+line, or `null` to indicate no appropriate indentation could be
+determined.
 */
 declare const indentService: Facet<(context: IndentContext, pos: number) => number | null, readonly ((context: IndentContext, pos: number) => number | null)[]>;
 /**
@@ -374,12 +388,13 @@ tabs.
 */
 declare function indentString(state: EditorState, cols: number): string;
 /**
-Get the indentation at the given position. Will first consult any
-[indent services](https://codemirror.net/6/docs/ref/#language.indentService) that are registered,
-and if none of those return an indentation, this will check the
-syntax tree for the [indent node prop](https://codemirror.net/6/docs/ref/#language.indentNodeProp)
-and use that if found. Returns a number when an indentation could
-be determined, and null otherwise.
+Get the indentation, as a column number, at the given position.
+Will first consult any [indent services](https://codemirror.net/6/docs/ref/#language.indentService)
+that are registered, and if none of those return an indentation,
+this will check the syntax tree for the [indent node
+prop](https://codemirror.net/6/docs/ref/#language.indentNodeProp) and use that if found. Returns a
+number when an indentation could be determined, and null
+otherwise.
 */
 declare function getIndentation(context: IndentContext | EditorState, pos: number): number | null;
 /**
@@ -477,8 +492,9 @@ declare class IndentContext {
 /**
 A syntax tree node prop used to associate indentation strategies
 with node types. Such a strategy is a function from an indentation
-context to a column number or null, where null indicates that no
-definitive indentation can be determined.
+context to a column number (see also
+[`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)) or null, where null
+indicates that no definitive indentation can be determined.
 */
 declare const indentNodeProp: NodeProp<(context: TreeIndentContext) => number | null>;
 /**
@@ -732,6 +748,10 @@ A highlight style associates CSS styles with higlighting
 [tags](https://lezer.codemirror.net/docs/ref#highlight.Tag).
 */
 declare class HighlightStyle implements Highlighter {
+    /**
+    The tag styles used to create this highlight style.
+    */
+    readonly specs: readonly TagStyle[];
     /**
     A style module holding the CSS rules for this highlight style.
     When using
@@ -1013,6 +1033,10 @@ copyable) object with state, in which it can store information
 about the current context.
 */
 interface StreamParser<State> {
+    /**
+    A name for this language.
+    */
+    name?: string;
     /**
     Produce a start state for the parser.
     */

package/dist/index.js

@@ -1,6 +1,6 @@
 import { NodeProp, Tree, IterMode, TreeFragment, Parser, NodeType, NodeSet } from '@lezer/common';
 import { StateEffect, StateField, Facet, EditorState, countColumn, combineConfig, RangeSet, RangeSetBuilder, Prec } from '@codemirror/state';
-import { ViewPlugin, logException, Decoration, EditorView, WidgetType, gutter, GutterMarker } from '@codemirror/view';
+import { ViewPlugin, logException, EditorView, Decoration, WidgetType, gutter, GutterMarker } from '@codemirror/view';
 import { tags, tagHighlighter, highlightTree, styleTags } from '@lezer/highlight';
 import { StyleModule } from 'style-mod';
 
@@ -45,8 +45,13 @@ class Language {
     The [language data](https://codemirror.net/6/docs/ref/#state.EditorState.languageDataAt) facet
     used for this language.
     */
-    data, parser, extraExtensions = []) {
+    data, parser, extraExtensions = [], 
+    /**
+    A language name.
+    */
+    name = "") {
         this.data = data;
+        this.name = name;
         // Kludge to define EditorState.tree as a debugging helper,
         // without the EditorState package actually knowing about
         // languages and lezer trees.
@@ -134,8 +139,8 @@ A subclass of [`Language`](https://codemirror.net/6/docs/ref/#language.Language)
 parsers.
 */
 class LRLanguage extends Language {
-    constructor(data, parser) {
-        super(data, parser);
+    constructor(data, parser, name) {
+        super(data, parser, [], name);
         this.parser = parser;
     }
     /**
@@ -145,14 +150,14 @@ class LRLanguage extends Language {
         let data = defineLanguageFacet(spec.languageData);
         return new LRLanguage(data, spec.parser.configure({
             props: [languageDataProp.add(type => type.isTop ? data : undefined)]
-        }));
+        }), spec.name);
     }
     /**
     Create a new instance of this language with a reconfigured
-    version of its parser.
+    version of its parser and optionally a new name.
     */
-    configure(options) {
-        return new LRLanguage(this.data, this.parser.configure(options));
+    configure(options, name) {
+        return new LRLanguage(this.data, this.parser.configure(options), name || this.name);
     }
     get allowsNesting() { return this.parser.hasWrappers(); }
 }
@@ -499,14 +504,14 @@ class LanguageState {
         // state updates with parse work beyond the viewport.
         let upto = this.context.treeLen == tr.startState.doc.length ? undefined
             : Math.max(tr.changes.mapPos(this.context.treeLen), newCx.viewport.to);
-        if (!newCx.work(20 /* Apply */, upto))
+        if (!newCx.work(20 /* Work.Apply */, upto))
             newCx.takeTree();
         return new LanguageState(newCx);
     }
     static init(state) {
-        let vpTo = Math.min(3000 /* InitViewport */, state.doc.length);
+        let vpTo = Math.min(3000 /* Work.InitViewport */, state.doc.length);
         let parseState = ParseContext.create(state.facet(language).parser, state, { from: 0, to: vpTo });
-        if (!parseState.work(20 /* Apply */, vpTo))
+        if (!parseState.work(20 /* Work.Apply */, vpTo))
             parseState.takeTree();
         return new LanguageState(parseState);
     }
@@ -523,14 +528,14 @@ Language.state = /*@__PURE__*/StateField.define({
     }
 });
 let requestIdle = (callback) => {
-    let timeout = setTimeout(() => callback(), 500 /* MaxPause */);
+    let timeout = setTimeout(() => callback(), 500 /* Work.MaxPause */);
     return () => clearTimeout(timeout);
 };
 if (typeof requestIdleCallback != "undefined")
     requestIdle = (callback) => {
         let idle = -1, timeout = setTimeout(() => {
-            idle = requestIdleCallback(callback, { timeout: 500 /* MaxPause */ - 100 /* MinPause */ });
-        }, 100 /* MinPause */);
+            idle = requestIdleCallback(callback, { timeout: 500 /* Work.MaxPause */ - 100 /* Work.MinPause */ });
+        }, 100 /* Work.MinPause */);
         return () => idle < 0 ? clearTimeout(timeout) : cancelIdleCallback(idle);
     };
 const isInputPending = typeof navigator != "undefined" && ((_a = navigator.scheduling) === null || _a === void 0 ? void 0 : _a.isInputPending)
@@ -553,7 +558,7 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
             this.scheduleWork();
         if (update.docChanged) {
             if (this.view.hasFocus)
-                this.chunkBudget += 50 /* ChangeBonus */;
+                this.chunkBudget += 50 /* Work.ChangeBonus */;
             this.scheduleWork();
         }
         this.checkAsyncSchedule(cx);
@@ -569,19 +574,19 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
         this.working = null;
         let now = Date.now();
         if (this.chunkEnd < now && (this.chunkEnd < 0 || this.view.hasFocus)) { // Start a new chunk
-            this.chunkEnd = now + 30000 /* ChunkTime */;
-            this.chunkBudget = 3000 /* ChunkBudget */;
+            this.chunkEnd = now + 30000 /* Work.ChunkTime */;
+            this.chunkBudget = 3000 /* Work.ChunkBudget */;
         }
         if (this.chunkBudget <= 0)
             return; // No more budget
         let { state, viewport: { to: vpTo } } = this.view, field = state.field(Language.state);
-        if (field.tree == field.context.tree && field.context.isDone(vpTo + 100000 /* MaxParseAhead */))
+        if (field.tree == field.context.tree && field.context.isDone(vpTo + 100000 /* Work.MaxParseAhead */))
             return;
-        let endTime = Date.now() + Math.min(this.chunkBudget, 100 /* Slice */, deadline && !isInputPending ? Math.max(25 /* MinSlice */, deadline.timeRemaining() - 5) : 1e9);
+        let endTime = Date.now() + Math.min(this.chunkBudget, 100 /* Work.Slice */, deadline && !isInputPending ? Math.max(25 /* Work.MinSlice */, deadline.timeRemaining() - 5) : 1e9);
         let viewportFirst = field.context.treeLen < vpTo && state.doc.length > vpTo + 1000;
         let done = field.context.work(() => {
             return isInputPending && isInputPending() || Date.now() > endTime;
-        }, vpTo + (viewportFirst ? 0 : 100000 /* MaxParseAhead */));
+        }, vpTo + (viewportFirst ? 0 : 100000 /* Work.MaxParseAhead */));
         this.chunkBudget -= Date.now() - now;
         if (done || this.chunkBudget <= 0) {
             field.context.takeTree();
@@ -619,7 +624,14 @@ current language on a state.
 */
 const language = /*@__PURE__*/Facet.define({
     combine(languages) { return languages.length ? languages[0] : null; },
-    enables: [Language.state, parseWorker]
+    enables: language => [
+        Language.state,
+        parseWorker,
+        EditorView.contentAttributes.compute([language], state => {
+            let lang = state.facet(language);
+            return lang && lang.name ? { "data-language": lang.name } : {};
+        })
+    ]
 });
 /**
 This class bundles a [language](https://codemirror.net/6/docs/ref/#language.Language) with an
@@ -749,8 +761,10 @@ class LanguageDescription {
 
 /**
 Facet that defines a way to provide a function that computes the
-appropriate indentation depth at the start of a given line, or
-`null` to indicate no appropriate indentation could be determined.
+appropriate indentation depth, as a column number (see
+[`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)), at the start of a given
+line, or `null` to indicate no appropriate indentation could be
+determined.
 */
 const indentService = /*@__PURE__*/Facet.define();
 /**
@@ -795,12 +809,13 @@ function indentString(state, cols) {
     return result;
 }
 /**
-Get the indentation at the given position. Will first consult any
-[indent services](https://codemirror.net/6/docs/ref/#language.indentService) that are registered,
-and if none of those return an indentation, this will check the
-syntax tree for the [indent node prop](https://codemirror.net/6/docs/ref/#language.indentNodeProp)
-and use that if found. Returns a number when an indentation could
-be determined, and null otherwise.
+Get the indentation, as a column number, at the given position.
+Will first consult any [indent services](https://codemirror.net/6/docs/ref/#language.indentService)
+that are registered, and if none of those return an indentation,
+this will check the syntax tree for the [indent node
+prop](https://codemirror.net/6/docs/ref/#language.indentNodeProp) and use that if found. Returns a
+number when an indentation could be determined, and null
+otherwise.
 */
 function getIndentation(context, pos) {
     if (context instanceof EditorState)
@@ -823,6 +838,7 @@ function indentRange(state, from, to) {
     let changes = [];
     for (let pos = from; pos <= to;) {
         let line = state.doc.lineAt(pos);
+        pos = line.to + 1;
         let indent = getIndentation(context, line.from);
         if (indent == null)
             continue;
@@ -834,7 +850,6 @@ function indentRange(state, from, to) {
             updated[line.from] = indent;
             changes.push({ from: line.from, to: line.from + cur.length, insert: norm });
         }
-        pos = line.to + 1;
     }
     return state.changes(changes);
 }
@@ -935,8 +950,9 @@ class IndentContext {
 /**
 A syntax tree node prop used to associate indentation strategies
 with node types. Such a strategy is a function from an indentation
-context to a column number or null, where null indicates that no
-definitive indentation can be determined.
+context to a column number (see also
+[`indentString`](https://codemirror.net/6/docs/ref/#language.indentString)) or null, where null
+indicates that no definitive indentation can be determined.
 */
 const indentNodeProp = /*@__PURE__*/new NodeProp();
 // Compute the indentation for a given position from the syntax tree.
@@ -1527,7 +1543,12 @@ A highlight style associates CSS styles with higlighting
 [tags](https://lezer.codemirror.net/docs/ref#highlight.Tag).
 */
 class HighlightStyle {
-    constructor(spec, options) {
+    constructor(
+    /**
+    The tag styles used to create this highlight style.
+    */
+    specs, options) {
+        this.specs = specs;
         let modSpec;
         function def(spec) {
             let cls = StyleModule.newName();
@@ -1538,7 +1559,7 @@ class HighlightStyle {
         const scopeOpt = options.scope;
         this.scope = scopeOpt instanceof Language ? (type) => type.prop(languageDataProp) == scopeOpt.data
             : scopeOpt ? (type) => type == scopeOpt : undefined;
-        this.style = tagHighlighter(spec.map(style => ({
+        this.style = tagHighlighter(specs.map(style => ({
             tag: style.tag,
             class: style.class || def(Object.assign({}, style, { tag: null }))
         })), {
@@ -1794,13 +1815,13 @@ function matchMarkedBrackets(_state, _pos, dir, token, matching, brackets) {
                     depth++;
                 }
                 else if (matchingNodes(cursor.type, -dir, brackets)) {
-                    depth--;
                     if (depth == 0)
                         return {
                             start: firstToken,
                             end: cursor.from == cursor.to ? undefined : { from: cursor.from, to: cursor.to },
                             matched: false
                         };
+                    depth--;
                 }
             }
         } while (dir < 0 ? cursor.prevSibling() : cursor.nextSibling());
@@ -2017,6 +2038,7 @@ class StringStream {
 
 function fullParser(spec) {
     return {
+        name: spec.name || "",
         token: spec.token,
         blankLine: spec.blankLine || (() => { }),
         startState: spec.startState || (() => true),
@@ -2049,7 +2071,7 @@ class StreamLanguage extends Language {
                 return new Parse(self, input, fragments, ranges);
             }
         };
-        super(data, impl, [indentService.of((cx, pos) => this.getIndent(cx, pos))]);
+        super(data, impl, [indentService.of((cx, pos) => this.getIndent(cx, pos))], parser.name);
         this.topNode = docID(data);
         self = this;
         this.streamParser = p;
@@ -2075,7 +2097,7 @@ class StreamLanguage extends Language {
             state = this.streamParser.startState(cx.unit);
             statePos = 0;
         }
-        if (pos - statePos > 10000 /* MaxIndentScanDist */)
+        if (pos - statePos > 10000 /* C.MaxIndentScanDist */)
             return null;
         while (statePos < pos) {
             let line = cx.state.doc.lineAt(statePos), end = Math.min(pos, line.to);
@@ -2154,7 +2176,7 @@ class Parse {
             this.chunks.push(tree.children[i]);
             this.chunkPos.push(tree.positions[i]);
         }
-        if (context && this.parsedPos < context.viewport.from - 100000 /* MaxDistanceBeforeViewport */) {
+        if (context && this.parsedPos < context.viewport.from - 100000 /* C.MaxDistanceBeforeViewport */) {
             this.state = this.lang.streamParser.startState(getIndentUnit(context.state));
             context.skipUntilInView(this.parsedPos, context.viewport.from);
             this.parsedPos = context.viewport.from;
@@ -2164,7 +2186,7 @@ class Parse {
     advance() {
         let context = ParseContext.get();
         let parseEnd = this.stoppedAt == null ? this.to : Math.min(this.to, this.stoppedAt);
-        let end = Math.min(parseEnd, this.chunkStart + 2048 /* ChunkSize */);
+        let end = Math.min(parseEnd, this.chunkStart + 2048 /* C.ChunkSize */);
         if (context)
             end = Math.min(end, context.viewport.to);
         while (this.parsedPos < end)
@@ -2248,7 +2270,7 @@ class Parse {
                 let token = readToken(streamParser.token, stream, this.state);
                 if (token)
                     offset = this.emitToken(this.lang.tokenTable.resolve(token), this.parsedPos + stream.start, this.parsedPos + stream.pos, 4, offset);
-                if (stream.start > 10000 /* MaxLineLength */)
+                if (stream.start > 10000 /* C.MaxLineLength */)
                     break;
             }
         }
@@ -2264,7 +2286,7 @@ class Parse {
             length: this.parsedPos - this.chunkStart,
             nodeSet,
             topID: 0,
-            maxBufferLength: 2048 /* ChunkSize */,
+            maxBufferLength: 2048 /* C.ChunkSize */,
             reused: this.chunkReused
         });
         tree = new Tree(tree.type, tree.children, tree.positions, tree.length, [[this.lang.stateAfter, this.lang.streamParser.copyState(this.state)]]);

package/package.json

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