@codemirror/lint 6.4.1 → 6.5.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.5.0 (2024-01-30)
+
+### Bug fixes
+
+Make lint mark decorations inclusive, so that they are applied even if the marked content is replaced by a widget decoration.
+
+### New features
+
+`linter` can now be called with null as source to only provide a configuration.
+
+`markerFilter` and `tooltipFilter` function now get passed the current editor state.
+
+## 6.4.2 (2023-09-14)
+
+### Bug fixes
+
+Make sure scrolling diagnostic into view in the panel works when the editor is scaled.
+
 ## 6.4.1 (2023-08-26)
 
 ### Bug fixes

package/dist/index.cjs

@@ -22,7 +22,7 @@ class LintState {
         let markedDiagnostics = diagnostics;
         let diagnosticFilter = state.facet(lintConfig).markerFilter;
         if (diagnosticFilter)
-            markedDiagnostics = diagnosticFilter(markedDiagnostics);
+            markedDiagnostics = diagnosticFilter(markedDiagnostics, state);
         let ranges = view.Decoration.set(markedDiagnostics.map((d) => {
             // For zero-length ranges or ranges covering only a line break, create a widget
             return d.from == d.to || (d.from == d.to - 1 && state.doc.lineAt(d.from).to == d.from)
@@ -32,7 +32,8 @@ class LintState {
                 }).range(d.from)
                 : view.Decoration.mark({
                     attributes: { class: "cm-lintRange cm-lintRange-" + d.severity + (d.markClass ? " " + d.markClass : "") },
-                    diagnostic: d
+                    diagnostic: d,
+                    inclusive: true
                 }).range(d.from, d.to);
         }), true);
         return new LintState(ranges, panel, findDiagnostic(ranges));
@@ -108,7 +109,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" });
+const activeMark = view.Decoration.mark({ class: "cm-lintRange cm-lintRange-active", inclusive: true });
 function lintTooltip(view, pos, side) {
     let { diagnostics } = view.state.field(lintState);
     let found = [], stackStart = 2e8, stackEnd = 0;
@@ -122,7 +123,7 @@ function lintTooltip(view, pos, side) {
     });
     let diagnosticFilter = view.state.facet(lintConfig).tooltipFilter;
     if (diagnosticFilter)
