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

Avoid unnecessary work in TokenizedBuffer.isFoldableAtRow

Browse Source
This commit is contained in:
Max Brunsfeld
2017-10-03 12:31:33 -07:00
parent c46140946e
commit c9c4957921
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/tokenized-buffer.js
View File

@@ -471,7 +471,7 @@ class TokenizedBuffer {
}
isFoldableAtRow (row) {
return this.endRowForFoldAtRow(row, 1) != null
return this.endRowForFoldAtRow(row, 1, true) != null
}
buildTokenizedLinesForRows (startRow, endRow, startingStack, startingopenScopes) {
@@ -773,27 +773,28 @@ class TokenizedBuffer {
return result
}
endRowForFoldAtRow (row, tabLength) {
endRowForFoldAtRow (row, tabLength, existenceOnly = false) {
if (this.isRowCommented(row)) {
return this.endRowForCommentFoldAtRow(row)
return this.endRowForCommentFoldAtRow(row, existenceOnly)
} else {
return this.endRowForCodeFoldAtRow(row, tabLength)
return this.endRowForCodeFoldAtRow(row, tabLength, existenceOnly)
}
}
endRowForCommentFoldAtRow (row) {
endRowForCommentFoldAtRow (row, existenceOnly) {
if (this.isRowCommented(row - 1)) return
let endRow
for (let nextRow = row + 1, end = this.buffer.getLineCount(); nextRow < end; nextRow++) {
if (!this.isRowCommented(nextRow)) break
endRow = nextRow
if (existenceOnly) break
}
return endRow
}
endRowForCodeFoldAtRow (row, tabLength) {
endRowForCodeFoldAtRow (row, tabLength, existenceOnly) {
let foldEndRow
const line = this.buffer.lineForRow(row)
if (!NON_WHITESPACE_REGEX.test(line)) return
@@ -811,6 +812,7 @@ class TokenizedBuffer {
break
}
foldEndRow = nextRow
if (existenceOnly) break
}
return foldEndRow
}