From 8e73258168055f305d5fc65f8e9890e4170385c0 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 11 Oct 2013 16:38:29 -0700 Subject: [PATCH 1/5] Remove unused Project::getFilePaths --- spec/project-spec.coffee | 70 ---------------------------------------- src/project.coffee | 13 -------- 2 files changed, 83 deletions(-) diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee index 652b36400..a883ccbe4 100644 --- a/spec/project-spec.coffee +++ b/spec/project-spec.coffee @@ -280,76 +280,6 @@ describe "Project", -> expect(project.getPath()?).toBeFalsy() expect(project.getRootDirectory()?).toBeFalsy() - describe ".getFilePaths()", -> - it "returns file paths using a promise", -> - paths = null - waitsForPromise -> - project.getFilePaths().done (foundPaths) -> paths = foundPaths - - runs -> - expect(paths.length).toBeGreaterThan 0 - - it "ignores files that return true from atom.ignorePath(path)", -> - spyOn(project, 'isPathIgnored').andCallFake (filePath) -> path.basename(filePath).match /a$/ - - paths = null - waitsForPromise -> - project.getFilePaths().done (foundPaths) -> paths = foundPaths - - runs -> - expect(paths).not.toContain(project.resolve('a')) - expect(paths).toContain(project.resolve('b')) - - describe "when config.core.hideGitIgnoredFiles is true", -> - it "ignores files that are present in .gitignore if the project is a git repo", -> - config.set "core.hideGitIgnoredFiles", true - project.setPath(path.join(__dirname, 'fixtures', 'git', 'working-dir')) - paths = null - waitsForPromise -> - project.getFilePaths().done (foundPaths) -> paths = foundPaths - - runs -> - expect(paths).not.toContain('ignored.txt') - - describe "ignored file name", -> - ignoredFile = null - - beforeEach -> - ignoredFile = path.join(__dirname, 'fixtures', 'dir', 'ignored.txt') - fs.writeSync(ignoredFile, "") - - afterEach -> - fs.remove(ignoredFile) - - it "ignores ignored.txt file", -> - paths = null - config.pushAtKeyPath("core.ignoredNames", "ignored.txt") - waitsForPromise -> - project.getFilePaths().done (foundPaths) -> paths = foundPaths - - runs -> - expect(paths).not.toContain('ignored.txt') - - describe "ignored folder name", -> - ignoredFile = null - - beforeEach -> - ignoredFile = path.join(__dirname, 'fixtures', 'dir', 'ignored', 'ignored.txt') - fs.writeSync(ignoredFile, "") - - afterEach -> - fs.remove(ignoredFile) - - it "ignores ignored folder", -> - paths = null - config.get("core.ignoredNames").push("ignored.txt") - config.set("core.ignoredNames", config.get("core.ignoredNames")) - waitsForPromise -> - project.getFilePaths().done (foundPaths) -> paths = foundPaths - - runs -> - expect(paths).not.toContain('ignored/ignored.txt') - describe ".scan(options, callback)", -> describe "when called with a regex", -> it "calls the callback with all regex results in all files in the project", -> diff --git a/src/project.coffee b/src/project.coffee index a3c2feae7..8c9688a6e 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -132,19 +132,6 @@ class Project getRootDirectory: -> @rootDirectory - # Public: Fetches the name of every file (that's not `git ignore`d) in the - # project. - # - # Returns an {Array} of {String}s. - getFilePaths: -> - deferred = $.Deferred() - paths = [] - onFile = (path) => paths.push(path) unless @isPathIgnored(path) - onDirectory = -> true - fsUtils.traverseTreeSync(@getPath(), onFile, onDirectory) - deferred.resolve(paths) - deferred.promise() - # Public: Determines if a path is ignored via Atom configuration. isPathIgnored: (path) -> for segment in path.split("/") From 68c7b2dab00487582af3f47e75226f211f6ab835 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 11 Oct 2013 16:45:56 -0700 Subject: [PATCH 2/5] Use Q for promise in Project::scan --- src/project.coffee | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/project.coffee b/src/project.coffee index 8c9688a6e..bd7b90a1e 100644 --- a/src/project.coffee +++ b/src/project.coffee @@ -4,7 +4,6 @@ url = require 'url' Q = require 'q' _ = require './underscore-extensions' -$ = require './jquery-extensions' telepath = require 'telepath' {Range} = telepath TextBuffer = require './text-buffer' @@ -303,7 +302,7 @@ class Project iterator = options options = {} - deferred = $.Deferred() + deferred = Q.defer() searchOptions = ignoreCase: regex.ignoreCase @@ -322,7 +321,7 @@ class Project task.on 'scan:paths-searched', (numberOfPathsSearched) -> options.onPathsSearched(numberOfPathsSearched) - deferred + deferred.promise # Private: buildEditSessionForBuffer: (buffer, editSessionOptions) -> From d0decbb7e507b8778846b4c7ab6d45b92290e53b Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Fri, 11 Oct 2013 17:01:14 -0700 Subject: [PATCH 3/5] Upgrade to symbols-view@0.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 930b46072..da7ef018c 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "snippets": "0.6.0", "spell-check": "0.6.0", "status-bar": "0.10.1", - "symbols-view": "0.8.0", + "symbols-view": "0.10.0", "tabs": "0.5.0", "terminal": "0.10.0", "timecop": "0.5.0", From 7be57deef6cc6fa6eab5372a221c00e117252b82 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 14 Oct 2013 09:39:10 -0700 Subject: [PATCH 4/5] Upgrade to collaboration@0.23.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index da7ef018c..87eeca4f2 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "autoflow": "0.3.0", "bookmarks": "0.5.0", "bracket-matcher": "0.6.0", - "collaboration": "0.21.0", + "collaboration": "0.23.0", "command-logger": "0.4.0", "command-palette": "0.4.0", "editor-stats": "0.3.0", From 38f50d60f581fc54aa19a60d3d6afe6901e70d22 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 14 Oct 2013 09:49:09 -0700 Subject: [PATCH 5/5] Upgrade to find-and-replace@0.25.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 87eeca4f2..604614845 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "command-palette": "0.4.0", "editor-stats": "0.3.0", "exception-reporting": "0.4.0", - "find-and-replace": "0.24.2", + "find-and-replace": "0.25.0", "fuzzy-finder": "0.10.0", "gfm": "0.5.0", "git-diff": "0.6.1",