Merge pull request #39 from tonn/feature/hover-blink-fix

fix: remove blinking of tooltip window when mouse hover it

Author: appelgriebsch

lib/datatip-manager.js

@@ -278,50 +278,63 @@ module.exports = class DatatipManager {
    * @param  {TextEditor} editor   [description]
    * @param  {Point} position [description]
    */
-  showDataTip (editor, position, evt) {
-    const provider = this.providerRegistry.getProviderForEditor(editor);
-    if (provider) {
-      provider.datatip(editor, position, evt)
-        .then((result) => {
-          // clear last data tip
-          this.unmountDataTip();
-
-          if (result === null || result === undefined) { return; }
+  async showDataTip (editor, position, evt) {
+    try {
+      const provider = this.providerRegistry.getProviderForEditor(editor);
+      if (provider) {
+        const datatip = await provider.datatip(editor, position, evt);
 
+        if (datatip) {
           // omit update of UI if the range is the same as the current one
-          if (this.currentMarkerRange != null && result.range.compare(this.currentMarkerRange)) { return; }
+          if (this.currentMarkerRange != null && datatip.range.intersectsWith(this.currentMarkerRange)) { return; }
+          // make sure we are still on the same position
+          if (!datatip.range.containsPoint(position)) { return; }
 
-          // store marker range
-          this.currentMarkerRange = result.range;
+          // clear last data tip
+          this.unmountDataTip();
 
-          let dataTipView = null;
+          // store marker range
+          this.currentMarkerRange = datatip.range;
 
-          if (result.component){
-            dataTipView = new DataTipView({ reactView: result.component });
-            this.dataTipMarkerDisposables = this.mountDataTipWithMarker(editor, result.range, position, dataTipView);
+          if (datatip.component){
+            const dataTipView = new DataTipView({ reactView: datatip.component });
+            this.dataTipMarkerDisposables = this.mountDataTipWithMarker(editor, datatip.range, position, dataTipView);
           }
-          else if (result.markedStrings.length > 0) {
-            let s = result.markedStrings.map((m) => {
-              if (m.type === "markdown") return m.value;
-              const regExpLSPPrefix = /^\((method|property|parameter|alias)\)\W/;
-              const snippet = m.value.replace(regExpLSPPrefix, '');
-              return `<pre><code class="${editor.getGrammar().name.toLowerCase()}">${snippet}</code></pre>`;
-            }).join('\r\n');
-
-            this.renderer.render(s).then((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);
-              }
-            }).catch((err) => {
-              console.error(err);
-            });
+          else if (datatip.markedStrings.length > 0) {
+            let htmlString = this.makeHtmlFromMarkedStrings(datatip.markedStrings, editor.getGrammar().name.toLowerCase());
+
+              const html = await this.renderer.render(htmlString);
+              const dataTipView = new DataTipView({ htmlView: html });
+              this.dataTipMarkerDisposables = this.mountDataTipWithMarker(editor, datatip.range, position, dataTipView);
           }
-        });
+        }
+      }
+    } catch (err) {
+      console.error(err);
     }
   }
 
+  /**
+   * [makeHtmlFromMarkedStrings description]
+   * @param  {[type]} markedStrings   [description]
+   * @param  {String} grammarName [description]
+   * @return {String}          [description]
+   */
+  makeHtmlFromMarkedStrings(markedStrings, grammarName) {
+    const regExpLSPPrefix = /^\((method|property|parameter|alias)\)\W/;
+
+    return markedStrings
+    .map(string => {
+      if (string.type === 'markdown') {
+        return string.value;
+      } else if (string.type === 'snippet') {
+        const snippet = string.value.replace(regExpLSPPrefix, '');
+        return `<pre><code class="${grammarName}">${snippet}</code></pre>`;
+      }
+    })
+    .join('<br>');
+  }
+
   /**
    * [mountDataTipWithMarker description]
    * @param  {TextEditor} editor   [description]
@@ -378,7 +391,7 @@ module.exports = class DatatipManager {
       new Disposable(() => overlayMarker.destroy()),
       new Disposable(() => {
         this.editorView.addEventListener("mousemove", this.onMouseMoveEvt);
-        view.destroy()
+        view.destroy();
       }),
       new Disposable(() => marker.destroy())
     );