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

Evaluate expression: change message when extracted function is null

Browse Source
This commit is contained in:
Natalia Ukhorskaya
2014-10-07 16:07:17 +04:00
parent f5c08c4868
commit e125375654
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt
+7 -2
View File
@@ -122,7 +122,12 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
throw e throw e
} }
catch (e: Exception) { catch (e: Exception) {
logger.error("Couldn't evaluate expression:\nfileText = ${sourcePosition.getFile().getText()}\nline = ${sourcePosition.getLine()}\ncodeFragment = ${codeFragment.getText()}", e) logger.error("Couldn't evaluate expression:\n" +
"FILE NAME: ${sourcePosition.getFile().getName()}\n" +
"BREAKPOINT LINE: ${sourcePosition.getLine()}\n" +
"CODE FRAGMENT:\n${codeFragment.getText()}\n" +
"FILE TEXT: \n${sourcePosition.getFile().getText()}\n", e)
val cause = if (e.getMessage() != null) ": ${e.getMessage()}" else "" val cause = if (e.getMessage() != null) ": ${e.getMessage()}" else ""
exception("An exception occurs during Evaluate Expression Action $cause") exception("An exception occurs during Evaluate Expression Action $cause")
} }
@@ -136,7 +141,7 @@ class KotlinEvaluator(val codeFragment: JetCodeFragment,
private fun extractAndCompile(codeFragment: JetCodeFragment, sourcePosition: SourcePosition): CompiledDataDescriptor { private fun extractAndCompile(codeFragment: JetCodeFragment, sourcePosition: SourcePosition): CompiledDataDescriptor {
val extractedFunction = getFunctionForExtractedFragment(codeFragment, sourcePosition.getFile(), sourcePosition.getLine()) val extractedFunction = getFunctionForExtractedFragment(codeFragment, sourcePosition.getFile(), sourcePosition.getLine())
if (extractedFunction == null) { if (extractedFunction == null) {
throw IllegalStateException("Code fragment cannot be extracted to function: ${sourcePosition.getFile().getText()}:${sourcePosition.getLine()},\ncodeFragment = ${codeFragment.getText()}") throw IllegalStateException("Code fragment cannot be extracted to function")
} }
val classFileFactory = createClassFileFactory(codeFragment, extractedFunction) val classFileFactory = createClassFileFactory(codeFragment, extractedFunction)