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

Fix compilation in KotlinFrameExtractVariablesProvider

Browse Source 
(cherry picked from commit ed06e05)
This commit is contained in:
Nikolay Krasko
2015-10-16 21:20:59 +03:00
committed by Natalia Ukhorskaya
parent 15531d0bb7
commit 234360a471
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/debugger/KotlinFrameExtraVariablesProvider.kt
+4 -8
View File
@@ -40,18 +40,14 @@ import java.util.LinkedHashSet
import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully import org.jetbrains.kotlin.idea.caches.resolve.analyzeFully
public class KotlinFrameExtraVariablesProvider : FrameExtraVariablesProvider { public class KotlinFrameExtraVariablesProvider : FrameExtraVariablesProvider {
override fun isAvailable(sourcePosition: SourcePosition?, evalContext: EvaluationContext?): Boolean { override fun isAvailable(sourcePosition: SourcePosition, evalContext: EvaluationContext): Boolean {
if (sourcePosition == null) return false
if (sourcePosition.getLine() < 0) return false if (sourcePosition.getLine() < 0) return false
return sourcePosition.getFile().getFileType() == KotlinFileType.INSTANCE && DebuggerSettings.getInstance().AUTO_VARIABLES_MODE return sourcePosition.getFile().getFileType() == KotlinFileType.INSTANCE && DebuggerSettings.getInstance().AUTO_VARIABLES_MODE
} }
override fun collectVariables(sourcePosition: SourcePosition?, evalContext: EvaluationContext?, alreadyCollected: Set<String>? override fun collectVariables(
): Set<TextWithImports>? { sourcePosition: SourcePosition, evalContext: EvaluationContext, alreadyCollected: MutableSet<String>): Set<TextWithImports> {
if (sourcePosition != null) { return runReadAction { findAdditionalExpressions(sourcePosition) }
return runReadAction { findAdditionalExpressions(sourcePosition) }
}
return setOf()
} }
} }
idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt
+1 -1
View File
@@ -223,7 +223,7 @@ public abstract class AbstractKotlinEvaluateExpressionTest : KotlinDebuggerTestB
} }
fun getExtraVars(): Set<TextWithImports> { fun getExtraVars(): Set<TextWithImports> {
return KotlinFrameExtraVariablesProvider().collectVariables(debuggerContext!!.getSourcePosition(), evaluationContext, hashSetOf())!! return KotlinFrameExtraVariablesProvider().collectVariables(debuggerContext!!.getSourcePosition(), evaluationContext!!, hashSetOf())!!
} }
private inner class Printer() { private inner class Printer() {