From 2dc6dfc39f2cf55c505070a23dd27d8d1701465f Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Tue, 12 Feb 2013 22:32:05 -0800 Subject: [PATCH] Serialize buffer last opened times in fuzzy-finder --- .../fuzzy-finder/lib/fuzzy-finder-view.coffee | 6 ++++++ .../fuzzy-finder/lib/fuzzy-finder.coffee | 12 +++++++++++- .../fuzzy-finder/spec/fuzzy-finder-spec.coffee | 16 ++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee index e355f1395..48c4bb117 100644 --- a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee +++ b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee @@ -160,6 +160,12 @@ class FuzzyFinderView extends SelectList @setArray(@paths) + getPaths: -> + paths = {} + for editSession in rootView.project.getEditSessions() + paths[editSession.getPath()] = editSession.lastOpened + paths + detach: -> super diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee index 2bdd340a1..7d89d0056 100644 --- a/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee +++ b/src/packages/fuzzy-finder/lib/fuzzy-finder.coffee @@ -1,8 +1,10 @@ +_ = require 'underscore' + module.exports = projectPaths: null fuzzyFinderView: null - activate: -> + activate: (state) -> rootView.command 'fuzzy-finder:toggle-file-finder', => @createView().toggleFileFinder() rootView.command 'fuzzy-finder:toggle-buffer-finder', => @@ -15,6 +17,11 @@ module.exports = @loadPathsTask = new LoadPathsTask((paths) => @projectPaths = paths) @loadPathsTask.start() + for path, lastOpened of state + session = _.detect rootView.project.getEditSessions(), (editSession) -> + editSession.getPath() is path + session?.lastOpened = lastOpened + deactivate: -> @loadPathsTask?.terminate() @fuzzyFinderView?.cancel() @@ -22,6 +29,9 @@ module.exports = @projectPaths = null @fuzzyFinderView = null + serialize: -> + @fuzzyFinderView?.getPaths() + createView: -> unless @fuzzyFinderView FuzzyFinderView = require 'fuzzy-finder/lib/fuzzy-finder-view' diff --git a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee index 31018c362..cb9cc03f0 100644 --- a/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee +++ b/src/packages/fuzzy-finder/spec/fuzzy-finder-spec.coffee @@ -1,6 +1,7 @@ RootView = require 'root-view' FuzzyFinder = require 'fuzzy-finder/lib/fuzzy-finder-view' LoadPathsTask = require 'fuzzy-finder/lib/load-paths-task' +_ = require 'underscore' $ = require 'jquery' {$$} = require 'space-pen' fs = require 'fs' @@ -145,6 +146,21 @@ describe 'FuzzyFinder', -> expect(finderView.list.find("li:contains(sample-with-tabs.coffee)")).toExist() expect(finderView.list.children().first()).toHaveClass 'selected' + it "serializes the list of paths and their last opened time", -> + rootView.open 'sample-with-tabs.coffee' + rootView.trigger 'fuzzy-finder:toggle-buffer-finder' + rootView.open 'sample.js' + rootView.trigger 'fuzzy-finder:toggle-buffer-finder' + + states = rootView.serialize().packageStates + states = _.map states['fuzzy-finder'], (path, time) -> [ path, time ] + states = _.sortBy states, (path, time) -> -time + + paths = [ 'sample-with-tabs.coffee', 'sample.txt', 'sample.js' ] + for [time, path] in states + expect(_.last path.split '/').toBe paths.shift() + expect(time).toBeGreaterThan 50000 + describe "when the active editor only contains edit sessions for anonymous buffers", -> it "does not open", -> editor = rootView.getActiveEditor()