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

Fix nesting level calculation for children of partially-folded nodes

Browse Source 
Signed-off-by: Nathan Sobo <nathan@github.com>
This commit is contained in:
Max Brunsfeld
2017-12-07 15:30:48 -08:00
committed by Nathan Sobo
parent 136dc86584
commit f712de65d0
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spec/tree-sitter-language-mode-spec.js
View File

@@ -336,6 +336,20 @@ describe('TreeSitterLanguageMode', () => {
#ifndef FOO_H_…
#endif
`)
editor.foldAllAtIndentLevel(1)
expect(getDisplayText(editor)).toBe(dedent `
#ifndef FOO_H_
#define FOO_H_
#ifdef _WIN32…
#elif defined MACOS…
#else…
#endif
#endif
`)
})
describe('when folding a node that ends with a line break', () => {

2
src/text-editor.js
View File

@@ -3891,7 +3891,7 @@ class TextEditor {
// Extended: Fold all foldable lines at the given indent level.
//
// * `level` A {Number}.
// * `level` A {Number} starting at 0.
foldAllAtIndentLevel (level) {
const languageMode = this.buffer.getLanguageMode()
const foldableRanges = (

22
src/tree-sitter-language-mode.js
View File

@@ -138,10 +138,7 @@ class TreeSitterLanguageMode {
let stack = [{node: this.document.rootNode, level: 0}]
while (stack.length > 0) {
const {node, level} = stack.pop()
const startRow = node.startPosition.row
const endRow = node.endPosition.row
let childLevel = level
const range = this.getFoldableRangeForNode(node)
if (range) {
if (goalLevel == null || level === goalLevel) {
@@ -155,18 +152,23 @@ class TreeSitterLanguageMode {
}
if (!updatedExistingRange) result.push(range)
}
childLevel++
}
const parentStartRow = node.startPosition.row
const parentEndRow = node.endPosition.row
for (let children = node.namedChildren, i = 0, {length} = children; i < length; i++) {
const child = children[i]
const childStartRow = child.startPosition.row
const childEndRow = child.endPosition.row
if (childEndRow > childStartRow) {
if (childStartRow === startRow && childEndRow === endRow) {
const {startPosition: childStart, endPosition: childEnd} = child
if (childEnd.row > childStart.row) {
if (childStart.row === parentStartRow && childEnd.row === parentEndRow) {
stack.push({node: child, level: level})
} else if (childLevel <= goalLevel || goalLevel == null) {
stack.push({node: child, level: childLevel})
} else {
const childLevel = range.containsPoint(childStart) && range.containsPoint(childEnd)
? level + 1
: level
if (childLevel <= goalLevel || goalLevel == null) {
stack.push({node: child, level: childLevel})
}
}
}
}