@codemirror/language 0.19.0 → 0.19.4

package/CHANGELOG.md

@@ -1,3 +1,29 @@
+## 0.19.4 (2021-11-13)
+
+### New features
+
+`LanguageDescription.of` now takes an optional already-loaded extension.
+
+## 0.19.3 (2021-09-13)
+
+### Bug fixes
+
+Fix an issue where a parse that skipped content with `skipUntilInView` would in some cases not be restarted when the range came into view.
+
+## 0.19.2 (2021-08-11)
+
+### Bug fixes
+
+Fix a bug that caused `indentOnInput` to fire for the wrong kinds of transactions.
+
+Fix a bug that could cause `indentOnInput` to apply its changes incorrectly.
+
+## 0.19.1 (2021-08-11)
+
+### Bug fixes
+
+Fix incorrect versions for @lezer dependencies.
+
 ## 0.19.0 (2021-08-11)
 
 ### Breaking changes
@@ -10,6 +36,8 @@ CodeMirror now uses lezer 0.15, which means different package names (scoped with
 
 `LezerLanguage` was renamed to `LRLanguage` (because all languages must emit Lezer-style trees, the name was misleading).
 
+`Language.parseString` no longer exists. You can just call `.parser.parse(...)` instead.
+
 ### New features
 
 New `IndentContext.lineAt` method to access lines in a way that is aware of simulated line breaks.

package/dist/index.cjs

@@ -233,7 +233,7 @@ class ParseContext {
     The current editor viewport (or some overapproximation
     thereof). Intended to be used for opportunistically avoiding
     work (in which case
-    [`skipUntilInView`](https://codemirror.net/6/docs/ref/#language.EditorParseContext.skipUntilInView)
+    [`skipUntilInView`](https://codemirror.net/6/docs/ref/#language.ParseContext.skipUntilInView)
     should be called to make sure the parser is restarted when the
     skipped region becomes visible).
     */
@@ -271,7 +271,7 @@ class ParseContext {
     work(time, upto) {
         if (upto != null && upto >= this.state.doc.length)
             upto = undefined;
-        if (this.tree != common.Tree.empty && (upto == null ? this.treeLen == this.state.doc.length : this.treeLen >= upto)) {
+        if (this.tree != common.Tree.empty && this.isDone(upto !== null && upto !== void 0 ? upto : this.state.doc.length)) {
             this.takeTree();
             return true;
         }
@@ -357,6 +357,8 @@ class ParseContext {
     @internal
     */
     updateViewport(viewport) {
+        if (this.viewport.from == viewport.from && this.viewport.to == viewport.to)
+            return false;
         this.viewport = viewport;
         let startLen = this.skipped.length;
         for (let i = 0; i < this.skipped.length; i++) {
@@ -366,7 +368,10 @@ class ParseContext {
                 this.skipped.splice(i--, 1);
             }
         }
-        return this.skipped.length < startLen;
+        if (this.skipped.length >= startLen)
+            return false;
+        this.reset();
+        return true;
     }
     /**
     @internal
@@ -425,6 +430,13 @@ class ParseContext {
         return this.treeLen < pos && this.parse && this.parse.parsedPos >= pos;
     }
     /**
+    @internal
+    */
+    isDone(upto) {
+        let frags = this.fragments;
+        return this.treeLen >= upto && frags.length && frags[0].from == 0 && frags[0].to >= upto;
+    }
+    /**
     Get the context for the current parse, or `null` if no editor
     parse is in progress.
     */
@@ -488,12 +500,8 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
     }
     update(update) {
         let cx = this.view.state.field(Language.state).context;
-        if (update.viewportChanged) {
-            if (cx.updateViewport(update.view.viewport))
-                cx.reset();
-            if (this.view.viewport.to > cx.treeLen)
-                this.scheduleWork();
-        }
+        if (cx.updateViewport(update.view.viewport) || this.view.viewport.to > cx.treeLen)
+            this.scheduleWork();
         if (update.docChanged) {
             if (this.view.hasFocus)
                 this.chunkBudget += 50 /* ChangeBonus */;
@@ -504,11 +512,9 @@ const parseWorker = view.ViewPlugin.fromClass(class ParseWorker {
     scheduleWork() {
         if (this.working > -1)
             return;
-        let { state } = this.view, field = state.field(Language.state), frags = field.context.fragments;
-        if (field.tree == field.context.tree && field.context.treeLen >= state.doc.length &&
-            frags.length && frags[0].from == 0 && frags[0].to >= state.doc.length)
-            return;
-        this.working = requestIdle(this.work, { timeout: 500 /* Pause */ });
+        let { state } = this.view, field = state.field(Language.state);
+        if (field.tree != field.context.tree || !field.context.isDone(state.doc.length))
+            this.working = requestIdle(this.work, { timeout: 500 /* Pause */ });
     }
     work(deadline) {
         this.working = -1;
@@ -605,16 +611,17 @@ class LanguageDescription {
     Optional filename pattern that should be associated with this
     language.
     */
-    filename, loadFunc) {
+    filename, loadFunc, 
+    /**
+    If the language has been loaded, this will hold its value.
+    */
+    support = undefined) {
         this.name = name;
         this.alias = alias;
         this.extensions = extensions;
         this.filename = filename;
         this.loadFunc = loadFunc;
-        /**
-        If the language has been loaded, this will hold its value.
-        */
-        this.support = undefined;
+        this.support = support;
         this.loading = null;
     }
     /**
@@ -629,7 +636,13 @@ class LanguageDescription {
     Create a language description.
     */
     static of(spec) {
-        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, spec.load);
+        let { load, support } = spec;
+        if (!load) {
+            if (!support)
+                throw new RangeError("Must pass either 'load' or 'support' to LanguageDescription.of");
+            load = () => Promise.resolve(support);
+        }
+        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, load, support);
     }
     /**
     Look for a language in the given array of descriptions that
@@ -839,24 +852,7 @@ definitive indentation can be determined.
 const indentNodeProp = new common.NodeProp();
 // Compute the indentation for a given position from the syntax tree.
 function syntaxIndentation(cx, ast, pos) {
-    let tree = ast.resolveInner(pos);
-    // Enter previous nodes that end in empty error terms, which means
-    // they were broken off by error recovery, so that indentation
-    // works even if the constructs haven't been finished.
-    for (let scan = tree, scanPos = pos;;) {
-        let last = scan.childBefore(scanPos);
-        if (!last)
-            break;
-        if (last.type.isError && last.from == last.to) {
-            tree = scan;
-            scanPos = last.from;
-        }
-        else {
-            scan = last;
-            scanPos = scan.to + 1;
-        }
-    }
-    return indentFrom(tree, pos, cx);
+    return indentFrom(ast.resolveInner(pos).enterUnfinishedNodesBefore(pos), pos, cx);
 }
 function ignoreClosed(cx) {
     return cx.pos == cx.options.simulateBreak && cx.options.simulateDoubleBreak;
@@ -1023,7 +1019,7 @@ added at the start of a line.
 */
 function indentOnInput() {
     return state.EditorState.transactionFilter.of(tr => {
-        if (!tr.docChanged || tr.isUserEvent("input.type"))
+        if (!tr.docChanged || !tr.isUserEvent("input.type"))
             return tr;
         let rules = tr.startState.languageDataAt("indentOnInput", tr.startState.selection.main.head);
         if (!rules.length)
@@ -1048,7 +1044,7 @@ function indentOnInput() {
             if (cur != norm)
                 changes.push({ from: line.from, to: line.from + cur.length, insert: norm });
         }
-        return changes.length ? [tr, { changes }] : tr;
+        return changes.length ? [tr, { changes, sequential: true }] : tr;
     });
 }
 

package/dist/index.d.ts

@@ -156,7 +156,7 @@ declare class ParseContext {
     The current editor viewport (or some overapproximation
     thereof). Intended to be used for opportunistically avoiding
     work (in which case
-    [`skipUntilInView`](https://codemirror.net/6/docs/ref/#language.EditorParseContext.skipUntilInView)
+    [`skipUntilInView`](https://codemirror.net/6/docs/ref/#language.ParseContext.skipUntilInView)
     should be called to make sure the parser is restarted when the
     skipped region becomes visible).
     */
@@ -298,7 +298,8 @@ declare class LanguageDescription {
         */
         alias?: readonly string[];
         /**
-        An optional array of extensions associated with this language.
+        An optional array of filename extensions associated with this
+        language.
         */
         extensions?: readonly string[];
         /**
@@ -308,7 +309,12 @@ declare class LanguageDescription {
         /**
         A function that will asynchronously load the language.
         */
-        load: () => Promise<LanguageSupport>;
+        load?: () => Promise<LanguageSupport>;
+        /**
+        Alternatively to `load`, you can provide an already loaded
+        support object. Either this or `load` should be provided.
+        */
+        support?: LanguageSupport;
     }): LanguageDescription;
     /**
     Look for a language in the given array of descriptions that

package/dist/index.js

@@ -1,5 +1,5 @@
 import { NodeProp, Tree, TreeFragment, Parser, NodeType } from '@lezer/common';
-import { Facet, EditorState, StateEffect, StateField } from '@codemirror/state';
+import { StateEffect, StateField, Facet, EditorState } from '@codemirror/state';
 import { ViewPlugin } from '@codemirror/view';
 import { countColumn } from '@codemirror/text';
 
@@ -229,7 +229,7 @@ class ParseContext {
     The current editor viewport (or some overapproximation
     thereof). Intended to be used for opportunistically avoiding
     work (in which case
-    [`skipUntilInView`](https://codemirror.net/6/docs/ref/#language.EditorParseContext.skipUntilInView)
+    [`skipUntilInView`](https://codemirror.net/6/docs/ref/#language.ParseContext.skipUntilInView)
     should be called to make sure the parser is restarted when the
     skipped region becomes visible).
     */
@@ -267,7 +267,7 @@ class ParseContext {
     work(time, upto) {
         if (upto != null && upto >= this.state.doc.length)
             upto = undefined;
-        if (this.tree != Tree.empty && (upto == null ? this.treeLen == this.state.doc.length : this.treeLen >= upto)) {
+        if (this.tree != Tree.empty && this.isDone(upto !== null && upto !== void 0 ? upto : this.state.doc.length)) {
             this.takeTree();
             return true;
         }
@@ -353,6 +353,8 @@ class ParseContext {
     @internal
     */
     updateViewport(viewport) {
+        if (this.viewport.from == viewport.from && this.viewport.to == viewport.to)
+            return false;
         this.viewport = viewport;
         let startLen = this.skipped.length;
         for (let i = 0; i < this.skipped.length; i++) {
@@ -362,7 +364,10 @@ class ParseContext {
                 this.skipped.splice(i--, 1);
             }
         }
-        return this.skipped.length < startLen;
+        if (this.skipped.length >= startLen)
+            return false;
+        this.reset();
+        return true;
     }
     /**
     @internal
@@ -421,6 +426,13 @@ class ParseContext {
         return this.treeLen < pos && this.parse && this.parse.parsedPos >= pos;
     }
     /**
+    @internal
+    */
+    isDone(upto) {
+        let frags = this.fragments;
+        return this.treeLen >= upto && frags.length && frags[0].from == 0 && frags[0].to >= upto;
+    }
+    /**
     Get the context for the current parse, or `null` if no editor
     parse is in progress.
     */
@@ -484,12 +496,8 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
     }
     update(update) {
         let cx = this.view.state.field(Language.state).context;
-        if (update.viewportChanged) {
-            if (cx.updateViewport(update.view.viewport))
-                cx.reset();
-            if (this.view.viewport.to > cx.treeLen)
-                this.scheduleWork();
-        }
+        if (cx.updateViewport(update.view.viewport) || this.view.viewport.to > cx.treeLen)
+            this.scheduleWork();
         if (update.docChanged) {
             if (this.view.hasFocus)
                 this.chunkBudget += 50 /* ChangeBonus */;
@@ -500,11 +508,9 @@ const parseWorker = /*@__PURE__*/ViewPlugin.fromClass(class ParseWorker {
     scheduleWork() {
         if (this.working > -1)
             return;
-        let { state } = this.view, field = state.field(Language.state), frags = field.context.fragments;
-        if (field.tree == field.context.tree && field.context.treeLen >= state.doc.length &&
-            frags.length && frags[0].from == 0 && frags[0].to >= state.doc.length)
-            return;
-        this.working = requestIdle(this.work, { timeout: 500 /* Pause */ });
+        let { state } = this.view, field = state.field(Language.state);
+        if (field.tree != field.context.tree || !field.context.isDone(state.doc.length))
+            this.working = requestIdle(this.work, { timeout: 500 /* Pause */ });
     }
     work(deadline) {
         this.working = -1;
@@ -601,16 +607,17 @@ class LanguageDescription {
     Optional filename pattern that should be associated with this
     language.
     */
-    filename, loadFunc) {
+    filename, loadFunc, 
+    /**
+    If the language has been loaded, this will hold its value.
+    */
+    support = undefined) {
         this.name = name;
         this.alias = alias;
         this.extensions = extensions;
         this.filename = filename;
         this.loadFunc = loadFunc;
-        /**
-        If the language has been loaded, this will hold its value.
-        */
-        this.support = undefined;
+        this.support = support;
         this.loading = null;
     }
     /**
@@ -625,7 +632,13 @@ class LanguageDescription {
     Create a language description.
     */
     static of(spec) {
-        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, spec.load);
+        let { load, support } = spec;
+        if (!load) {
+            if (!support)
+                throw new RangeError("Must pass either 'load' or 'support' to LanguageDescription.of");
+            load = () => Promise.resolve(support);
+        }
+        return new LanguageDescription(spec.name, (spec.alias || []).concat(spec.name).map(s => s.toLowerCase()), spec.extensions || [], spec.filename, load, support);
     }
     /**
     Look for a language in the given array of descriptions that
@@ -835,24 +848,7 @@ definitive indentation can be determined.
 const indentNodeProp = /*@__PURE__*/new NodeProp();
 // Compute the indentation for a given position from the syntax tree.
 function syntaxIndentation(cx, ast, pos) {
-    let tree = ast.resolveInner(pos);
-    // Enter previous nodes that end in empty error terms, which means
-    // they were broken off by error recovery, so that indentation
-    // works even if the constructs haven't been finished.
-    for (let scan = tree, scanPos = pos;;) {
-        let last = scan.childBefore(scanPos);
-        if (!last)
-            break;
-        if (last.type.isError && last.from == last.to) {
-            tree = scan;
-            scanPos = last.from;
-        }
-        else {
-            scan = last;
-            scanPos = scan.to + 1;
-        }
-    }
-    return indentFrom(tree, pos, cx);
+    return indentFrom(ast.resolveInner(pos).enterUnfinishedNodesBefore(pos), pos, cx);
 }
 function ignoreClosed(cx) {
     return cx.pos == cx.options.simulateBreak && cx.options.simulateDoubleBreak;
@@ -1019,7 +1015,7 @@ added at the start of a line.
 */
 function indentOnInput() {
     return EditorState.transactionFilter.of(tr => {
-        if (!tr.docChanged || tr.isUserEvent("input.type"))
+        if (!tr.docChanged || !tr.isUserEvent("input.type"))
             return tr;
         let rules = tr.startState.languageDataAt("indentOnInput", tr.startState.selection.main.head);
         if (!rules.length)
@@ -1044,7 +1040,7 @@ function indentOnInput() {
             if (cur != norm)
                 changes.push({ from: line.from, to: line.from + cur.length, insert: norm });
         }
-        return changes.length ? [tr, { changes }] : tr;
+        return changes.length ? [tr, { changes, sequential: true }] : tr;
     });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "0.19.0",
+  "version": "0.19.4",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",
@@ -29,12 +29,12 @@
     "@codemirror/state": "^0.19.0",
     "@codemirror/text": "^0.19.0",
     "@codemirror/view": "^0.19.0",
-    "@lezer/common": "^0.14.0",
-    "@lezer/lr": "^0.14.0"
+    "@lezer/common": "^0.15.5",
+    "@lezer/lr": "^0.15.0"
   },
   "devDependencies": {
     "@codemirror/buildhelper": "^0.1.5",
-    "@lezer/javascript": "^0.14.0"
+    "@lezer/javascript": "^0.15.0"
   },
   "repository": {
     "type": "git",