@codemirror/lint 0.19.5 → 0.20.1

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 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
+
+Fix a bug where hovering over the icons in the lint gutter would sometimes fail to show a tooltip or show the tooltip for another line.
+
 ## 0.19.5 (2022-02-25)
 
 ### 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 }; }
@@ -53,6 +49,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 +61,7 @@ function maybeEnableLint(state$1, effects) {
                 activeMark.range(selected.from, selected.to)
             ]);
         }),
-        tooltip.hoverTooltip(lintTooltip),
+        view.hoverTooltip(lintTooltip, { hideOn: hideTooltip }),
         baseTheme
     ]));
 }
@@ -109,7 +108,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)]
 });
 /**
@@ -148,13 +147,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;
 };
 /**
@@ -577,7 +576,7 @@ const baseTheme = view.EditorView.baseTheme({
         }
     }
 });
-class LintGutterMarker extends gutter.GutterMarker {
+class LintGutterMarker extends view.GutterMarker {
     constructor(diagnostics) {
         super();
         this.diagnostics = diagnostics;
@@ -611,7 +610,7 @@ function trackHoverOn(view, marker) {
 }
 function gutterMarkerMouseOver(view, marker, diagnostics) {
     function hovered() {
-        let line = view.visualLineAtHeight(marker.getBoundingClientRect().top + 5 - view.documentTop);
+        let line = view.elementAtHeight(marker.getBoundingClientRect().top + 5 - view.documentTop);
         const linePos = view.coordsAtPos(line.from);
         if (linePos) {
             view.dispatch({ effects: setLintGutterTooltip.of({
@@ -649,15 +648,15 @@ 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);
@@ -673,10 +672,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": {

package/dist/index.d.ts

@@ -47,7 +47,7 @@ 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;
 }

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, RangeSet, combineConfig } from '@codemirror/state';
 import elt from 'crelt';
 
 class SelectedDiagnostic {
@@ -45,6 +41,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 +53,7 @@ function maybeEnableLint(state, effects) {
                 activeMark.range(selected.from, selected.to)
             ]);
         }),
-        hoverTooltip(lintTooltip),
+        hoverTooltip(lintTooltip, { hideOn: hideTooltip }),
         baseTheme
     ]));
 }
@@ -603,7 +602,7 @@ function trackHoverOn(view, marker) {
 }
 function gutterMarkerMouseOver(view, marker, diagnostics) {
     function hovered() {
-        let line = view.visualLineAtHeight(marker.getBoundingClientRect().top + 5 - view.documentTop);
+        let line = view.elementAtHeight(marker.getBoundingClientRect().top + 5 - view.documentTop);
         const linePos = view.coordsAtPos(line.from);
         if (linePos) {
             view.dispatch({ effects: setLintGutterTooltip.of({
@@ -665,7 +664,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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/lint",
-  "version": "0.19.5",
+  "version": "0.20.1",
   "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": {