diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt index e891f5c652a..9854e4a6b5a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -355,22 +355,22 @@ class KotlinEvaluator(val codeFragment: KtCodeFragment, val sourcePosition: Sour parameters: ParametersDescriptor ): ClassFileFactory { return runReadAction { - val jetFile = createFileForDebugger(codeFragment, extractedFunction) + val fileForDebugger = createFileForDebugger(codeFragment, extractedFunction) if (LOG.isDebugEnabled) { - LOG.debug("File for eval4j:\n${runReadAction { jetFile.text }}") + LOG.debug("File for eval4j:\n${runReadAction { fileForDebugger.text }}") } - val (bindingContext, moduleDescriptor, files) = jetFile.checkForErrors(true, codeFragment.getContextContainingFile()) + val (bindingContext, moduleDescriptor, files) = fileForDebugger.checkForErrors(true, codeFragment.getContextContainingFile()) val generateClassFilter = object : GenerationState.GenerateClassFilter() { - override fun shouldGeneratePackagePart(jetFile: KtFile) = jetFile == jetFile + override fun shouldGeneratePackagePart(jetFile: KtFile) = jetFile == fileForDebugger override fun shouldAnnotateClass(processingClassOrObject: KtClassOrObject) = true - override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject) = processingClassOrObject.getContainingKtFile() == jetFile + override fun shouldGenerateClass(processingClassOrObject: KtClassOrObject) = processingClassOrObject.getContainingKtFile() == fileForDebugger override fun shouldGenerateScript(script: KtScript) = false } val state = GenerationState( - jetFile.project, + fileForDebugger.project, if (!DEBUG_MODE) ClassBuilderFactories.BINARIES else ClassBuilderFactories.TEST, moduleDescriptor, bindingContext, diff --git a/idea/testData/debugger/tinyApp/src/forTests/inlineFunction2.kt b/idea/testData/debugger/tinyApp/src/forTests/inlineFunction2.kt index 657d0ddcd9f..a8f5fb3d6e2 100644 --- a/idea/testData/debugger/tinyApp/src/forTests/inlineFunction2.kt +++ b/idea/testData/debugger/tinyApp/src/forTests/inlineFunction2.kt @@ -1,3 +1,8 @@ package inlineFunctionOtherPackage -inline fun myFun(f: () -> Int): Int = f() \ No newline at end of file +inline fun myFun(f: () -> Int): Int = f() + +val String.prop: String + get() { + return "a" + } \ No newline at end of file