Stash changes

This commit is contained in:
Garen Torikian
2013-03-31 00:22:27 -07:00
parent 209eceee6a
commit 7f8e2aba1b
4 changed files with 6 additions and 4 deletions

View File

@@ -176,7 +176,7 @@ class Project
for [column, length] in matchPositions
range = new Range([row, column], [row, column + length])
match = lineText.substr(column + 1, length)
match = lineText.substr(column , length)
iterator({path, range, match, lineText})
deferred = $.Deferred()
@@ -192,7 +192,7 @@ class Project
readPath(line) if state is 'readingPath'
readLine(line) if state is 'readingLines'
command = require.resolve 'nak'
command = require.resolve('nak')
args = ['--ackmate', regex.source, @getPath()]
args.unshift("--addVCSIgnores") if config.get('nak.addVCSIgnores')
new BufferedProcess({command, args, stdout, exit})

View File

@@ -144,6 +144,7 @@ class CommandPanelView extends View
@errorMessages.append $$ ->
@li errorMessage for errorMessage in errorMessages
else if operationsToPreview?.length
@previewList.show()
@previewList.focus()
@previewCount.text("#{_.pluralize(operationsToPreview.length, 'match', 'matches')} in #{_.pluralize(@previewList.getPathCount(operationsToPreview), 'file')}").show()
else

View File

@@ -25,7 +25,7 @@ class Operation
preview: ->
range = @bufferRange
prefix = @lineText[0...range.start.column]
match = @lineText[range.start.column + 1...range.end.column]
match = @lineText[range.start.column...range.end.column]
suffix = @lineText[range.end.column..]
{prefix, suffix, match, range}

View File

@@ -49,7 +49,7 @@ class PreviewList extends ScrollView
populateSingle: (operation) ->
@viewsForPath ||= {}
@show()
@lastRenderedOperationIndex ||= 0
@renderOperation(operation)
@find('.operation:first').addClass('selected')
@@ -67,6 +67,7 @@ class PreviewList extends ScrollView
startingScrollHeight = @prop('scrollHeight')
pathView = @pathViewForPath(operation.getPath())
pathView.addOperation(operation)
@lastRenderedOperationIndex++
pathViewForPath: (path) ->
pathView = @viewsForPath[path]