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

Debugger: do not fail if j2k couldn't convert expression creating codeFragment from text

Browse Source
This commit is contained in:
Natalia Selezneva
2017-12-27 14:55:23 +03:00
committed by Nikolay Krasko
parent c023831a00
commit 4d6c83b5b9
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt
+18 -12
View File
@@ -242,21 +242,27 @@ class KotlinCodeFragmentFactory: CodeFragmentFactory() {
null null
} }
if (javaExpression != null) { if (javaExpression != null && !PsiTreeUtil.hasErrorElements(javaExpression)) {
var convertedFragment: KtExpressionCodeFragment? = null var convertedFragment: KtExpressionCodeFragment? = null
project.executeWriteCommand("Convert java expression to kotlin in Evaluate Expression") { project.executeWriteCommand("Convert java expression to kotlin in Evaluate Expression") {
val newText = javaExpression.j2kText() try {
val newImports = importList?.j2kText() val newText = javaExpression.j2kText()
if (newText != null) { val newImports = importList?.j2kText()
convertedFragment = KtExpressionCodeFragment( if (newText != null) {
project, convertedFragment = KtExpressionCodeFragment(
kotlinCodeFragment.name, project,
newText, kotlinCodeFragment.name,
newImports, newText,
kotlinCodeFragment.context newImports,
) kotlinCodeFragment.context
)
AfterConversionPass(project, J2kPostProcessor(formatCode = false)).run(convertedFragment!!, range = null) AfterConversionPass(project, J2kPostProcessor(formatCode = false)).run(convertedFragment!!, range = null)
}
}
catch (e: Throwable) {
// ignored because text can be invalid
LOG.error("Couldn't convert expression:\n`${javaExpression.text}`", e)
} }
} }
return convertedFragment ?: kotlinCodeFragment return convertedFragment ?: kotlinCodeFragment