Merge pull request #55 from atom-ide-community/fix-tooltip-toogle

fix: toggle command not closing tooltip

Author: Belar

lib/datatip-manager.js

@@ -96,13 +96,7 @@ module.exports = class DatatipManager {
         editor.onDidDestroy(() => disposable.dispose());
       }),
       atom.commands.add('atom-text-editor', {
-        'datatip:toggle': (evt) => {
-          const editor = evt.currentTarget.getModel();
-          if (atom.workspace.isTextEditor(editor)) {
-            const position = evt.currentTarget.getModel().getCursorBufferPosition();
-            this.showDataTip(editor, position, undefined);
-          }
-        }
+        'datatip:toggle': (evt) => this.onCommandEvt(evt)
       }),
       atom.config.observe('atom-ide-datatip.showDataTipOnCursorMove', toggleSwitch => {
         this.showDataTipOnCursorMove = toggleSwitch;
@@ -281,6 +275,25 @@ module.exports = class DatatipManager {
     }, 500, evt);
   }
 
+  /**
+   * the central command event handler
+   * @param  { CommandEvent } evt command event
+   */
+  onCommandEvt (evt) {
+    const editor = evt.currentTarget.getModel();
+
+    if (atom.workspace.isTextEditor(editor)) {
+      const position = evt.currentTarget.getModel().getCursorBufferPosition();
+
+      const isTooltipOpenForPosition = this.currentMarkerRange && this.currentMarkerRange.containsPoint(position);
+      if(isTooltipOpenForPosition) {
+        return this.unmountDataTip();
+      }
+
+      this.showDataTip(editor, position, undefined);
+    }
+  }
+
   /**
    * evaluates the responsible DatatipProvider to call for data tip information at a given position in a specific Atom Text editor
    * @param  {TextEditor} editor   the Atom Text editor instance to be used