@codemirror/language 6.1.0 → 6.2.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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

package/dist/index.cjs

@@ -818,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);
+        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 });
+        }
+        pos = line.to + 1;
+    }
+    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
@@ -1799,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++;
@@ -2373,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

@@ -383,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
@@ -1072,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, foldState, 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

@@ -814,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);
+        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 });
+        }
+        pos = line.to + 1;
+    }
+    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
@@ -1795,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++;
@@ -2334,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, foldState, 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.1.0",
+  "version": "6.2.0",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",