@codemirror/lint 6.8.0 → 6.8.2

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 6.8.2 (2024-09-24)
+
+### Bug fixes
+
+Show lint markers for code replaced by a block widget.
+
+When multiple linters are installed, start displaying results from ones that return quickly even if others are slow to return.
+
+## 6.8.1 (2024-06-19)
+
+### Bug fixes
+
+Make lint markers non-inclusive again, since having them that way causes more issues than it solves.
+
 ## 6.8.0 (2024-05-23)
 
 ### New features

package/dist/index.cjs

@@ -32,8 +32,7 @@ class LintState {
                 }).range(d.from)
                 : view.Decoration.mark({
                     attributes: { class: "cm-lintRange cm-lintRange-" + d.severity + (d.markClass ? " " + d.markClass : "") },
-                    diagnostic: d,
-                    inclusive: true
+                    diagnostic: d
                 }).range(d.from, d.to);
         }), true);
         return new LintState(ranges, panel, findDiagnostic(ranges));
@@ -116,7 +115,7 @@ function diagnosticCount(state) {
     let lint = state.field(lintState, false);
     return lint ? lint.diagnostics.size : 0;
 }
-const activeMark = view.Decoration.mark({ class: "cm-lintRange cm-lintRange-active", inclusive: true });
+const activeMark = view.Decoration.mark({ class: "cm-lintRange cm-lintRange-active" });
 function lintTooltip(view, pos, side) {
     let { diagnostics } = view.state.field(lintState);
     let found = [], stackStart = 2e8, stackEnd = 0;
@@ -237,10 +236,9 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
             this.set = false;
             let { state } = this.view, { sources } = state.facet(lintConfig);
             if (sources.length)
-                Promise.all(sources.map(source => Promise.resolve(source(this.view)))).then(annotations => {
-                    let all = annotations.reduce((a, b) => a.concat(b));
+                batchResults(sources.map(s => Promise.resolve(s(this.view))), annotations => {
                     if (this.view.state.doc == state.doc)
-                        this.view.dispatch(setDiagnostics(this.view.state, all));
+                        this.view.dispatch(setDiagnostics(this.view.state, annotations.reduce((a, b) => a.concat(b))));
                 }, error => { view.logException(this.view.state, error); });
         }
     }
@@ -265,6 +263,18 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
         clearTimeout(this.timeout);
     }
 });
+function batchResults(promises, sink, error) {
+    let collected = [], timeout = -1;
+    for (let p of promises)
+        p.then(value => {
+            collected.push(value);
+            clearTimeout(timeout);
+            if (collected.length == promises.length)
+                sink(collected);
+            else
+                setTimeout(() => sink(collected), 200);
+        }, error);
+}
 const lintConfig = state.Facet.define({
     combine(input) {
         return Object.assign({ sources: input.map(i => i.source).filter(x => x != null) }, state.combineConfig(input.map(i => i.config), {
@@ -707,6 +717,13 @@ function markersForDiagnostics(doc, diagnostics) {
 const lintGutterExtension = view.gutter({
     class: "cm-gutter-lint",
     markers: view => view.state.field(lintGutterMarkers),
+    widgetMarker: (view, widget, block) => {
+        let diagnostics = [];
+        view.state.field(lintGutterMarkers).between(block.from, block.to, (from, to, value) => {
+            diagnostics.push(...value.diagnostics);
+        });
+        return diagnostics.length ? new LintGutterMarker(diagnostics) : null;
+    }
 });
 const lintGutterMarkers = state.StateField.define({
     create() {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Decoration, showPanel, EditorView, ViewPlugin, logException, gutter, showTooltip, hoverTooltip, getPanel, WidgetType, GutterMarker } from '@codemirror/view';
+import { Decoration, showPanel, EditorView, ViewPlugin, gutter, showTooltip, hoverTooltip, getPanel, logException, WidgetType, GutterMarker } from '@codemirror/view';
 import { StateEffect, StateField, Facet, combineConfig, RangeSet } from '@codemirror/state';
 import elt from 'crelt';
 
@@ -30,8 +30,7 @@ class LintState {
                 }).range(d.from)
                 : Decoration.mark({
                     attributes: { class: "cm-lintRange cm-lintRange-" + d.severity + (d.markClass ? " " + d.markClass : "") },
-                    diagnostic: d,
-                    inclusive: true
+                    diagnostic: d
                 }).range(d.from, d.to);
         }), true);
         return new LintState(ranges, panel, findDiagnostic(ranges));
@@ -114,7 +113,7 @@ function diagnosticCount(state) {
     let lint = state.field(lintState, false);
     return lint ? lint.diagnostics.size : 0;
 }
-const activeMark = /*@__PURE__*/Decoration.mark({ class: "cm-lintRange cm-lintRange-active", inclusive: true });
+const activeMark = /*@__PURE__*/Decoration.mark({ class: "cm-lintRange cm-lintRange-active" });
 function lintTooltip(view, pos, side) {
     let { diagnostics } = view.state.field(lintState);
     let found = [], stackStart = 2e8, stackEnd = 0;
@@ -235,10 +234,9 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
             this.set = false;
             let { state } = this.view, { sources } = state.facet(lintConfig);
             if (sources.length)
-                Promise.all(sources.map(source => Promise.resolve(source(this.view)))).then(annotations => {
-                    let all = annotations.reduce((a, b) => a.concat(b));
+                batchResults(sources.map(s => Promise.resolve(s(this.view))), annotations => {
                     if (this.view.state.doc == state.doc)
-                        this.view.dispatch(setDiagnostics(this.view.state, all));
+                        this.view.dispatch(setDiagnostics(this.view.state, annotations.reduce((a, b) => a.concat(b))));
                 }, error => { logException(this.view.state, error); });
         }
     }
@@ -263,6 +261,18 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         clearTimeout(this.timeout);
     }
 });
+function batchResults(promises, sink, error) {
+    let collected = [], timeout = -1;
+    for (let p of promises)
+        p.then(value => {
+            collected.push(value);
+            clearTimeout(timeout);
+            if (collected.length == promises.length)
+                sink(collected);
+            else
+                setTimeout(() => sink(collected), 200);
+        }, error);
+}
 const lintConfig = /*@__PURE__*/Facet.define({
     combine(input) {
         return Object.assign({ sources: input.map(i => i.source).filter(x => x != null) }, combineConfig(input.map(i => i.config), {
@@ -705,6 +715,13 @@ function markersForDiagnostics(doc, diagnostics) {
 const lintGutterExtension = /*@__PURE__*/gutter({
     class: "cm-gutter-lint",
     markers: view => view.state.field(lintGutterMarkers),
+    widgetMarker: (view, widget, block) => {
+        let diagnostics = [];
+        view.state.field(lintGutterMarkers).between(block.from, block.to, (from, to, value) => {
+            diagnostics.push(...value.diagnostics);
+        });
+        return diagnostics.length ? new LintGutterMarker(diagnostics) : null;
+    }
 });
 const lintGutterMarkers = /*@__PURE__*/StateField.define({
     create() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/lint",
-  "version": "6.8.0",
+  "version": "6.8.2",
   "description": "Linting support for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",