From 57e45883bb55bcd2a55d1723c151d86cf4de53a6 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 17 Dec 2012 10:55:48 -0800 Subject: [PATCH] Don't reuse buffer paths as project paths --- .../spec/fuzzy-finder-spec.coffee | 19 +++++++++++++++++++ .../fuzzy-finder/src/fuzzy-finder.coffee | 6 ++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/extensions/fuzzy-finder/spec/fuzzy-finder-spec.coffee b/src/extensions/fuzzy-finder/spec/fuzzy-finder-spec.coffee index 818b74e34..867b30961 100644 --- a/src/extensions/fuzzy-finder/spec/fuzzy-finder-spec.coffee +++ b/src/extensions/fuzzy-finder/spec/fuzzy-finder-spec.coffee @@ -209,3 +209,22 @@ describe 'FuzzyFinder', -> runs -> expect(rootView.project.getFilePaths).not.toHaveBeenCalled() + + it "doesn't cache buffer paths", -> + spyOn(rootView.project, "getFilePaths").andCallThrough() + rootView.trigger 'fuzzy-finder:toggle-buffer-finder' + + waitsFor -> + finder.list.children('li').length > 0 + + runs -> + expect(rootView.project.getFilePaths).not.toHaveBeenCalled() + rootView.project.getFilePaths.reset() + rootView.trigger 'fuzzy-finder:toggle-buffer-finder' + rootView.trigger 'fuzzy-finder:toggle-file-finder' + + waitsFor -> + finder.list.children('li').length > 0 + + runs -> + expect(rootView.project.getFilePaths).toHaveBeenCalled() diff --git a/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee b/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee index 14b2441b0..9fc736d39 100644 --- a/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee +++ b/src/extensions/fuzzy-finder/src/fuzzy-finder.coffee @@ -18,6 +18,7 @@ class FuzzyFinder extends SelectList allowActiveEditorChange: null maxItems: 10 + projectPaths: null initialize: (@rootView) -> super @@ -53,11 +54,12 @@ class FuzzyFinder extends SelectList @attach() if @paths?.length populateProjectPaths: -> - if @array?.length > 0 - @setArray(@array) + if @projectPaths?.length > 0 + @setArray(@projectPaths) else @setLoading("Indexing...") @rootView.project.getFilePaths().done (paths) => + @projectPaths = paths @setArray(paths) populateOpenBufferPaths: ->