@codemirror/language 0.20.0 → 6.0.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.0.0 (2022-06-08)
+
+### New features
+
+The `foldingChanged` option to `foldGutter` can now be used to trigger a recomputation of the fold markers.
+
+## 0.20.2 (2022-05-20)
+
+### Bug fixes
+
+List style-mod as a dependency.
+
+## 0.20.1 (2022-05-18)
+
+### Bug fixes
+
+Make sure `all` styles in the CSS generated for a `HighlightStyle` have a lower precedence than the other rules defined for the style. Use a shorthand property
+
 ## 0.20.0 (2022-04-20)
 
 ### Breaking changes

package/dist/index.cjs

@@ -248,9 +248,6 @@ let currentContext = null;
 A parse context provided to parsers working on the editor content.
 */
 class ParseContext {
-    /**
-    @internal
-    */
     constructor(parser, 
     /**
     The current editor state.
@@ -301,6 +298,12 @@ class ParseContext {
         */
         this.tempSkipped = [];
     }
+    /**
+    @internal
+    */
+    static create(parser, state, viewport) {
+        return new ParseContext(parser, state, [], common.Tree.empty, 0, viewport, [], null);
+    }
     startParse() {
         return this.parser.startParse(new DocInput(this.state.doc), this.fragments);
     }
@@ -506,7 +509,7 @@ class LanguageState {
     }
     static init(state) {
         let vpTo = Math.min(3000 /* InitViewport */, state.doc.length);
-        let parseState = new ParseContext(state.facet(language).parser, state, [], common.Tree.empty, 0, { from: 0, to: vpTo }, [], null);
+        let parseState = ParseContext.create(state.facet(language).parser, state, { from: 0, to: vpTo });
         if (!parseState.work(20 /* Apply */, vpTo))
             parseState.takeTree();
         return new LanguageState(parseState);
@@ -934,7 +937,7 @@ function indentFrom(node, pos, base) {
     for (; node; node = node.parent) {
         let strategy = indentStrategy(node);
         if (strategy)
-            return strategy(new TreeIndentContext(base, pos, node));
+            return strategy(TreeIndentContext.create(base, pos, node));
     }
     return null;
 }
@@ -944,9 +947,6 @@ Objects of this type provide context information and helper
 methods to indentation functions registered on syntax nodes.
 */
 class TreeIndentContext extends IndentContext {
-    /**
-    @internal
-    */
     constructor(base, 
     /**
     The position at which indentation is being computed.
@@ -963,6 +963,12 @@ class TreeIndentContext extends IndentContext {
         this.node = node;
     }
     /**
+    @internal
+    */
+    static create(base, pos, node) {
+        return new TreeIndentContext(base, pos, node);
+    }
+    /**
     Get the text directly after `this.pos`, either the entire line
     or the next 100 characters, whichever is shorter.
     */
@@ -1374,6 +1380,7 @@ const foldGutterDefaults = {
     closedText: "›",
     markerDOM: null,
     domEventHandlers: {},
+    foldingChanged: () => false
 };
 class FoldMarker extends view.GutterMarker {
     constructor(config, open) {
@@ -1408,7 +1415,8 @@ function foldGutter(config = {}) {
             if (update.docChanged || update.viewportChanged ||
                 update.startState.facet(language) != update.state.facet(language) ||
                 update.startState.field(foldState, false) != update.state.field(foldState, false) ||
-                syntaxTree(update.startState) != syntaxTree(update.state))
+                syntaxTree(update.startState) != syntaxTree(update.state) ||
+                fullConfig.foldingChanged(update))
                 this.markers = this.buildMarkers(update.view);
         }
         buildMarkers(view) {
@@ -1478,6 +1486,7 @@ class HighlightStyle {
             (modSpec || (modSpec = Object.create(null)))["." + cls] = spec;
             return cls;
         }
+        const all = typeof options.all == "string" ? options.all : options.all ? def(options.all) : undefined;
         const scopeOpt = options.scope;
         this.scope = scopeOpt instanceof Language ? (type) => type.prop(languageDataProp) == scopeOpt.data
             : scopeOpt ? (type) => type == scopeOpt : undefined;
@@ -1485,7 +1494,7 @@ class HighlightStyle {
             tag: style.tag,
             class: style.class || def(Object.assign({}, style, { tag: null }))
         })), {
-            all: typeof options.all == "string" ? options.all : options.all ? def(options.all) : undefined,
+            all,
         }).style;
         this.module = modSpec ? new styleMod.StyleModule(modSpec) : null;
         this.themeType = options.themeType;
@@ -1804,7 +1813,7 @@ which uses it to tokenize the content.
 */
 class StringStream {
     /**
-    @internal
+    Create a stream.
     */
     constructor(
     /**

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { NodeProp, Parser, Tree, TreeFragment, SyntaxNode, NodeType } from '@lez
 import { LRParser, ParserConfig } from '@lezer/lr';
 import * as _codemirror_state from '@codemirror/state';
 import { Facet, Extension, EditorState, Range } from '@codemirror/state';
-import { EditorView, DecorationSet, Command, KeyBinding, BlockInfo, Decoration } from '@codemirror/view';
+import { EditorView, DecorationSet, Command, KeyBinding, ViewUpdate, BlockInfo, Decoration } from '@codemirror/view';
 import { Highlighter, Tag } from '@lezer/highlight';
 import { StyleModule, StyleSpec } from 'style-mod';
 
@@ -187,6 +187,7 @@ declare class ParseContext {
         to: number;
     };
     private parse;
+    private constructor();
     private startParse;
     private withContext;
     private withoutTempSkipped;
@@ -487,6 +488,7 @@ declare class TreeIndentContext extends IndentContext {
     applies.
     */
     readonly node: SyntaxNode;
+    private constructor();
     /**
     Get the text directly after `this.pos`, either the entire line
     or the next 100 characters, whichever is shorter.
@@ -696,6 +698,11 @@ interface FoldGutterConfig {
     Supply event handlers for DOM events on this gutter.
     */
     domEventHandlers?: Handlers;
+    /**
+    When given, if this returns true for a given view update,
+    recompute the fold markers.
+    */
+    foldingChanged?: (update: ViewUpdate) => boolean;
 }
 /**
 Create an extension that registers a fold gutter, which shows a
@@ -900,6 +907,18 @@ declare class StringStream {
     private lastColumnPos;
     private lastColumnValue;
     /**
+    Create a stream.
+    */
+    constructor(
+    /**
+    The line.
+    */
+    string: string, tabSize: number, 
+    /**
+    The current indent unit size.
+    */
+    indentUnit: number);
+    /**
     True if we are at the end of the line.
     */
     eol(): boolean;

package/dist/index.js

@@ -244,9 +244,6 @@ let currentContext = null;
 A parse context provided to parsers working on the editor content.
 */
 class ParseContext {
-    /**
-    @internal
-    */
     constructor(parser, 
     /**
     The current editor state.
@@ -297,6 +294,12 @@ class ParseContext {
         */
         this.tempSkipped = [];
     }
+    /**
+    @internal
+    */
+    static create(parser, state, viewport) {
+        return new ParseContext(parser, state, [], Tree.empty, 0, viewport, [], null);
+    }
     startParse() {
         return this.parser.startParse(new DocInput(this.state.doc), this.fragments);
     }
@@ -502,7 +505,7 @@ class LanguageState {
     }
     static init(state) {
         let vpTo = Math.min(3000 /* InitViewport */, state.doc.length);
-        let parseState = new ParseContext(state.facet(language).parser, state, [], Tree.empty, 0, { from: 0, to: vpTo }, [], null);
+        let parseState = ParseContext.create(state.facet(language).parser, state, { from: 0, to: vpTo });
         if (!parseState.work(20 /* Apply */, vpTo))
             parseState.takeTree();
         return new LanguageState(parseState);
@@ -930,7 +933,7 @@ function indentFrom(node, pos, base) {
     for (; node; node = node.parent) {
         let strategy = indentStrategy(node);
         if (strategy)
-            return strategy(new TreeIndentContext(base, pos, node));
+            return strategy(TreeIndentContext.create(base, pos, node));
     }
     return null;
 }
@@ -940,9 +943,6 @@ Objects of this type provide context information and helper
 methods to indentation functions registered on syntax nodes.
 */
 class TreeIndentContext extends IndentContext {
-    /**
-    @internal
-    */
     constructor(base, 
     /**
     The position at which indentation is being computed.
@@ -959,6 +959,12 @@ class TreeIndentContext extends IndentContext {
         this.node = node;
     }
     /**
+    @internal
+    */
+    static create(base, pos, node) {
+        return new TreeIndentContext(base, pos, node);
+    }
+    /**
     Get the text directly after `this.pos`, either the entire line
     or the next 100 characters, whichever is shorter.
     */
@@ -1370,6 +1376,7 @@ const foldGutterDefaults = {
     closedText: "›",
     markerDOM: null,
     domEventHandlers: {},
+    foldingChanged: () => false
 };
 class FoldMarker extends GutterMarker {
     constructor(config, open) {
@@ -1404,7 +1411,8 @@ function foldGutter(config = {}) {
             if (update.docChanged || update.viewportChanged ||
                 update.startState.facet(language) != update.state.facet(language) ||
                 update.startState.field(foldState, false) != update.state.field(foldState, false) ||
-                syntaxTree(update.startState) != syntaxTree(update.state))
+                syntaxTree(update.startState) != syntaxTree(update.state) ||
+                fullConfig.foldingChanged(update))
                 this.markers = this.buildMarkers(update.view);
         }
         buildMarkers(view) {
@@ -1474,6 +1482,7 @@ class HighlightStyle {
             (modSpec || (modSpec = Object.create(null)))["." + cls] = spec;
             return cls;
         }
+        const all = typeof options.all == "string" ? options.all : options.all ? def(options.all) : undefined;
         const scopeOpt = options.scope;
         this.scope = scopeOpt instanceof Language ? (type) => type.prop(languageDataProp) == scopeOpt.data
             : scopeOpt ? (type) => type == scopeOpt : undefined;
@@ -1481,7 +1490,7 @@ class HighlightStyle {
             tag: style.tag,
             class: style.class || def(Object.assign({}, style, { tag: null }))
         })), {
-            all: typeof options.all == "string" ? options.all : options.all ? def(options.all) : undefined,
+            all,
         }).style;
         this.module = modSpec ? new StyleModule(modSpec) : null;
         this.themeType = options.themeType;
@@ -1800,7 +1809,7 @@ which uses it to tokenize the content.
 */
 class StringStream {
     /**
-    @internal
+    Create a stream.
     */
     constructor(
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "0.20.0",
+  "version": "6.0.0",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",
@@ -26,15 +26,16 @@
   "sideEffects": false,
   "license": "MIT",
   "dependencies": {
-    "@codemirror/state": "^0.20.0",
-    "@codemirror/view": "^0.20.0",
-    "@lezer/common": "^0.16.0",
-    "@lezer/highlight": "^0.16.0",
-    "@lezer/lr": "^0.16.0"
+    "@codemirror/state": "^6.0.0",
+    "@codemirror/view": "^6.0.0",
+    "@lezer/common": "^1.0.0",
+    "@lezer/highlight": "^1.0.0",
+    "@lezer/lr": "^1.0.0",
+    "style-mod": "^4.0.0"
   },
   "devDependencies": {
     "@codemirror/buildhelper": "^0.1.5",
-    "@lezer/javascript": "^0.16.0"
+    "@lezer/javascript": "^1.0.0"
   },
   "repository": {
     "type": "git",