@codemirror/language 6.0.0 → 6.2.1

package/.github/workflows/dispatch.yml

@@ -11,6 +11,6 @@ jobs:
         with:
           # You should create a personal access token and store it in your repository
           token: ${{ secrets.DISPATCH_AUTH }}
-          repo: codemirror.next
+          repo: dev
           owner: codemirror
           event_type: push

package/CHANGELOG.md

@@ -1,3 +1,27 @@
+## 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
+
+Fix a bug that prevented bracket matching to recognize plain brackets inside a language parsed as an overlay.
+
+### New features
+
+The `indentRange` function provides an easy way to programatically auto-indent a range of the document.
+
+## 6.1.0 (2022-06-20)
+
+### New features
+
+The `foldState` field is now public, and can be used to serialize and deserialize the fold state.
+
 ## 6.0.0 (2022-06-08)
 
 ### New features

package/README.md

@@ -1,13 +1,13 @@
 # @codemirror/language [![NPM version](https://img.shields.io/npm/v/@codemirror/language.svg)](https://www.npmjs.org/package/@codemirror/language)
 
-[ [**WEBSITE**](https://codemirror.net/6/) | [**DOCS**](https://codemirror.net/6/docs/ref/#language) | [**ISSUES**](https://github.com/codemirror/codemirror.next/issues) | [**FORUM**](https://discuss.codemirror.net/c/next/) | [**CHANGELOG**](https://github.com/codemirror/language/blob/main/CHANGELOG.md) ]
+[ [**WEBSITE**](https://codemirror.net/) | [**DOCS**](https://codemirror.net/docs/ref/#language) | [**ISSUES**](https://github.com/codemirror/dev/issues) | [**FORUM**](https://discuss.codemirror.net/c/next/) | [**CHANGELOG**](https://github.com/codemirror/language/blob/main/CHANGELOG.md) ]
 
 This package implements the language support infrastructure for the
-[CodeMirror](https://codemirror.net/6/) code editor.
+[CodeMirror](https://codemirror.net/) code editor.
 
-The [project page](https://codemirror.net/6/) has more information, a
-number of [examples](https://codemirror.net/6/examples/) and the
-[documentation](https://codemirror.net/6/docs/).
+The [project page](https://codemirror.net/) has more information, a
+number of [examples](https://codemirror.net/examples/) and the
+[documentation](https://codemirror.net/docs/).
 
 This code is released under an
 [MIT license](https://github.com/codemirror/language/tree/main/LICENSE).

package/dist/index.cjs

@@ -616,7 +616,10 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
     eventHandlers: { focus() { this.scheduleWork(); } }
 });
 /**
-The facet used to associate a language with an editor state.
+The facet used to associate a language with an editor state. Used
+by `Language` object's `extension` property (so you don't need to
+manually wrap your languages in this). Can be used to access the
+current language on a state.
 */
 const language = state.Facet.define({
     combine(languages) { return languages.length ? languages[0] : null; },
@@ -815,6 +818,31 @@ function getIndentation(context, pos) {
     return tree ? syntaxIndentation(context, tree, pos) : null;
 }
 /**
+Create a change set that auto-indents all lines touched by the
+given document range.
+*/
+function indentRange(state, from, to) {
+    let updated = Object.create(null);
+    let context = new IndentContext(state, { overrideIndentation: start => { var _a; return (_a = updated[start]) !== null && _a !== void 0 ? _a : -1; } });
+    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;
+        if (!/\S/.test(line.text))
+            indent = 0;
+        let cur = /^\s*/.exec(line.text)[0];
+        let norm = indentString(state, indent);
+        if (cur != norm) {
+            updated[line.from] = indent;
+            changes.push({ from: line.from, to: line.from + cur.length, insert: norm });
+        }
+    }
+    return state.changes(changes);
+}
+/**
 Indentation contexts are used when calling [indentation
 services](https://codemirror.net/6/docs/ref/#language.indentService). They provide helper utilities
 useful in indentation logic, and can selectively override the
@@ -1204,6 +1232,13 @@ function selectedLines(view) {
     }
     return lines;
 }
+/**
+The state field that stores the folded ranges (as a [decoration
+set](https://codemirror.net/6/docs/ref/#view.DecorationSet)). Can be passed to
+[`EditorState.toJSON`](https://codemirror.net/6/docs/ref/#state.EditorState.toJSON) and
+[`fromJSON`](https://codemirror.net/6/docs/ref/#state.EditorState^fromJSON) to serialize the fold
+state.
+*/
 const foldState = state.StateField.define({
     create() {
         return view.Decoration.none;
@@ -1231,7 +1266,24 @@ const foldState = state.StateField.define({
         }
         return folded;
     },
-    provide: f => view.EditorView.decorations.from(f)
+    provide: f => view.EditorView.decorations.from(f),
+    toJSON(folded, state) {
+        let ranges = [];
+        folded.between(0, state.doc.length, (from, to) => { ranges.push(from, to); });
+        return ranges;
+    },
+    fromJSON(value) {
+        if (!Array.isArray(value) || value.length % 2)
+            throw new RangeError("Invalid JSON for fold state");
+        let ranges = [];
+        for (let i = 0; i < value.length;) {
+            let from = value[i++], to = value[i++];
+            if (typeof from != "number" || typeof to != "number")
+                throw new RangeError("Invalid JSON for fold state");
+            ranges.push(foldWidget.range(from, to));
+        }
+        return view.Decoration.set(ranges, true);
+    }
 });
 /**
 Get a [range set](https://codemirror.net/6/docs/ref/#state.RangeSet) containing the folded ranges
@@ -1746,13 +1798,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());
@@ -1772,7 +1824,7 @@ function matchPlainBrackets(state, pos, dir, tree, tokenType, maxScanDistance, b
         let basePos = pos + distance * dir;
         for (let pos = dir > 0 ? 0 : text.length - 1, end = dir > 0 ? text.length : -1; pos != end; pos += dir) {
             let found = brackets.indexOf(text[pos]);
-            if (found < 0 || tree.resolve(basePos + pos, 1).type != tokenType)
+            if (found < 0 || tree.resolveInner(basePos + pos, 1).type != tokenType)
                 continue;
             if ((found % 2 == 0) == (dir > 0)) {
                 depth++;
@@ -2249,8 +2301,8 @@ for (let [legacyName, name] of [
     ["variable-2", "variableName.special"],
     ["string-2", "string.special"],
     ["def", "variableName.definition"],
-    ["tag", "typeName"],
-    ["attribute", "propertyName"],
+    ["tag", "tagName"],
+    ["attribute", "attributeName"],
     ["type", "typeName"],
     ["builtin", "variableName.standard"],
     ["qualifier", "modifier"],
@@ -2337,6 +2389,7 @@ exports.foldInside = foldInside;
 exports.foldKeymap = foldKeymap;
 exports.foldNodeProp = foldNodeProp;
 exports.foldService = foldService;
+exports.foldState = foldState;
 exports.foldable = foldable;
 exports.foldedRanges = foldedRanges;
 exports.forceParsing = forceParsing;
@@ -2345,6 +2398,7 @@ exports.getIndentation = getIndentation;
 exports.highlightingFor = highlightingFor;
 exports.indentNodeProp = indentNodeProp;
 exports.indentOnInput = indentOnInput;
+exports.indentRange = indentRange;
 exports.indentService = indentService;
 exports.indentString = indentString;
 exports.indentUnit = indentUnit;

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { NodeProp, Parser, Tree, TreeFragment, SyntaxNode, NodeType } from '@lezer/common';
 import { LRParser, ParserConfig } from '@lezer/lr';
 import * as _codemirror_state from '@codemirror/state';
-import { Facet, Extension, EditorState, Range } from '@codemirror/state';
+import { Facet, Extension, EditorState, StateField, Range } from '@codemirror/state';
 import { EditorView, DecorationSet, Command, KeyBinding, ViewUpdate, BlockInfo, Decoration } from '@codemirror/view';
 import { Highlighter, Tag } from '@lezer/highlight';
 import { StyleModule, StyleSpec } from 'style-mod';
@@ -214,7 +214,10 @@ declare class ParseContext {
     static get(): ParseContext | null;
 }
 /**
-The facet used to associate a language with an editor state.
+The facet used to associate a language with an editor state. Used
+by `Language` object's `extension` property (so you don't need to
+manually wrap your languages in this). Can be used to access the
+current language on a state.
 */
 declare const language: Facet<Language, Language | null>;
 /**
@@ -380,6 +383,11 @@ be determined, and null otherwise.
 */
 declare function getIndentation(context: IndentContext | EditorState, pos: number): number | null;
 /**
+Create a change set that auto-indents all lines touched by the
+given document range.
+*/
+declare function indentRange(state: EditorState, from: number, to: number): _codemirror_state.ChangeSet;
+/**
 Indentation contexts are used when calling [indentation
 services](https://codemirror.net/6/docs/ref/#language.indentService). They provide helper utilities
 useful in indentation logic, and can selectively override the
@@ -617,6 +625,14 @@ State effect that unfolds the given range (if it was folded).
 */
 declare const unfoldEffect: _codemirror_state.StateEffectType<DocRange>;
 /**
+The state field that stores the folded ranges (as a [decoration
+set](https://codemirror.net/6/docs/ref/#view.DecorationSet)). Can be passed to
+[`EditorState.toJSON`](https://codemirror.net/6/docs/ref/#state.EditorState.toJSON) and
+[`fromJSON`](https://codemirror.net/6/docs/ref/#state.EditorState^fromJSON) to serialize the fold
+state.
+*/
+declare const foldState: StateField<DecorationSet>;
+/**
 Get a [range set](https://codemirror.net/6/docs/ref/#state.RangeSet) containing the folded ranges
 in the given state.
 */
@@ -1061,4 +1077,4 @@ declare class StreamLanguage<State> extends Language {
     get allowsNesting(): boolean;
 }
 
-export { Config, HighlightStyle, IndentContext, LRLanguage, Language, LanguageDescription, LanguageSupport, MatchResult, ParseContext, StreamLanguage, StreamParser, StringStream, TagStyle, TreeIndentContext, bracketMatching, codeFolding, continuedIndent, defaultHighlightStyle, defineLanguageFacet, delimitedIndent, ensureSyntaxTree, flatIndent, foldAll, foldCode, foldEffect, foldGutter, foldInside, foldKeymap, foldNodeProp, foldService, foldable, foldedRanges, forceParsing, getIndentUnit, getIndentation, highlightingFor, indentNodeProp, indentOnInput, indentService, indentString, indentUnit, language, languageDataProp, matchBrackets, syntaxHighlighting, syntaxParserRunning, syntaxTree, syntaxTreeAvailable, unfoldAll, unfoldCode, unfoldEffect };
+export { Config, HighlightStyle, IndentContext, LRLanguage, Language, LanguageDescription, LanguageSupport, MatchResult, ParseContext, StreamLanguage, StreamParser, StringStream, TagStyle, TreeIndentContext, bracketMatching, codeFolding, continuedIndent, defaultHighlightStyle, defineLanguageFacet, delimitedIndent, ensureSyntaxTree, flatIndent, foldAll, foldCode, foldEffect, foldGutter, foldInside, foldKeymap, foldNodeProp, foldService, foldState, foldable, foldedRanges, forceParsing, getIndentUnit, getIndentation, highlightingFor, indentNodeProp, indentOnInput, indentRange, indentService, indentString, indentUnit, language, languageDataProp, matchBrackets, syntaxHighlighting, syntaxParserRunning, syntaxTree, syntaxTreeAvailable, unfoldAll, unfoldCode, unfoldEffect };

package/dist/index.js

@@ -612,7 +612,10 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
     eventHandlers: { focus() { this.scheduleWork(); } }
 });
 /**
-The facet used to associate a language with an editor state.
+The facet used to associate a language with an editor state. Used
+by `Language` object's `extension` property (so you don't need to
+manually wrap your languages in this). Can be used to access the
+current language on a state.
 */
 const language = /*@__PURE__*/Facet.define({
     combine(languages) { return languages.length ? languages[0] : null; },
@@ -811,6 +814,31 @@ function getIndentation(context, pos) {
     return tree ? syntaxIndentation(context, tree, pos) : null;
 }
 /**
+Create a change set that auto-indents all lines touched by the
+given document range.
+*/
+function indentRange(state, from, to) {
+    let updated = Object.create(null);
+    let context = new IndentContext(state, { overrideIndentation: start => { var _a; return (_a = updated[start]) !== null && _a !== void 0 ? _a : -1; } });
+    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;
+        if (!/\S/.test(line.text))
+            indent = 0;
+        let cur = /^\s*/.exec(line.text)[0];
+        let norm = indentString(state, indent);
+        if (cur != norm) {
+            updated[line.from] = indent;
+            changes.push({ from: line.from, to: line.from + cur.length, insert: norm });
+        }
+    }
+    return state.changes(changes);
+}
+/**
 Indentation contexts are used when calling [indentation
 services](https://codemirror.net/6/docs/ref/#language.indentService). They provide helper utilities
 useful in indentation logic, and can selectively override the
@@ -1200,6 +1228,13 @@ function selectedLines(view) {
     }
     return lines;
 }
+/**
+The state field that stores the folded ranges (as a [decoration
+set](https://codemirror.net/6/docs/ref/#view.DecorationSet)). Can be passed to
+[`EditorState.toJSON`](https://codemirror.net/6/docs/ref/#state.EditorState.toJSON) and
+[`fromJSON`](https://codemirror.net/6/docs/ref/#state.EditorState^fromJSON) to serialize the fold
+state.
+*/
 const foldState = /*@__PURE__*/StateField.define({
     create() {
         return Decoration.none;
@@ -1227,7 +1262,24 @@ const foldState = /*@__PURE__*/StateField.define({
         }
         return folded;
     },
-    provide: f => EditorView.decorations.from(f)
+    provide: f => EditorView.decorations.from(f),
+    toJSON(folded, state) {
+        let ranges = [];
+        folded.between(0, state.doc.length, (from, to) => { ranges.push(from, to); });
+        return ranges;
+    },
+    fromJSON(value) {
+        if (!Array.isArray(value) || value.length % 2)
+            throw new RangeError("Invalid JSON for fold state");
+        let ranges = [];
+        for (let i = 0; i < value.length;) {
+            let from = value[i++], to = value[i++];
+            if (typeof from != "number" || typeof to != "number")
+                throw new RangeError("Invalid JSON for fold state");
+            ranges.push(foldWidget.range(from, to));
+        }
+        return Decoration.set(ranges, true);
+    }
 });
 /**
 Get a [range set](https://codemirror.net/6/docs/ref/#state.RangeSet) containing the folded ranges
@@ -1742,13 +1794,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());
@@ -1768,7 +1820,7 @@ function matchPlainBrackets(state, pos, dir, tree, tokenType, maxScanDistance, b
         let basePos = pos + distance * dir;
         for (let pos = dir > 0 ? 0 : text.length - 1, end = dir > 0 ? text.length : -1; pos != end; pos += dir) {
             let found = brackets.indexOf(text[pos]);
-            if (found < 0 || tree.resolve(basePos + pos, 1).type != tokenType)
+            if (found < 0 || tree.resolveInner(basePos + pos, 1).type != tokenType)
                 continue;
             if ((found % 2 == 0) == (dir > 0)) {
                 depth++;
@@ -2245,8 +2297,8 @@ for (let [legacyName, name] of [
     ["variable-2", "variableName.special"],
     ["string-2", "string.special"],
     ["def", "variableName.definition"],
-    ["tag", "typeName"],
-    ["attribute", "propertyName"],
+    ["tag", "tagName"],
+    ["attribute", "attributeName"],
     ["type", "typeName"],
     ["builtin", "variableName.standard"],
     ["qualifier", "modifier"],
@@ -2307,4 +2359,4 @@ function docID(data) {
     return type;
 }
 
-export { HighlightStyle, IndentContext, LRLanguage, Language, LanguageDescription, LanguageSupport, ParseContext, StreamLanguage, StringStream, TreeIndentContext, bracketMatching, codeFolding, continuedIndent, defaultHighlightStyle, defineLanguageFacet, delimitedIndent, ensureSyntaxTree, flatIndent, foldAll, foldCode, foldEffect, foldGutter, foldInside, foldKeymap, foldNodeProp, foldService, foldable, foldedRanges, forceParsing, getIndentUnit, getIndentation, highlightingFor, indentNodeProp, indentOnInput, indentService, indentString, indentUnit, language, languageDataProp, matchBrackets, syntaxHighlighting, syntaxParserRunning, syntaxTree, syntaxTreeAvailable, unfoldAll, unfoldCode, unfoldEffect };
+export { HighlightStyle, IndentContext, LRLanguage, Language, LanguageDescription, LanguageSupport, ParseContext, StreamLanguage, StringStream, TreeIndentContext, bracketMatching, codeFolding, continuedIndent, defaultHighlightStyle, defineLanguageFacet, delimitedIndent, ensureSyntaxTree, flatIndent, foldAll, foldCode, foldEffect, foldGutter, foldInside, foldKeymap, foldNodeProp, foldService, foldState, foldable, foldedRanges, forceParsing, getIndentUnit, getIndentation, highlightingFor, indentNodeProp, indentOnInput, indentRange, indentService, indentString, indentUnit, language, languageDataProp, matchBrackets, syntaxHighlighting, syntaxParserRunning, syntaxTree, syntaxTreeAvailable, unfoldAll, unfoldCode, unfoldEffect };

package/package.json

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