@codemirror/lint 0.19.6 → 0.20.2

package/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.20.2 (2022-05-02)
+
+### New features
+
+The package now exports the `LintSource` function type.
+
+The new `markerFilter` and `tooltipFilter` options to `linter` and `lintGutter` allow more control over which diagnostics are visible and which have tooltips.
+
+## 0.20.1 (2022-04-22)
+
+### Bug fixes
+
+Hide lint tooltips when the document is changed.
+
+## 0.20.0 (2022-04-20)
+
+### Breaking changes
+
+Update dependencies to 0.20.0
+
 ## 0.19.6 (2022-03-04)
 
 ### Bug fixes

package/dist/index.cjs

@@ -4,10 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var view = require('@codemirror/view');
 var state = require('@codemirror/state');
-var tooltip = require('@codemirror/tooltip');
-var panel = require('@codemirror/panel');
-var gutter = require('@codemirror/gutter');
-var rangeset = require('@codemirror/rangeset');
 var elt = require('crelt');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -28,7 +24,12 @@ class LintState {
         this.selected = selected;
     }
     static init(diagnostics, panel, state) {
-        let ranges = view.Decoration.set(diagnostics.map((d) => {
+        // Filter the list of diagnostics for which to create markers
+        let markedDiagnostics = diagnostics;
+        let diagnosticFilter = state.facet(lintConfig).markerFilter;
+        if (diagnosticFilter)
+            markedDiagnostics = diagnosticFilter(markedDiagnostics);
+        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)
                 ? view.Decoration.widget({
@@ -53,6 +54,9 @@ function findDiagnostic(diagnostics, diagnostic = null, after = 0) {
     });
     return found;
 }
+function hideTooltip(tr, tooltip) {
+    return !!(tr.effects.some(e => e.is(setDiagnosticsEffect)) || tr.changes.touchesRange(tooltip.pos));
+}
 function maybeEnableLint(state$1, effects) {
     return state$1.field(lintState, false) ? effects : effects.concat(state.StateEffect.appendConfig.of([
         lintState,
@@ -62,7 +66,7 @@ function maybeEnableLint(state$1, effects) {
                 activeMark.range(selected.from, selected.to)
             ]);
         }),
-        tooltip.hoverTooltip(lintTooltip),
+        view.hoverTooltip(lintTooltip, { hideOn: hideTooltip }),
         baseTheme
     ]));
 }
@@ -109,7 +113,7 @@ const lintState = state.StateField.define({
         }
         return value;
     },
-    provide: f => [panel.showPanel.from(f, val => val.panel),
+    provide: f => [view.showPanel.from(f, val => val.panel),
         view.EditorView.decorations.from(f, s => s.diagnostics)]
 });
 /**
@@ -131,6 +135,9 @@ function lintTooltip(view, pos, side) {
             stackEnd = Math.max(to, stackEnd);
         }
     });
+    let diagnosticFilter = view.state.facet(lintConfig).tooltipFilter;
+    if (diagnosticFilter)
+        found = diagnosticFilter(found);
     if (!found.length)
         return null;
     return {
@@ -148,13 +155,13 @@ function diagnosticsTooltip(view, diagnostics) {
 /**
 Command to open and focus the lint panel.
 */
