azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Fix NPE in light tree source utils

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-12-15 12:58:34 +03:00
parent b048296dca
commit 7e9deb7602
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/LightTreePositioningStrategy.kt
+3 -3
View File
@@ -45,10 +45,10 @@ private val DOC_AND_COMMENT_TOKENS = setOf(
private fun hasSyntaxErrors(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): Boolean { private fun hasSyntaxErrors(node: LighterASTNode, tree: FlyweightCapableTreeStructure<LighterASTNode>): Boolean {
if (node.tokenType == TokenType.ERROR_ELEMENT) return true if (node.tokenType == TokenType.ERROR_ELEMENT) return true
val childrenRef = Ref<Array<LighterASTNode>>() val childrenRef = Ref<Array<LighterASTNode?>?>()
tree.getChildren(node, childrenRef) tree.getChildren(node, childrenRef)
val children = childrenRef.get() val children = childrenRef.get() ?: return false
return children.lastOrNull { return children.filterNotNull().lastOrNull {
val tokenType = it.tokenType val tokenType = it.tokenType
tokenType !is KtSingleValueToken && tokenType !in DOC_AND_COMMENT_TOKENS tokenType !is KtSingleValueToken && tokenType !in DOC_AND_COMMENT_TOKENS
}?.let { hasSyntaxErrors(it, tree) } == true }?.let { hasSyntaxErrors(it, tree) } == true