github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-08 05:35:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ns-use-display-layers

Browse Source 
# Conflicts:
#	package.json
#	src/display-buffer.coffee
#	src/text-editor.coffee
#	src/tokenized-buffer.coffee
This commit is contained in:
Antonio Scandurra
2016-03-10 13:53:14 +01:00
parent 0243a345b7 4b017759c9
commit dfed7c4537
114 changed files with 2475 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/display-buffer.coffee
View File

@@ -393,7 +393,10 @@ class DisplayBuffer extends Model
@displayLayer.foldsIntersectingBufferRange(Range(Point(bufferRow, 0), Point(bufferRow, Infinity))).length > 0
isFoldedAtScreenRow: (screenRow) ->
@isFoldedAtBufferRow(@bufferRowForScreenRow(screenRow))?
@isFoldedAtBufferRow(@bufferRowForScreenRow(screenRow))
isFoldableAtBufferRow: (row) ->
@tokenizedBuffer.isFoldableAtRow(row)
# Removes any folds found that contain the given buffer row.
#