-const openLintPanel = (view) => {
-    let field = view.state.field(lintState, false);
+const openLintPanel = (view$1) => {
+    let field = view$1.state.field(lintState, false);
     if (!field || !field.panel)
-        view.dispatch({ effects: maybeEnableLint(view.state, [togglePanel.of(true)]) });
-    let panel$1 = panel.getPanel(view, LintPanel.open);
-    if (panel$1)
-        panel$1.dom.querySelector(".cm-panel-lint ul").focus();
+        view$1.dispatch({ effects: maybeEnableLint(view$1.state, [togglePanel.of(true)]) });
+    let panel = view.getPanel(view$1, LintPanel.open);
+    if (panel)
+        panel.dom.querySelector(".cm-panel-lint ul").focus();
     return true;
 };
 /**
@@ -198,7 +205,7 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
         this.view = view;
         this.timeout = -1;
         this.set = true;
-        let { delay } = view.state.facet(lintSource);
+        let { delay } = view.state.facet(lintConfig);
         this.lintTime = Date.now() + delay;
         this.run = this.run.bind(this);
         this.timeout = setTimeout(this.run, delay);
@@ -210,7 +217,7 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
         }
         else {
             this.set = false;
-            let { state } = this.view, { sources } = state.facet(lintSource);
+            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)
@@ -219,12 +226,12 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
         }
     }
     update(update) {
-        let source = update.state.facet(lintSource);
-        if (update.docChanged || source != update.startState.facet(lintSource)) {
-            this.lintTime = Date.now() + source.delay;
+        let config = update.state.facet(lintConfig);
+        if (update.docChanged || config != update.startState.facet(lintConfig)) {
+            this.lintTime = Date.now() + config.delay;
             if (!this.set) {
                 this.set = true;
-                this.timeout = setTimeout(this.run, source.delay);
+                this.timeout = setTimeout(this.run, config.delay);
             }
         }
     }
@@ -238,9 +245,13 @@ const lintPlugin = view.ViewPlugin.fromClass(class {
         clearTimeout(this.timeout);
     }
 });
-const lintSource = state.Facet.define({
+const lintConfig = state.Facet.define({
     combine(input) {
-        return { sources: input.map(i => i.source), delay: input.length ? Math.max(...input.map(i => i.delay)) : 750 };
+        return Object.assign({ sources: input.map(i => i.source) }, state.combineConfig(input.map(i => i.config), {
+            delay: 750,
+            markerFilter: null,
+            tooltipFilter: null
+        }));
     },
     enables: lintPlugin
 });
@@ -250,8 +261,7 @@ enables linting with that source. It will be called whenever the
 editor is idle (after its content changed).
 */
 function linter(source, config = {}) {
-    var _a;
-    return lintSource.of({ source, delay: (_a = config.delay) !== null && _a !== void 0 ? _a : 750 });
+    return lintConfig.of({ source, config });
 }
 /**
 Forces any linters [configured](https://codemirror.net/6/docs/ref/#lint.linter) to run when the
@@ -577,7 +587,7 @@ const baseTheme = view.EditorView.baseTheme({
         }
     }
 });
-class LintGutterMarker extends gutter.GutterMarker {
+class LintGutterMarker extends view.GutterMarker {
     constructor(diagnostics) {
         super();
         this.diagnostics = diagnostics;
@@ -589,7 +599,12 @@ class LintGutterMarker extends gutter.GutterMarker {
     toDOM(view) {
         let elt = document.createElement("div");
         elt.className = "cm-lint-marker cm-lint-marker-" + this.severity;
-        elt.onmouseover = () => gutterMarkerMouseOver(view, elt, this.diagnostics);
+        let diagnostics = this.diagnostics;
+        let diagnosticsFilter = view.state.facet(lintGutterConfig).tooltipFilter;
+        if (diagnosticsFilter)
+            diagnostics = diagnosticsFilter(diagnostics);
+        if (diagnostics.length)
+            elt.onmouseover = () => gutterMarkerMouseOver(view, elt, diagnostics);
         return elt;
     }
 }
@@ -649,22 +664,27 @@ function markersForDiagnostics(doc, diagnostics) {
     for (let line in byLine) {
         markers.push(new LintGutterMarker(byLine[line]).range(+line));
     }
-    return rangeset.RangeSet.of(markers, true);
+    return state.RangeSet.of(markers, true);
 }
-const lintGutterExtension = gutter.gutter({
+const lintGutterExtension = view.gutter({
     class: "cm-gutter-lint",
     markers: view => view.state.field(lintGutterMarkers),
 });
 const lintGutterMarkers = state.StateField.define({
     create() {
-        return rangeset.RangeSet.empty;
+        return state.RangeSet.empty;
     },
     update(markers, tr) {
         markers = markers.map(tr.changes);
-        for (let effect of tr.effects)
+        let diagnosticFilter = tr.state.facet(lintGutterConfig).markerFilter;
+        for (let effect of tr.effects) {
             if (effect.is(setDiagnosticsEffect)) {
-                markers = markersForDiagnostics(tr.state.doc, effect.value);
+                let diagnostics = effect.value;
+                if (diagnosticFilter)
+                    diagnostics = diagnosticFilter(diagnostics || []);
+                markers = markersForDiagnostics(tr.state.doc, diagnostics.slice(0));
             }
+        }
         return markers;
     }
 });
@@ -673,10 +693,10 @@ const lintGutterTooltip = state.StateField.define({
     create() { return null; },
     update(tooltip, tr) {
         if (tooltip && tr.docChanged)
-            tooltip = Object.assign(Object.assign({}, tooltip), { pos: tr.changes.mapPos(tooltip.pos) });
+            tooltip = hideTooltip(tr, tooltip) ? null : Object.assign(Object.assign({}, tooltip), { pos: tr.changes.mapPos(tooltip.pos) });
         return tr.effects.reduce((t, e) => e.is(setLintGutterTooltip) ? e.value : t, tooltip);
     },
-    provide: field => tooltip.showTooltip.from(field)
+    provide: field => view.showTooltip.from(field)
 });
 const lintGutterTheme = view.EditorView.baseTheme({
     ".cm-gutter-lint": {
@@ -703,6 +723,8 @@ const lintGutterConfig = state.Facet.define({
     combine(configs) {
         return state.combineConfig(configs, {
             hoverTime: 300 /* Time */,
+            markerFilter: null,
+            tooltipFilter: null
         });
     }
 });

