github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-25 14:59:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Folds include their first line

Browse Source
This commit is contained in:
Corey Johnson
2012-05-30 16:55:15 -07:00
parent 42e743f44a
commit 17b50ee8dc
5 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/app/editor-spec.coffee
View File

@@ -2443,10 +2443,10 @@ describe "Editor", ->
editor.setCursorBufferPosition([1,0])
editor.trigger "toggle-fold"
expect(editor.screenLineForRow(2).fold).toBeDefined()
expect(editor.screenLineForRow(1).fold).toBeDefined()
editor.trigger "toggle-fold"
expect(editor.screenLineForRow(2).fold).toBeUndefined()
expect(editor.screenLineForRow(1).fold).toBeUndefined()
describe "primitive folding", ->
beforeEach ->

6
spec/app/fold-suggester-spec.coffee
View File

@@ -19,8 +19,8 @@ describe "FoldSuggester", ->
describe ".rowRangeForFoldAtBufferRow(bufferRow)", ->
it "returns the start/end rows of the foldable region starting at the given row", ->
expect(foldSuggester.rowRangeForFoldAtBufferRow(0)).toEqual [1, 12]
expect(foldSuggester.rowRangeForFoldAtBufferRow(1)).toEqual [2, 9]
expect(foldSuggester.rowRangeForFoldAtBufferRow(0)).toEqual [0, 12]
expect(foldSuggester.rowRangeForFoldAtBufferRow(1)).toEqual [1, 9]
expect(foldSuggester.rowRangeForFoldAtBufferRow(2)).toBeNull()
expect(foldSuggester.rowRangeForFoldAtBufferRow(4)).toEqual [5, 7]
expect(foldSuggester.rowRangeForFoldAtBufferRow(4)).toEqual [4, 7]

16
spec/app/renderer-spec.coffee
View File

@@ -161,26 +161,20 @@ describe "Renderer", ->
describe "when bufferRow can be folded", ->
it "creates/destroys a fold based on the syntactic region starting at the given row", ->
renderer.toggleFoldAtBufferRow(1)
fold = renderer.lineForRow(2).fold
expect(fold.startRow).toBe 2
fold = renderer.lineForRow(1).fold
expect(fold.startRow).toBe 1
expect(fold.endRow).toBe 9
renderer.toggleFoldAtBufferRow(1)
expect(renderer.lineForRow(2).fold).toBeUndefined()
expect(renderer.lineForRow(1).fold).toBeUndefined()
describe "when bufferRow can't be folded", ->
it "searches upward for the first row that begins a syntatic region containing the given buffer row (and folds it)", ->
renderer.toggleFoldAtBufferRow(8)
fold = renderer.lineForRow(2).fold
expect(fold.startRow).toBe 2
fold = renderer.lineForRow(1).fold
expect(fold.startRow).toBe 1
expect(fold.endRow).toBe 9
describe "when the cursor is on a folded line", ->
it "destroys the fold", ->
renderer.toggleFoldAtBufferRow(1)
renderer.toggleFoldAtBufferRow(2)
expect(renderer.lineForRow(2).fold).toBeUndefined()
describe "primitive folding", ->
beforeEach ->
buffer = new Buffer(require.resolve 'fixtures/two-hundred.txt')

2
src/app/fold-suggester.coffee
View File

@@ -12,6 +12,6 @@ class FoldSuggester
rowRangeForFoldAtBufferRow: (bufferRow) ->
if aceRange = @aceFoldMode?.getFoldWidgetRange(@aceFoldAdaptor, null, bufferRow)
[aceRange.start.row + 1, aceRange.end.row]
[aceRange.start.row, aceRange.end.row]
else
null

23
src/app/renderer.coffee
View File

@@ -54,21 +54,16 @@ class Renderer
@lineMap.bufferRowsForScreenRows(startRow, endRow)
toggleFoldAtBufferRow: (bufferRow) ->
if fold = @largestFoldForBufferRow(bufferRow)
fold.destroy()
else
rowToFold = bufferRow
while rowToFold >= 0
rowRange = @foldSuggester.rowRangeForFoldAtBufferRow(rowToFold)
if rowRange and (rowRange[0] - 1) <= bufferRow <= rowRange[1]
if fold = @largestFoldForBufferRow(rowRange[0])
fold.destroy()
else
@createFold(rowRange...)
for currentRow in [bufferRow..0]
[startRow, endRow] = @foldSuggester.rowRangeForFoldAtBufferRow(currentRow) ? []
continue unless startRow and startRow <= bufferRow <= endRow
return
else
rowToFold--
if fold = @largestFoldForBufferRow(startRow)
fold.destroy()
else
@createFold(startRow, endRow)
break
createFold: (startRow, endRow) ->
fold = new Fold(this, startRow, endRow)