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

Fix minor chain building bug in kotlin

Browse Source
This commit is contained in:
Vitaliy.Bibaev
2017-10-26 13:10:41 +03:00
committed by Yan Zhulanow
parent 4573069a8d
commit ac956a46df
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinChainBuilderBase.kt
+6 -3
View File
@@ -6,6 +6,7 @@ import com.intellij.debugger.streams.psi.PsiUtil
import com.intellij.debugger.streams.wrapper.StreamChain import com.intellij.debugger.streams.wrapper.StreamChain
import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.debugger.streams.wrapper.StreamChainBuilder
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiWhiteSpace
import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.*
/** /**
@@ -15,7 +16,8 @@ abstract class KotlinChainBuilderBase(private val transformer: ChainTransformer<
protected abstract val existenceChecker: ExistenceChecker protected abstract val existenceChecker: ExistenceChecker
override fun isChainExists(startElement: PsiElement): Boolean { override fun isChainExists(startElement: PsiElement): Boolean {
var element: PsiElement? = getLatestElementInScope(PsiUtil.ignoreWhiteSpaces(startElement)) val start = if (startElement is PsiWhiteSpace) PsiUtil.ignoreWhiteSpaces(startElement) else startElement
var element = getLatestElementInScope(start)
existenceChecker.reset() existenceChecker.reset()
while (element != null && !existenceChecker.isFound()) { while (element != null && !existenceChecker.isFound()) {
existenceChecker.reset() existenceChecker.reset()
@@ -28,7 +30,8 @@ abstract class KotlinChainBuilderBase(private val transformer: ChainTransformer<
override fun build(startElement: PsiElement): List<StreamChain> { override fun build(startElement: PsiElement): List<StreamChain> {
val visitor = createChainsBuilder() val visitor = createChainsBuilder()
var element = getLatestElementInScope(PsiUtil.ignoreWhiteSpaces(startElement)) val start = if (startElement is PsiWhiteSpace) PsiUtil.ignoreWhiteSpaces(startElement) else startElement
var element = getLatestElementInScope(start)
while (element != null) { while (element != null) {
element.accept(visitor) element.accept(visitor)
element = getLatestElementInScope(toUpperLevel(element)) element = getLatestElementInScope(toUpperLevel(element))
@@ -53,7 +56,7 @@ abstract class KotlinChainBuilderBase(private val transformer: ChainTransformer<
var current = element var current = element
while (current != null) { while (current != null) {
val parent = current.parent val parent = current.parent
if (parent is KtBlockExpression || parent is KtLambdaExpression || parent is KtStatementExpression) { if (parent is KtBlockExpression || parent is KtLambdaExpression) {
break break
} }