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

Simplify TreeSitterHighlightIterator.moveToSuccessor

Browse Source
This commit is contained in:
Max Brunsfeld
2018-02-16 09:40:57 -08:00
parent 82d5974616
commit cd997e3d77
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -420,7 +420,7 @@ class TreeSitterHighlightIterator {
this.pushCloseTag()
const {nextSibling} = this.currentNode
if (nextSibling) {
if (nextSibling && nextSibling.endIndex > this.currentIndex) {
this.currentNode = nextSibling
this.currentChildIndex++
if (this.currentIndex === nextSibling.startIndex) {
@@ -434,19 +434,8 @@ class TreeSitterHighlightIterator {
if (!this.currentNode) break
}
}
} else if (this.currentNode.startIndex < this.currentNode.endIndex) {
this.currentNode = this.currentNode.nextSibling
if (this.currentNode) {
this.currentChildIndex++
this.currentPosition = this.currentNode.startPosition
this.currentIndex = this.currentNode.startIndex
this.pushOpenTag()
this.descendLeft()
}
} else {
this.pushCloseTag()
this.currentNode = this.currentNode.parent
this.currentChildIndex = last(this.containingNodeChildIndices)
this.currentNode = this.currentNode.nextSibling
}
} while (this.closeTags.length === 0 && this.openTags.length === 0 && this.currentNode)