package/dist/index.d.ts

@@ -47,15 +47,43 @@ interface Action {
     /**
     The function to call when the user activates this action. Is
     given the diagnostic's _current_ position, which may have
-    changed since the creation of the diagnostic due to editing.
+    changed since the creation of the diagnostic, due to editing.
     */
     apply: (view: EditorView, from: number, to: number) => void;
 }
+declare type DiagnosticFilter = (diagnostics: readonly Diagnostic[]) => Diagnostic[];
+interface LintConfig {
+    /**
+    Time to wait (in milliseconds) after a change before running
+    the linter. Defaults to 750ms.
+    */
+    delay?: number;
+    /**
+    Optional filter to determine which diagnostics produce markers
+    in the content.
+    */
+    markerFilter?: null | DiagnosticFilter;
+    /**
+    Filter applied to a set of diagnostics shown in a tooltip. No
+    tooltip will appear if the empty set is returned.
+    */
+    tooltipFilter?: null | DiagnosticFilter;
+}
 interface LintGutterConfig {
     /**
     The delay before showing a tooltip when hovering over a lint gutter marker.
     */
     hoverTime?: number;
+    /**
+    Optional filter determining which diagnostics show a marker in
+    the gutter.
+    */
+    markerFilter?: null | DiagnosticFilter;
+    /**
+    Optional filter for diagnostics displayed in a tooltip, which
+    can also be used to prevent a tooltip appearing.
+    */
+    tooltipFilter?: null | DiagnosticFilter;
 }
 /**
 Returns a transaction spec which updates the current set of
@@ -91,19 +119,16 @@ A set of default key bindings for the lint functionality.
 - F8: [`nextDiagnostic`](https://codemirror.net/6/docs/ref/#lint.nextDiagnostic)
 */
 declare const lintKeymap: readonly KeyBinding[];
+/**
+The type of a function that produces diagnostics.
+*/
 declare type LintSource = (view: EditorView) => readonly Diagnostic[] | Promise<readonly Diagnostic[]>;
 /**
 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).
 */
