From 37e6f03346b53e48e2a94b48fe9933246ba260d0 Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Tue, 2 Dec 2014 16:31:38 -0800
Subject: [PATCH] Fix tooltip command display when command has no keybinding

---
 spec/tooltip-manager-spec.coffee | 7 +++++++
 src/tooltip-manager.coffee       | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/spec/tooltip-manager-spec.coffee b/spec/tooltip-manager-spec.coffee
index 95e40c731..74b875658 100644
--- a/spec/tooltip-manager-spec.coffee
+++ b/spec/tooltip-manager-spec.coffee
@@ -59,6 +59,13 @@ describe "TooltipManager", ->
             tooltipElement = document.body.querySelector(".tooltip")
             expect(tooltipElement).toHaveText "⌃X ⌃Y"
 
+        it "does not display the keybinding if there is nothing mapped to the specified keyBindingCommand", ->
+          manager.add element, title: 'A Title', keyBindingCommand: 'test-command', keyBindingTarget: element
+
+          hover element, ->
+            tooltipElement = document.body.querySelector(".tooltip")
+            expect(tooltipElement.textContent).toBe "A Title"
+
     describe "when .dispose() is called on the returned disposable", ->
       it "no longer displays the tooltip on hover", ->
         disposable = manager.add element, title: "Title"
diff --git a/src/tooltip-manager.coffee b/src/tooltip-manager.coffee
index 60a47cc74..3025ed64c 100644
--- a/src/tooltip-manager.coffee
+++ b/src/tooltip-manager.coffee
@@ -36,9 +36,10 @@ class TooltipManager
 
     if keyBindingCommand?
       bindings = atom.keymaps.findKeyBindings(command: keyBindingCommand, target: keyBindingTarget)
-      if options.title?
+      keystroke = getKeystroke(bindings)
+      if options.title? and keystroke?
         options.title += " " + getKeystroke(bindings)
-      else
+      else if keystroke?
         options.title = getKeystroke(bindings)
 
     $target = $(target)