From f2306f444a84297cec0454aaa32bb08548d1a44a Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 1 Oct 2012 12:11:30 -0700 Subject: [PATCH] :lipstick: --- spec/app/editor-spec.coffee | 6 +++--- src/app/editor.coffee | 2 +- src/app/gutter.coffee | 2 +- src/app/selection.coffee | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee index ad8de671a..7e68c5b81 100644 --- a/spec/app/editor-spec.coffee +++ b/spec/app/editor-spec.coffee @@ -1635,7 +1635,7 @@ describe "Editor", -> it "doesn't highlight the backround", -> editor.getSelection().setBufferRange(new Range([0,0],[2,0])) - expect(editor.getSelection().isMultiLine()).toBe true + expect(editor.getSelection().isSingleScreenLine()).toBe false expect(editor.find('.line-number.cursor-line-number').length).toBe 1 expect(editor.find('.line-number.cursor-line-number.cursor-line-number-background').length).toBe 0 expect(editor.find('.line-number.cursor-line-number').text()).toBe "3" @@ -1683,13 +1683,13 @@ describe "Editor", -> describe "when there is a selection", -> it "highlights if the selection is contained to one line", -> editor.getSelection().setBufferRange(new Range([0,0],[0,1])) - expect(editor.getSelection().isMultiLine()).toBe false + expect(editor.getSelection().isSingleScreenLine()).toBe true expect(editor.find('.line.cursor-line').length).toBe 1 expect(editor.find('.line.cursor-line').text()).toBe buffer.lineForRow(0) it "doesn't highlight if the selection spans multiple lines", -> editor.getSelection().setBufferRange(new Range([0,0],[2,0])) - expect(editor.getSelection().isMultiLine()).toBe true + expect(editor.getSelection().isSingleScreenLine()).toBe false expect(editor.find('.line.cursor-line').length).toBe 0 describe "folding", -> diff --git a/src/app/editor.coffee b/src/app/editor.coffee index c93242965..fe6dc5d8b 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -954,5 +954,5 @@ class Editor extends View @cursorScreenRow = @getCursorScreenPosition().row screenRow = @cursorScreenRow - @firstRenderedScreenRow @find('pre.line.cursor-line').removeClass('cursor-line') - if !@getSelection().isMultiLine() + if @getSelection().isSingleScreenLine() @find("pre.line:eq(#{screenRow})").addClass('cursor-line') diff --git a/src/app/gutter.coffee b/src/app/gutter.coffee index d8668be3c..23f4a772d 100644 --- a/src/app/gutter.coffee +++ b/src/app/gutter.coffee @@ -69,5 +69,5 @@ class Gutter extends View newLineNumberRow = @find(".line-number:eq(#{screenRowIndex})") newLineNumberRow.addClass('cursor-line-number') - if !@editor().getSelection().isMultiLine() + if @editor().getSelection().isSingleScreenLine() newLineNumberRow.addClass('cursor-line-number-background') diff --git a/src/app/selection.coffee b/src/app/selection.coffee index 8daad3198..0e0b711f7 100644 --- a/src/app/selection.coffee +++ b/src/app/selection.coffee @@ -31,9 +31,8 @@ class Selection isReversed: -> not @isEmpty() and @cursor.getBufferPosition().isLessThan(@anchor.getBufferPosition()) - isMultiLine: -> - range = @getScreenRange() - range.start.row != range.end.row + isSingleScreenLine: -> + @getScreenRange().isSingleLine() getScreenRange: -> if @anchor