-declare function linter(source: LintSource, config?: {
-    /**
-    Time to wait (in milliseconds) after a change before running
-    the linter. Defaults to 750ms.
-    */
-    delay?: number;
-}): Extension;
+declare function linter(source: LintSource, 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.
@@ -116,4 +141,4 @@ the diagnostics.
 */
 declare function lintGutter(config?: LintGutterConfig): Extension;
 
-export { Action, Diagnostic, closeLintPanel, diagnosticCount, forceLinting, lintGutter, lintKeymap, linter, nextDiagnostic, openLintPanel, setDiagnostics, setDiagnosticsEffect };
+export { Action, Diagnostic, LintSource, closeLintPanel, diagnosticCount, forceLinting, lintGutter, lintKeymap, linter, nextDiagnostic, openLintPanel, setDiagnostics, setDiagnosticsEffect };

package/dist/index.js

@@ -1,9 +1,5 @@
-import { Decoration, EditorView, ViewPlugin, logException, WidgetType } from '@codemirror/view';
-import { StateEffect, StateField, Facet, combineConfig } from '@codemirror/state';
-import { hoverTooltip, showTooltip } from '@codemirror/tooltip';
-import { showPanel, getPanel } from '@codemirror/panel';
-import { gutter, GutterMarker } from '@codemirror/gutter';
-import { RangeSet } from '@codemirror/rangeset';
+import { Decoration, showPanel, EditorView, ViewPlugin, hoverTooltip, logException, gutter, showTooltip, getPanel, WidgetType, GutterMarker } from '@codemirror/view';
+import { StateEffect, StateField, Facet, combineConfig, RangeSet } from '@codemirror/state';
 import elt from 'crelt';
 
 class SelectedDiagnostic {
@@ -20,7 +16,12 @@ class LintState {
         this.selected = selected;
     }
     static init(diagnostics, panel, state) {
-        let ranges = Decoration.set(diagnostics.map((d) => {
+        // Filter the list of diagnostics for which to create markers
+        let markedDiagnostics = diagnostics;
+        let diagnosticFilter = state.facet(lintConfig).markerFilter;
+        if (diagnosticFilter)
+            markedDiagnostics = diagnosticFilter(markedDiagnostics);
+        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)
                 ? Decoration.widget({
@@ -45,6 +46,9 @@ function findDiagnostic(diagnostics, diagnostic = null, after = 0) {
     });
     return found;
 }
+function hideTooltip(tr, tooltip) {
+    return !!(tr.effects.some(e => e.is(setDiagnosticsEffect)) || tr.changes.touchesRange(tooltip.pos));
+}
 function maybeEnableLint(state, effects) {
     return state.field(lintState, false) ? effects : effects.concat(StateEffect.appendConfig.of([
         lintState,
@@ -54,7 +58,7 @@ function maybeEnableLint(state, effects) {
                 activeMark.range(selected.from, selected.to)
             ]);
         }),
-        hoverTooltip(lintTooltip),
+        hoverTooltip(lintTooltip, { hideOn: hideTooltip }),
         baseTheme
     ]));
 }
@@ -123,6 +127,9 @@ function lintTooltip(view, pos, side) {
             stackEnd = Math.max(to, stackEnd);
         }
     });
+    let diagnosticFilter = view.state.facet(lintConfig).tooltipFilter;
+    if (diagnosticFilter)
+        found = diagnosticFilter(found);
     if (!found.length)
         return null;
     return {
@@ -190,7 +197,7 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         this.view = view;
         this.timeout = -1;
         this.set = true;
-        let { delay } = view.state.facet(lintSource);
+        let { delay } = view.state.facet(lintConfig);
         this.lintTime = Date.now() + delay;
         this.run = this.run.bind(this);
         this.timeout = setTimeout(this.run, delay);
@@ -202,7 +209,7 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         }
         else {
             this.set = false;
-            let { state } = this.view, { sources } = state.facet(lintSource);
+            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)
@@ -211,12 +218,12 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         }
     }
     update(update) {
-        let source = update.state.facet(lintSource);
-        if (update.docChanged || source != update.startState.facet(lintSource)) {
-            this.lintTime = Date.now() + source.delay;
+        let config = update.state.facet(lintConfig);
+        if (update.docChanged || config != update.startState.facet(lintConfig)) {
+            this.lintTime = Date.now() + config.delay;
             if (!this.set) {
                 this.set = true;
-                this.timeout = setTimeout(this.run, source.delay);
+                this.timeout = setTimeout(this.run, config.delay);
             }
         }
     }
@@ -230,9 +237,13 @@ const lintPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         clearTimeout(this.timeout);
     }
 });
