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

Debugger: Fix language detection in FUS

Browse Source
This commit is contained in:
Yan Zhulanow
2019-10-10 22:37:41 +09:00
parent f3cae210f8
commit 9c88a1f807
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/jvm-debugger/jvm-debugger-evaluation/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt
+6 -4
View File
@@ -103,10 +103,12 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, private val sourcePositi
status.evaluationType(evaluationType)
}
val language = when (codeFragment.language) {
KotlinLanguage.INSTANCE -> EvaluationContextLanguage.Kotlin
JavaLanguage.INSTANCE -> EvaluationContextLanguage.Java
else -> EvaluationContextLanguage.Other
val language = runReadAction {
when {
codeFragment.getCopyableUserData(KtCodeFragment.FAKE_CONTEXT_FOR_JAVA_FILE) != null -> EvaluationContextLanguage.Java
codeFragment.context?.language == KotlinLanguage.INSTANCE -> EvaluationContextLanguage.Kotlin
else -> EvaluationContextLanguage.Other
}
}
status.contextLanguage(language)