From 7233d9d64b6d0bf91e1f2536f0f58f2ed06ce0f1 Mon Sep 17 00:00:00 2001 From: Garen Torikian Date: Wed, 27 Mar 2013 01:06:34 -0700 Subject: [PATCH] Start figuring out where the pieces go --- src/app/project.coffee | 1 + .../command-panel/lib/command-panel-view.coffee | 11 +++++------ .../commands/select-all-matches-in-project.coffee | 12 ++++++++---- src/packages/command-panel/lib/preview-list.coffee | 3 ++- .../fuzzy-finder/lib/fuzzy-finder-view.coffee | 1 + 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/app/project.coffee b/src/app/project.coffee index a3da8a483..a70c548ff 100644 --- a/src/app/project.coffee +++ b/src/app/project.coffee @@ -177,6 +177,7 @@ class Project for [column, length] in matchPositions range = new Range([row, column], [row, column + length]) match = lineText.substr(column, length) + console.log(path) iterator({path, range, match}) deferred = $.Deferred() diff --git a/src/packages/command-panel/lib/command-panel-view.coffee b/src/packages/command-panel/lib/command-panel-view.coffee index ff574caa6..980df48a5 100644 --- a/src/packages/command-panel/lib/command-panel-view.coffee +++ b/src/packages/command-panel/lib/command-panel-view.coffee @@ -11,8 +11,8 @@ module.exports = class CommandPanelView extends View @content: -> @div class: 'command-panel tool-panel', => - @div class: 'loading is-loading', outlet: 'loadingMessage', 'Searching...' @div class: 'header', outlet: 'previewHeader', => + @span outlet: 'searchLoadingMessage', class: 'loading', 'Searching...' @ul outlet: 'expandCollapse', class: 'expand-collapse', => @li class: 'expand', 'Expand All' @li class: 'collapse', 'Collapse All' @@ -53,7 +53,7 @@ class CommandPanelView extends View @previewList.hide() @previewHeader.hide() @errorMessages.hide() - @loadingMessage.hide() + @searchLoadingMessage.hide() @prompt.iconSize(@miniEditor.getFontSize()) @history = state.history ? [] @@ -116,12 +116,13 @@ class CommandPanelView extends View @miniEditor.getText() execute: (command=@escapedCommand()) -> - @loadingMessage.show() + @previewHeader.show() + @searchLoadingMessage.show() @errorMessages.empty() try @commandInterpreter.eval(command, rootView.getActivePaneItem()).done ({operationsToPreview, errorMessages}) => - @loadingMessage.hide() + @searchLoadingMessage.hide() @history.push(command) @historyIndex = @history.length @@ -131,8 +132,6 @@ class CommandPanelView extends View @errorMessages.append $$ -> @li errorMessage for errorMessage in errorMessages else if operationsToPreview?.length - @previewHeader.show() - @previewList.populate(operationsToPreview) @previewList.focus() @previewCount.text("#{_.pluralize(operationsToPreview.length, 'match', 'matches')} in #{_.pluralize(@previewList.getPathCount(), 'file')}").show() else diff --git a/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee b/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee index 619378ed3..0bb1480b0 100644 --- a/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee +++ b/src/packages/command-panel/lib/commands/select-all-matches-in-project.coffee @@ -8,17 +8,21 @@ class SelectAllMatchesInProject extends Command previewOperations: true constructor: (pattern) -> - @regex = new RegExp(pattern, 'g') + debugger; + @regex = new RegExp(pattern) compile: (project, buffer, range) -> deferred = $.Deferred() operations = [] promise = project.scan @regex, ({path, range}) -> - operations.push(new Operation( + debugger; + op = new Operation( project: project path: path bufferRange: range - )) + ) + deferred.resolve([op]) + operations.push(op) - promise.done -> deferred.resolve(operations) + promise.done# -> deferred.resolve(operations) deferred.promise() diff --git a/src/packages/command-panel/lib/preview-list.coffee b/src/packages/command-panel/lib/preview-list.coffee index 7f70db89d..28169abe6 100644 --- a/src/packages/command-panel/lib/preview-list.coffee +++ b/src/packages/command-panel/lib/preview-list.coffee @@ -39,7 +39,8 @@ class PreviewList extends ScrollView hasOperations: -> @operations? populate: (operations) -> - @destroyOperations() if @operations + debugger; + #@destroyOperations() if @operations @operations = operations @lastRenderedOperationIndex = 0 @empty() diff --git a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee index 538988957..0748ac8d2 100644 --- a/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee +++ b/src/packages/fuzzy-finder/lib/fuzzy-finder-view.coffee @@ -147,6 +147,7 @@ class FuzzyFinderView extends SelectList path.indexOf(options.filter) >= 0 else @projectPaths + console.log listedItems @setArray(listedItems) options.done(listedItems) if options.done? else