-const lintSource = /*@__PURE__*/Facet.define({
+const lintConfig = /*@__PURE__*/Facet.define({
     combine(input) {
-        return { sources: input.map(i => i.source), delay: input.length ? Math.max(...input.map(i => i.delay)) : 750 };
+        return Object.assign({ sources: input.map(i => i.source) }, combineConfig(input.map(i => i.config), {
+            delay: 750,
+            markerFilter: null,
+            tooltipFilter: null
+        }));
     },
     enables: lintPlugin
 });
@@ -242,8 +253,7 @@ enables linting with that source. It will be called whenever the
 editor is idle (after its content changed).
 */
 function linter(source, config = {}) {
-    var _a;
-    return lintSource.of({ source, delay: (_a = config.delay) !== null && _a !== void 0 ? _a : 750 });
+    return lintConfig.of({ source, config });
 }
 /**
 Forces any linters [configured](https://codemirror.net/6/docs/ref/#lint.linter) to run when the
@@ -581,7 +591,12 @@ class LintGutterMarker extends GutterMarker {
     toDOM(view) {
         let elt = document.createElement("div");
         elt.className = "cm-lint-marker cm-lint-marker-" + this.severity;
-        elt.onmouseover = () => gutterMarkerMouseOver(view, elt, this.diagnostics);
+        let diagnostics = this.diagnostics;
+        let diagnosticsFilter = view.state.facet(lintGutterConfig).tooltipFilter;
+        if (diagnosticsFilter)
+            diagnostics = diagnosticsFilter(diagnostics);
+        if (diagnostics.length)
+            elt.onmouseover = () => gutterMarkerMouseOver(view, elt, diagnostics);
         return elt;
     }
 }
@@ -653,10 +668,15 @@ const lintGutterMarkers = /*@__PURE__*/StateField.define({
     },
     update(markers, tr) {
         markers = markers.map(tr.changes);
-        for (let effect of tr.effects)
+        let diagnosticFilter = tr.state.facet(lintGutterConfig).markerFilter;
+        for (let effect of tr.effects) {
             if (effect.is(setDiagnosticsEffect)) {
-                markers = markersForDiagnostics(tr.state.doc, effect.value);
+                let diagnostics = effect.value;
+                if (diagnosticFilter)
+                    diagnostics = diagnosticFilter(diagnostics || []);
+                markers = markersForDiagnostics(tr.state.doc, diagnostics.slice(0));
             }
+        }
         return markers;
     }
 });
@@ -665,7 +685,7 @@ const lintGutterTooltip = /*@__PURE__*/StateField.define({
     create() { return null; },
     update(tooltip, tr) {
         if (tooltip && tr.docChanged)
-            tooltip = Object.assign(Object.assign({}, tooltip), { pos: tr.changes.mapPos(tooltip.pos) });
+            tooltip = hideTooltip(tr, tooltip) ? null : Object.assign(Object.assign({}, tooltip), { pos: tr.changes.mapPos(tooltip.pos) });
         return tr.effects.reduce((t, e) => e.is(setLintGutterTooltip) ? e.value : t, tooltip);
     },
     provide: field => showTooltip.from(field)
@@ -695,6 +715,8 @@ const lintGutterConfig = /*@__PURE__*/Facet.define({
     combine(configs) {
         return combineConfig(configs, {
             hoverTime: 300 /* Time */,
+            markerFilter: null,
+            tooltipFilter: null
         });
     }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/lint",
-  "version": "0.19.6",
+  "version": "0.20.2",
   "description": "Linting support for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",
@@ -26,12 +26,8 @@
   "sideEffects": false,
   "license": "MIT",
   "dependencies": {
-    "@codemirror/gutter": "^0.19.4",
-    "@codemirror/panel": "^0.19.0",
-    "@codemirror/rangeset": "^0.19.1",
-    "@codemirror/state": "^0.19.4",
-    "@codemirror/tooltip": "^0.19.16",
-    "@codemirror/view": "^0.19.22",
+    "@codemirror/state": "^0.20.0",
+    "@codemirror/view": "^0.20.2",
     "crelt": "^1.0.5"
   },
   "devDependencies": {