From 95dcf275e455d9b375a84faa89ab46162409f38a Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 8 Jan 2013 18:26:37 -0800 Subject: [PATCH] Remove *.getLastCursor() --- spec/app/edit-session-spec.coffee | 14 +++++++------- src/app/cursor.coffee | 2 +- src/app/edit-session.coffee | 9 +++------ src/app/editor.coffee | 1 - src/packages/snippets/src/snippets.coffee | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/spec/app/edit-session-spec.coffee b/spec/app/edit-session-spec.coffee index 9cb7164c6..4b70927d9 100644 --- a/spec/app/edit-session-spec.coffee +++ b/spec/app/edit-session-spec.coffee @@ -1727,7 +1727,7 @@ describe "EditSession", -> expect(cursor3.getScreenPosition()).toEqual [1, 0] it "does not destroy cursor or selection anchors when a change encompasses them", -> - cursor = editSession.getLastCursor() + cursor = editSession.getCursor() cursor.setBufferPosition [3, 3] editSession.buffer.delete([[3, 1], [3, 5]]) expect(cursor.getBufferPosition()).toEqual [3, 1] @@ -1791,7 +1791,7 @@ describe "EditSession", -> describe ".deleteLine()", -> it "deletes the first line when the cursor is there", -> - editSession.getLastCursor().moveToTop() + editSession.getCursor().moveToTop() line1 = buffer.lineForRow(1) count = buffer.getLineCount() expect(buffer.lineForRow(0)).not.toBe(line1) @@ -1803,7 +1803,7 @@ describe "EditSession", -> count = buffer.getLineCount() secondToLastLine = buffer.lineForRow(count - 2) expect(buffer.lineForRow(count - 1)).not.toBe(secondToLastLine) - editSession.getLastCursor().moveToBottom() + editSession.getCursor().moveToBottom() editSession.deleteLine() newCount = buffer.getLineCount() expect(buffer.lineForRow(newCount - 1)).toBe(secondToLastLine) @@ -1830,8 +1830,8 @@ describe "EditSession", -> it "deletes the entire region when invoke on a folded region", -> editSession.foldBufferRow(1) - editSession.getLastCursor().moveToTop() - editSession.getLastCursor().moveDown() + editSession.getCursor().moveToTop() + editSession.getCursor().moveDown() expect(buffer.getLineCount()).toBe(13) editSession.deleteLine() expect(buffer.getLineCount()).toBe(4) @@ -1840,7 +1840,7 @@ describe "EditSession", -> count = buffer.getLineCount() expect(count).toBeGreaterThan(0) for line in [0...count] - editSession.getLastCursor().moveToBottom() + editSession.getCursor().moveToBottom() editSession.deleteLine() expect(buffer.getLineCount()).toBe(1) expect(buffer.getText()).toBe('') @@ -1849,7 +1849,7 @@ describe "EditSession", -> count = buffer.getLineCount() expect(count).toBeGreaterThan(0) for line in [0...count] - editSession.getLastCursor().moveToTop() + editSession.getCursor().moveToTop() editSession.deleteLine() expect(buffer.getLineCount()).toBe(1) expect(buffer.getText()).toBe('') diff --git a/src/app/cursor.coffee b/src/app/cursor.coffee index afeb7c37e..da44e890e 100644 --- a/src/app/cursor.coffee +++ b/src/app/cursor.coffee @@ -57,7 +57,7 @@ class Cursor isVisible: -> @visible isLastCursor: -> - this == @editSession.getLastCursor() + this == @editSession.getCursor() autoscrolled: -> @needsAutoscroll = false diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee index 3a10b0b95..04aa8d523 100644 --- a/src/app/edit-session.coffee +++ b/src/app/edit-session.coffee @@ -370,9 +370,6 @@ class EditSession getCursor: -> _.last(@cursors) - getLastCursor: -> - _.last(@cursors) - addCursorAtScreenPosition: (screenPosition) -> @addCursor(new Cursor(editSession: this, screenPosition: screenPosition)) @@ -455,16 +452,16 @@ class EditSession @moveCursors (cursor) -> cursor.setScreenPosition(position) getCursorScreenPosition: -> - @getLastCursor().getScreenPosition() + @getCursor().getScreenPosition() getCursorScreenRow: -> - @getLastCursor().getScreenRow() + @getCursor().getScreenRow() setCursorBufferPosition: (position, options) -> @moveCursors (cursor) -> cursor.setBufferPosition(position, options) getCursorBufferPosition: -> - @getLastCursor().getBufferPosition() + @getCursor().getBufferPosition() getSelectedScreenRange: -> @getLastSelection().getScreenRange() diff --git a/src/app/editor.coffee b/src/app/editor.coffee index 380c71cd3..90d473597 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -187,7 +187,6 @@ class Editor extends View getCursor: -> @activeEditSession.getCursor() getCursors: -> @activeEditSession.getCursors() - getLastCursor: -> @activeEditSession.getLastCursor() addCursorAtScreenPosition: (screenPosition) -> @activeEditSession.addCursorAtScreenPosition(screenPosition) addCursorAtBufferPosition: (bufferPosition) -> @activeEditSession.addCursorAtBufferPosition(bufferPosition) moveCursorUp: -> @activeEditSession.moveCursorUp() diff --git a/src/packages/snippets/src/snippets.coffee b/src/packages/snippets/src/snippets.coffee index fc77ddf59..2d06d3998 100644 --- a/src/packages/snippets/src/snippets.coffee +++ b/src/packages/snippets/src/snippets.coffee @@ -26,7 +26,7 @@ module.exports = enableSnippetsInEditor: (editor) -> editor.command 'snippets:expand', (e) => editSession = editor.activeEditSession - prefix = editSession.getLastCursor().getCurrentWordPrefix() + prefix = editSession.getCursor().getCurrentWordPrefix() if snippet = @snippetsByExtension[editSession.getFileExtension()]?[prefix] editSession.transact -> snippetExpansion = new SnippetExpansion(snippet, editSession)