From 19aa192c47ee30606b3d1ca89ec2fdb2f6272e18 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Fri, 12 Oct 2012 14:45:12 -0700
Subject: [PATCH] Return paths instead of deferred from project.getFilePaths

It was already being performed synchronously
---
 spec/app/project-spec.coffee                    |  6 +++---
 spec/extensions/fuzzy-finder-spec.coffee        | 10 +++++-----
 src/app/project.coffee                          |  5 +----
 src/extensions/fuzzy-finder/fuzzy-finder.coffee |  3 ++-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/spec/app/project-spec.coffee b/spec/app/project-spec.coffee
index d7f185987..9b79e1ea6 100644
--- a/spec/app/project-spec.coffee
+++ b/spec/app/project-spec.coffee
@@ -114,9 +114,9 @@ describe "Project", ->
       spyOn(project, 'ignoreDirectory').andCallFake (path) -> fs.base(path).match /a$/
       spyOn(project, 'ignoreFile').andCallFake (path) -> fs.base(path).match /a$/
 
-      project.getFilePaths().done (paths) ->
-        expect(paths).not.toContain('a')
-        expect(paths).toContain('b')
+      paths = project.getFilePaths()
+      expect(paths).not.toContain('a')
+      expect(paths).toContain('b')
 
   describe ".scan(options, callback)", ->
     describe "when called with a regex", ->
diff --git a/spec/extensions/fuzzy-finder-spec.coffee b/spec/extensions/fuzzy-finder-spec.coffee
index 8eaf86496..6c02ffba8 100644
--- a/spec/extensions/fuzzy-finder-spec.coffee
+++ b/spec/extensions/fuzzy-finder-spec.coffee
@@ -40,11 +40,11 @@ describe 'FuzzyFinder', ->
         it "shows all relative file paths for the current project and selects the first", ->
           finder.maxResults = 1000
           rootView.trigger 'fuzzy-finder:toggle-file-finder'
-          rootView.project.getFilePaths().done (paths) ->
-            expect(finder.pathList.children('li').length).toBe paths.length, finder.maxResults
-            for path in paths
-              expect(finder.pathList.find("li:contains(#{path})")).toExist()
-            expect(finder.pathList.children().first()).toHaveClass 'selected'
+          paths = rootView.project.getFilePaths()
+          expect(finder.pathList.children('li').length).toBe paths.length, finder.maxResults
+          for path in paths
+            expect(finder.pathList.find("li:contains(#{path})")).toExist()
+          expect(finder.pathList.children().first()).toHaveClass 'selected'
 
       describe "when root view's project has no path", ->
         beforeEach ->
diff --git a/src/app/project.coffee b/src/app/project.coffee
index 323d98f0b..1ce285833 100644
--- a/src/app/project.coffee
+++ b/src/app/project.coffee
@@ -51,8 +51,6 @@ class Project
     @rootDirectory
 
   getFilePaths: ->
-    deferred = $.Deferred()
-
     filePaths = []
 
     onFile = (path) =>
@@ -62,8 +60,7 @@ class Project
       return not @ignoreDirectory(path)
 
     fs.traverseTree @getPath(), onFile, onDirectory
-    deferred.resolve filePaths
-    deferred
+    filePaths
 
   ignoreDirectory: (path) ->
     lastSlash = path.lastIndexOf('/')
diff --git a/src/extensions/fuzzy-finder/fuzzy-finder.coffee b/src/extensions/fuzzy-finder/fuzzy-finder.coffee
index 3e75dd98c..ee5508ad0 100644
--- a/src/extensions/fuzzy-finder/fuzzy-finder.coffee
+++ b/src/extensions/fuzzy-finder/fuzzy-finder.coffee
@@ -52,7 +52,8 @@ class FuzzyFinder extends View
       @attach() if @paths?.length
 
   populateProjectPaths: ->
-    @rootView.project.getFilePaths().done (@paths) => @populatePathList()
+    @paths = @rootView.project.getFilePaths()
+    @populatePathList()
 
   populateOpenBufferPaths: ->
     @paths = @rootView.getOpenBufferPaths().map (path) =>