-        found = diagnosticFilter(found);
+        found = diagnosticFilter(found, view.state);
     if (!found.length)
         return null;
     return {
@@ -227,11 +228,12 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
         else {
             this.set = false;
             let { state } = this.view, { sources } = state.facet(lintConfig);
-            Promise.all(sources.map(source => Promise.resolve(source(this.view)))).then(annotations => {
-                let all = annotations.reduce((a, b) => a.concat(b));
-                if (this.view.state.doc == state.doc)
-                    this.view.dispatch(setDiagnostics(this.view.state, all));
-            }, error => { view.logException(this.view.state, error); });
+            if (sources.length)
+                Promise.all(sources.map(source => Promise.resolve(source(this.view)))).then(annotations => {
+                    let all = annotations.reduce((a, b) => a.concat(b));
+                    if (this.view.state.doc == state.doc)
+                        this.view.dispatch(setDiagnostics(this.view.state, all));
+                }, error => { view.logException(this.view.state, error); });
         }
     }
     update(update) {
@@ -257,7 +259,7 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
 });
 const lintConfig = state.Facet.define({
     combine(input) {
-        return Object.assign({ sources: input.map(i => i.source) }, state.combineConfig(input.map(i => i.config), {
+        return Object.assign({ sources: input.map(i => i.source).filter(x => x != null) }, state.combineConfig(input.map(i => i.config), {
             delay: 750,
             markerFilter: null,
             tooltipFilter: null,
@@ -270,7 +272,8 @@ const lintConfig = state.Facet.define({
 /**
 Given a diagnostic source, this function returns an extension that
 enables linting with that source. It will be called whenever the
-editor is idle (after its content changed).
+editor is idle (after its content changed). If `null` is given as
+source, this only configures the lint extension.
 */
 function linter(source, config = {}) {
     return [
@@ -467,10 +470,11 @@ class LintPanel {
                 key: this,
                 read: () => ({ sel: newSelectedItem.dom.getBoundingClientRect(), panel: this.list.getBoundingClientRect() }),
                 write: ({ sel, panel }) => {
+                    let scaleY = panel.height / this.list.offsetHeight;
                     if (sel.top < panel.top)
-                        this.list.scrollTop -= panel.top - sel.top;
+                        this.list.scrollTop -= (panel.top - sel.top) / scaleY;
                     else if (sel.bottom > panel.bottom)
-                        this.list.scrollTop += sel.bottom - panel.bottom;
+                        this.list.scrollTop += (sel.bottom - panel.bottom) / scaleY;
                 }
             });
         }
@@ -627,7 +631,7 @@ class LintGutterMarker extends view.GutterMarker {
         let diagnostics = this.diagnostics;
         let diagnosticsFilter = view.state.facet(lintGutterConfig).tooltipFilter;
         if (diagnosticsFilter)
-            diagnostics = diagnosticsFilter(diagnostics);
+            diagnostics = diagnosticsFilter(diagnostics, view.state);
         if (diagnostics.length)
             elt.onmouseover = () => gutterMarkerMouseOver(view, elt, diagnostics);
         return elt;
@@ -706,7 +710,7 @@ const lintGutterMarkers = state.StateField.define({
             if (effect.is(setDiagnosticsEffect)) {
                 let diagnostics = effect.value;
                 if (diagnosticFilter)
-                    diagnostics = diagnosticFilter(diagnostics || []);
+                    diagnostics = diagnosticFilter(diagnostics || [], tr.state);
                 markers = markersForDiagnostics(tr.state.doc, diagnostics.slice(0));
             }
         }

package/dist/index.d.cts

@@ -62,7 +62,7 @@ interface Action {
     */
     apply: (view: EditorView, from: number, to: number) => void;
 }
-type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
+type DiagnosticFilter = (diagnostics: readonly Diagnostic[], state: EditorState) => Diagnostic[];
 interface LintConfig {
     /**
     Time to wait (in milliseconds) after a change before running
@@ -147,9 +147,10 @@ type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly
 /**
 Given a diagnostic source, this function returns an extension that
 enables linting with that source. It will be called whenever the
-editor is idle (after its content changed).
+editor is idle (after its content changed). If `null` is given as
+source, this only configures the lint extension.
 */
-declare function linter(source: LintSource, config?: LintConfig): Extension;
+declare function linter(source: LintSource | null, config?: LintConfig): Extension;
 /**
 Forces any linters [configured](https://codemirror.net/6/docs/ref/#lint.linter) to run when the
 editor is idle to run right away.
@@ -170,4 +171,4 @@ arguments hold the diagnostic's current position.
 */
 declare function forEachDiagnostic(state: EditorState, f: (d: Diagnostic, from: number, to: number) => void): void;
 
-export { Action, Diagnostic, LintSource, closeLintPanel, diagnosticCount, forEachDiagnostic, forceLinting, lintGutter, lintKeymap, linter, nextDiagnostic, openLintPanel, previousDiagnostic, setDiagnostics, setDiagnosticsEffect };
+export { type Action, type Diagnostic, type LintSource, closeLintPanel, diagnosticCount, forEachDiagnostic, forceLinting, lintGutter, lintKeymap, linter, nextDiagnostic, openLintPanel, previousDiagnostic, setDiagnostics, setDiagnosticsEffect };

package/dist/index.d.ts

@@ -62,7 +62,7 @@ interface Action {
     */
     apply: (view: EditorView, from: number, to: number) => void;
 }
-type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
+type DiagnosticFilter = (diagnostics: readonly Diagnostic[], state: EditorState) => Diagnostic[];
 interface LintConfig {
     /**
     Time to wait (in milliseconds) after a change before running
@@ -147,9 +147,10 @@ type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly
 /**
 Given a diagnostic source, this function returns an extension that
 enables linting with that source. It will be called whenever the
-editor is idle (after its content changed).
+editor is idle (after its content changed). If `null` is given as
+source, this only configures the lint extension.
 */
-declare function linter(source: LintSource, config?: LintConfig): Extension;
+declare function linter(source: LintSource | null, config?: LintConfig): Extension;
 /**
 Forces any linters [configured](https://codemirror.net/6/docs/ref/#lint.linter) to run when the
 editor is idle to run right away.
@@ -170,4 +171,4 @@ arguments hold the diagnostic's current position.
 */
 declare function forEachDiagnostic(state: EditorState, f: (d: Diagnostic, from: number, to: number) => void): void;
 
-export { Action, Diagnostic, LintSource, closeLintPanel, diagnosticCount, forEachDiagnostic, forceLinting, lintGutter, lintKeymap, linter, nextDiagnostic, openLintPanel, previousDiagnostic, setDiagnostics, setDiagnosticsEffect };
+export { type Action, type Diagnostic, type LintSource, closeLintPanel, diagnosticCount, forEachDiagnostic, forceLinting, lintGutter, lintKeymap, linter, nextDiagnostic, openLintPanel, previousDiagnostic, setDiagnostics, setDiagnosticsEffect };

package/dist/index.js

@@ -20,7 +20,7 @@ class LintState {
         let markedDiagnostics = diagnostics;
         let diagnosticFilter = state.facet(lintConfig).markerFilter;
         if (diagnosticFilter)
-            markedDiagnostics = diagnosticFilter(markedDiagnostics);
+            markedDiagnostics = diagnosticFilter(markedDiagnostics, state);
         let ranges = Decoration.set(markedDiagnostics.map((d) => {
             // For zero-length ranges or ranges covering only a line break, create a widget
             return d.from == d.to || (d.from == d.to - 1 && state.doc.lineAt(d.from).to == d.from)
@@ -30,7 +30,8 @@ class LintState {
                 }).range(d.from)
                 : Decoration.mark({
                     attributes: { class: "cm-lintRange cm-lintRange-" + d.severity + (d.markClass ? " " + d.markClass : "") },
-                    diagnostic: d
+                    diagnostic: d,
+                    inclusive: true
                 }).range(d.from, d.to);
         }), true);
         return new LintState(ranges, panel, findDiagnostic(ranges));
@@ -106,7 +107,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" });
+const activeMark = /*@__PURE__*/Decoration.mark({ class: "cm-lintRange cm-lintRange-active", inclusive: true });
 function lintTooltip(view, pos, side) {
     let { diagnostics } = view.state.field(lintState);
     let found = [], stackStart = 2e8, stackEnd = 0;
@@ -120,7 +121,7 @@ function lintTooltip(view, pos, side) {
     });
     let diagnosticFilter = view.state.facet(lintConfig).tooltipFilter;
     if (diagnosticFilter)
-        found = diagnosticFilter(found);
+        found = diagnosticFilter(found, view.state);
     if (!found.length)
         return null;
     return {
@@ -225,11 +226,12 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         else {
             this.set = false;
             let { state } = this.view, { sources } = state.facet(lintConfig);
-            Promise.all(sources.map(source => Promise.resolve(source(this.view)))).then(annotations => {
-                let all = annotations.reduce((a, b) => a.concat(b));
-                if (this.view.state.doc == state.doc)
-                    this.view.dispatch(setDiagnostics(this.view.state, all));
-            }, error => { logException(this.view.state, error); });
+            if (sources.length)
+                Promise.all(sources.map(source => Promise.resolve(source(this.view)))).then(annotations => {
+                    let all = annotations.reduce((a, b) => a.concat(b));
+                    if (this.view.state.doc == state.doc)
+                        this.view.dispatch(setDiagnostics(this.view.state, all));
+                }, error => { logException(this.view.state, error); });
         }
     }
     update(update) {
@@ -255,7 +257,7 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
 });
 const lintConfig = /*@__PURE__*/Facet.define({
     combine(input) {
-        return Object.assign({ sources: input.map(i => i.source) }, combineConfig(input.map(i => i.config), {
+        return Object.assign({ sources: input.map(i => i.source).filter(x => x != null) }, combineConfig(input.map(i => i.config), {
             delay: 750,
             markerFilter: null,
             tooltipFilter: null,
@@ -268,7 +270,8 @@ const lintConfig = /*@__PURE__*/Facet.define({
 /**
 Given a diagnostic source, this function returns an extension that
 enables linting with that source. It will be called whenever the
-editor is idle (after its content changed).
+editor is idle (after its content changed). If `null` is given as
+source, this only configures the lint extension.
 */
 function linter(source, config = {}) {
     return [
@@ -465,10 +468,11 @@ class LintPanel {
                 key: this,
                 read: () => ({ sel: newSelectedItem.dom.getBoundingClientRect(), panel: this.list.getBoundingClientRect() }),
                 write: ({ sel, panel }) => {
+                    let scaleY = panel.height / this.list.offsetHeight;
                     if (sel.top < panel.top)
-                        this.list.scrollTop -= panel.top - sel.top;
+                        this.list.scrollTop -= (panel.top - sel.top) / scaleY;
                     else if (sel.bottom > panel.bottom)
-                        this.list.scrollTop += sel.bottom - panel.bottom;
+                        this.list.scrollTop += (sel.bottom - panel.bottom) / scaleY;
                 }
             });
         }
@@ -625,7 +629,7 @@ class LintGutterMarker extends GutterMarker {
         let diagnostics = this.diagnostics;
         let diagnosticsFilter = view.state.facet(lintGutterConfig).tooltipFilter;
         if (diagnosticsFilter)
-            diagnostics = diagnosticsFilter(diagnostics);
+            diagnostics = diagnosticsFilter(diagnostics, view.state);
         if (diagnostics.length)
             elt.onmouseover = () => gutterMarkerMouseOver(view, elt, diagnostics);
         return elt;
@@ -704,7 +708,7 @@ const lintGutterMarkers = /*@__PURE__*/StateField.define({
             if (effect.is(setDiagnosticsEffect)) {
                 let diagnostics = effect.value;
                 if (diagnosticFilter)
-                    diagnostics = diagnosticFilter(diagnostics || []);
+                    diagnostics = diagnosticFilter(diagnostics || [], tr.state);
                 markers = markersForDiagnostics(tr.state.doc, diagnostics.slice(0));
             }
         }

package/package.json

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