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

Highlight iterator - only ascend when at the last child

Browse Source
This commit is contained in:
Max Brunsfeld
2018-07-24 14:28:03 -07:00
parent 107ec432e5
commit aefc3233e3
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -849,15 +849,10 @@ class LayerHighlightIterator {
let result = false
const {endIndex} = this.treeCursor
let depth = this.containingNodeEndIndices.length
while (depth > 1) {
// Once the iterator has found a scope boundary, it needs to stay at the same
// position, so it should not move up if the parent node ends later than the
// current node.
if ((!atLastChild || this.openTags.length || this.closeTags.length) &&
this.containingNodeEndIndices[depth - 2] > endIndex) {
break
}
// The iterator should not move up until it has visited all of the children of this node.
while (depth > 1 && (atLastChild || this.containingNodeEndIndices[depth - 2] === endIndex)) {
atLastChild = false
result = true
this.treeCursor.gotoParent()
this.containingNodeTypes.pop()
@@ -873,10 +868,11 @@ class LayerHighlightIterator {
_moveDown () {
let result = false
const {startIndex} = this.treeCursor
// Once the iterator has found a scope boundary, it needs to stay at the same
// position, so it should not move down if the first child node starts later than the
// current node.
while (this.treeCursor.gotoFirstChild()) {
// Once the iterator has found a scope boundary, it needs to stay at the same
// position, so it should not move down if the first child node starts later than the
// current node.
if ((this.closeTags.length || this.openTags.length) &&
this.treeCursor.startIndex > startIndex) {
this.treeCursor.gotoParent()