@codemirror/lint 6.8.1 → 6.8.2

package/CHANGELOG.md

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

package/dist/index.cjs

@@ -236,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); });
         }
     }
@@ -264,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), {
@@ -706,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';
 
@@ -234,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); });
         }
     }
@@ -262,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), {
@@ -704,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.1",
+  "version": "6.8.2",
   "description": "Linting support for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",