From 0c68295ec6e9490b3ab799d190cd90576202a079 Mon Sep 17 00:00:00 2001
From: Corey Johnson & Kevin Sawicki <cj+kevin@github.com>
Date: Wed, 12 Dec 2012 15:08:20 -0800
Subject: [PATCH] Empty fuzzy-finder list on cancel

---
 spec/app/select-list-spec.coffee                    | 13 ++-----------
 src/app/select-list.coffee                          |  3 +--
 src/extensions/fuzzy-finder/src/fuzzy-finder.coffee | 10 ++++++----
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/spec/app/select-list-spec.coffee b/spec/app/select-list-spec.coffee
index f017c5051..b604e529e 100644
--- a/spec/app/select-list-spec.coffee
+++ b/spec/app/select-list-spec.coffee
@@ -132,11 +132,12 @@ describe "SelectList", ->
       expect(selectList.confirmed).toHaveBeenCalledWith(array[1])
 
   describe "the core:cancel event", ->
-    it "triggers the cancelled hook and detaches the select list", ->
+    it "triggers the cancelled hook and detaches and empties the select list", ->
       spyOn(selectList, 'detach')
       miniEditor.trigger 'core:cancel'
       expect(selectList.cancelled).toHaveBeenCalled()
       expect(selectList.detach).toHaveBeenCalled()
+      expect(selectList.list).toBeEmpty()
 
   describe "when the mini editor loses focus", ->
     it "triggers the cancelled hook and detaches the select list", ->
@@ -144,13 +145,3 @@ describe "SelectList", ->
       miniEditor.trigger 'focusout'
       expect(selectList.cancelled).toHaveBeenCalled()
       expect(selectList.detach).toHaveBeenCalled()
-
-  describe "when an error occurs on previously populated list", ->
-    it "clears the list", ->
-      selectList.setError("yolo")
-      expect(selectList.list).toBeEmpty()
-
-  describe "when loading is triggered on previously populated list", ->
-    it "clears the list", ->
-      selectList.setLoading("loading yolo")
-      expect(selectList.list).toBeEmpty()
diff --git a/src/app/select-list.coffee b/src/app/select-list.coffee
index 29a937218..a6759337d 100644
--- a/src/app/select-list.coffee
+++ b/src/app/select-list.coffee
@@ -48,7 +48,6 @@ class SelectList extends View
       @error.text("").hide()
       @removeClass("error")
     else
-      @list.empty()
       @error.text(message).show()
       @addClass("error")
 
@@ -56,7 +55,6 @@ class SelectList extends View
     if not message or message.length == ""
       @loading.text("").hide()
     else
-      @list.empty()
       @setError()
       @loading.text(message).show()
 
@@ -115,6 +113,7 @@ class SelectList extends View
     @confirmed(element) if element?
 
   cancel: ->
+    @list.empty()
     @cancelling = true
     @cancelled()
     @detach()
diff --git a/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee b/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee
index a363fa93a..02eafcbee 100644
--- a/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee
+++ b/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee
@@ -51,10 +51,12 @@ class FuzzyFinder extends SelectList
       @attach() if @paths?.length
 
   populateProjectPaths: ->
-    return if @array?.length > 0
-    @setLoading("Indexing...")
-    @rootView.project.getFilePaths().done (paths) =>
-      @setArray(paths)
+    if @array?.length > 0
+      @setArray(@array)
+    else
+      @setLoading("Indexing...")
+      @rootView.project.getFilePaths().done (paths) =>
+        @setArray(paths)
 
   populateOpenBufferPaths: ->
     @paths = @rootView.getOpenBufferPaths().map (path) =>