github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add specs for initialLine and initialColumn, simplify implementation

Browse Source
This commit is contained in:
Nathan Sobo
2015-08-10 11:27:15 -06:00
parent 393728ee8b
commit 69da157ecb
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spec/workspace-spec.coffee
View File

@@ -225,6 +225,26 @@ describe "Workspace", ->
expect(workspace.paneContainer.root.children[0]).toBe pane1
expect(workspace.paneContainer.root.children[1]).toBe pane4
describe "when an initialLine and initialColumn are specified", ->
it "moves the cursor to the indicated location", ->
waitsForPromise ->
workspace.open('a', initialLine: 1, initialColumn: 5)
runs ->
expect(workspace.getActiveTextEditor().getCursorBufferPosition()).toEqual [1, 5]
waitsForPromise ->
workspace.open('a', initialLine: 2, initialColumn: 4)
runs ->
expect(workspace.getActiveTextEditor().getCursorBufferPosition()).toEqual [2, 4]
waitsForPromise ->
workspace.open('a', initialLine: 0, initialColumn: 0)
runs ->
expect(workspace.getActiveTextEditor().getCursorBufferPosition()).toEqual [0, 0]
describe "when the file is over 2MB", ->
it "opens the editor with largeFileMode: true", ->
spyOn(fs, 'getSizeSync').andReturn 2 * 1048577 # 2MB

2
src/workspace.coffee
View File

@@ -472,7 +472,7 @@ class Workspace extends Model
initialLine = options.initialLine
if Number.isFinite(options.initialColumn)
initialColumn = options.initialColumn
if initialLine > 0 or initialColumn > 0 or options.initialLine? or options.initialColumn?
if initialLine >= 0 or initialColumn >= 0
item.setCursorBufferPosition?([initialLine, initialColumn])
index = pane.getActiveItemIndex()