2 files changed, 15 insertions, 6 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/cli/search.rb b/Library/Homebrew/cask/lib/hbc/cli/search.rb
index 68d725755..992aca583 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/search.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/search.rb
@@ -49,15 +49,12 @@ module Hbc
         else
           ohai "Partial matches"
         end
-        highlighted = partial_matches.map { |match| highlight_installed match }
-        puts Formatter.columns(highlighted)
+        puts Formatter.columns(partial_matches.map(&method(:highlight_installed)))
       end
 
       def self.highlight_installed(token)
-        if Cask.new(token).installed?
-          token = pretty_installed token
-        end
-        token
+        return token unless Cask.new(token).installed?
+        pretty_installed token
       end
 
       def self.help
diff --git a/Library/Homebrew/test/cask/cli/search_spec.rb b/Library/Homebrew/test/cask/cli/search_spec.rb
index 0bcff809a..cc4e0ae63 100644
--- a/Library/Homebrew/test/cask/cli/search_spec.rb
+++ b/Library/Homebrew/test/cask/cli/search_spec.rb
@@ -56,4 +56,16 @@ describe Hbc::CLI::Search, :cask do
       Hbc::CLI::Search.run("caskroom")
     }.to output(/^No Cask found for "caskroom"\.\n/).to_stdout
   end
+
+  it "doesn't highlight not installed packages" do
+    expect(Hbc::CLI::Search.highlight_installed "local-caffeine").to eq("local-caffeine")
+  end
+
+  it "highlights installed packages" do
+    shutup do
+        Hbc::CLI::Install.run("local-caffeine")
+    end
+
+    expect(Hbc::CLI::Search.highlight_installed "local-caffeine").to eq(pretty_installed "local-caffeine")
+  end
 end