Merge pull request #37 from atom-ide-community/fix/leftovers

fix: improve handling of unmounting data tips on screen

Author: appelgriebsch

lib/datatip-manager.js

@@ -46,39 +46,32 @@ module.exports = class DatatipManager {
      * @type {Boolean}
      */
     this.showDataTipOnCursorMove = false;
-
     /**
      * [showDataTipOnMouseMove description]
      * @type {Boolean}
      */
     this.showDataTipOnMouseMove = false;
-
     /**
      * [currentMarkerRange description]
      * @type {Range}
      */
     this.currentMarkerRange = null;
-
     /**
      * [onMouseMoveEvt description]
      */
     this.onMouseMoveEvt = this.onMouseMoveEvt.bind(this);
-
     /**
      * [onCursorMoveEvt description]
      */
     this.onCursorMoveEvt = this.onCursorMoveEvt.bind(this);
-
     /**
      * [mouseMoveTimer description]
      */
     this.mouseMoveTimer = null;
-
     /**
      * [cursorMoveTimer description]
      */
     this.cursorMoveTimer = null;
-
     /**
      * [renderer description]
      * @type {[type]}
@@ -96,10 +89,7 @@ module.exports = class DatatipManager {
       atom.workspace.observeTextEditors(editor => {
         const disposable = this.watchEditor(editor);
         editor.onDidDestroy(() => disposable.dispose());
-      })
-    );
-
-    this.subscriptions.add(
+      }),
       atom.commands.add('atom-text-editor', {
         'datatip:toggle': (evt) => {
           const editor = evt.currentTarget.getModel();
@@ -168,7 +158,7 @@ module.exports = class DatatipManager {
     }
     let focusListener = () => this.updateCurrentEditor(editor);
     editorView.addEventListener('focus', focusListener);
-    let blurListener = () => this.hideDataTip();
+    let blurListener = () => this.unmountDataTip();
     editorView.addEventListener('blur', blurListener);
 
     let disposable = new Disposable(() => {
@@ -203,7 +193,7 @@ module.exports = class DatatipManager {
     this.editorSubscriptions = null;
 
     // Stop tracking editor + buffer; close any left-overs
-    this.hideDataTip();
+    this.unmountDataTip();
     this.editor = null;
     this.editorView = null;
 
@@ -222,7 +212,7 @@ module.exports = class DatatipManager {
       this.editor.onDidChangeCursorPosition(this.onCursorMoveEvt),
       this.editor.getBuffer().onDidChangeText(evt => {      // make sure to remove any datatip as long as we are typing
         if (evt.changes.length != 1) { return; }
-        this.hideDataTip();
+        this.unmountDataTip();
       }),
       new Disposable(() => { this.editorView.removeEventListener("mousemove", this.onMouseMoveEvt); })
    );
@@ -241,7 +231,7 @@ module.exports = class DatatipManager {
           (!this.currentMarkerRange.containsPoint(position))) {
         this.showDataTip(editor, position, evt);
       }
-    }, 300, evt);
+    }, 500, evt);
   }
   /**
    * [onMouseMoveEvt description]
@@ -272,15 +262,15 @@ module.exports = class DatatipManager {
       // show the datatip in such situations and hide any existing datatips (the mouse moved more to
       // the right, away from the actual text)
       if (distance >= this.editor.getDefaultCharWidth()) {
-        return this.hideDataTip();
+        return this.unmountDataTip();
       }
 
       const point = this.editor.bufferPositionForScreenPosition(screenPosition);
       if ((this.currentMarkerRange === null) ||
            (!this.currentMarkerRange.containsPoint(point))) {
             this.showDataTip(this.editor, point, evt);
       }
-    }, 300, evt);
+    }, 500, evt);
   }
 
   /**
@@ -294,7 +284,7 @@ module.exports = class DatatipManager {
       provider.datatip(editor, position, evt)
         .then((result) => {
           // clear last data tip
-          this.hideDataTip();
+          this.unmountDataTip();
 
           if (result === null || result === undefined) { return; }
 
@@ -317,13 +307,13 @@ module.exports = class DatatipManager {
               const snippet = m.value.replace(regExpLSPPrefix, '');
               return `<pre><code class="${editor.getGrammar().name.toLowerCase()}">${snippet}</code></pre>`;
             }).join('\r\n');
+
             const requestToken = `${position.row}:${position.column}`;
             this.renderer.render(requestToken, s).then(({ token, html }) => {
               if (this.currentMarkerRange.containsPoint(position)) {    // make sure we are still on the same position
+                this.unmountDataTip();
                 dataTipView = new DataTipView({ htmlView: html });
                 this.dataTipMarkerDisposables = this.mountDataTipWithMarker(editor, result.range, position, dataTipView);
-              } else {
-                this.hideDataTip();
               }
             }).catch(({ token, error }) => {
               console.error(error);
@@ -387,9 +377,9 @@ module.exports = class DatatipManager {
   }
 
   /**
-   * [hideDataTip description]
+   * [unmountDataTip description]
    */
-  hideDataTip () {
+  unmountDataTip () {
     this.currentMarkerRange = null;
     if (this.dataTipMarkerDisposables) {
       this.dataTipMarkerDisposables.dispose();