Debugger: fix imports if context element is inside inline lambda
This commit is contained in:
@@ -131,6 +131,14 @@ public abstract class KtCodeFragment(
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public fun getContextContainingFile(): KtFile? {
|
||||||
|
val contextFile = (getContext() as? KtElement)?.getContainingKtFile()
|
||||||
|
if (contextFile is KtCodeFragment) {
|
||||||
|
return contextFile.getContextContainingFile()
|
||||||
|
}
|
||||||
|
return contextFile
|
||||||
|
}
|
||||||
|
|
||||||
private fun initImports(imports: String?) {
|
private fun initImports(imports: String?) {
|
||||||
if (imports != null && !imports.isEmpty()) {
|
if (imports != null && !imports.isEmpty()) {
|
||||||
this.imports.addAll(imports.split(IMPORT_SEPARATOR).map { it.check { it.startsWith("import ") } ?: "import $it" })
|
this.imports.addAll(imports.split(IMPORT_SEPARATOR).map { it.check { it.startsWith("import ") } ?: "import $it" })
|
||||||
|
|||||||
@@ -479,7 +479,7 @@ package packageForDebugger
|
|||||||
private fun createFileForDebugger(codeFragment: KtCodeFragment,
|
private fun createFileForDebugger(codeFragment: KtCodeFragment,
|
||||||
extractedFunction: KtNamedFunction
|
extractedFunction: KtNamedFunction
|
||||||
): KtFile {
|
): KtFile {
|
||||||
val containingContextFile = (codeFragment.context as? KtElement)?.getContainingKtFile()
|
val containingContextFile = codeFragment.getContextContainingFile()
|
||||||
val importsFromContextFile = containingContextFile?.importList?.let { it.text + "\n" } ?: ""
|
val importsFromContextFile = containingContextFile?.importList?.let { it.text + "\n" } ?: ""
|
||||||
val packageFromContextFile = containingContextFile?.packageName?.let {
|
val packageFromContextFile = containingContextFile?.packageName?.let {
|
||||||
if (it.isNotBlank()) "import $it.*\n" else null
|
if (it.isNotBlank()) "import $it.*\n" else null
|
||||||
|
|||||||
@@ -0,0 +1,11 @@
|
|||||||
|
LineBreakpoint created at importsLambdaContext.kt:10 lambdaOrdinal = 0
|
||||||
|
!JDK_HOME!\bin\java -agentlib:jdwp=transport=dt_socket,address=!HOST_NAME!:!HOST_PORT!,suspend=y,server=n -Dfile.encoding=!FILE_ENCODING! -classpath !OUTPUT_PATH!;!KOTLIN_RUNTIME!;!CUSTOM_LIBRARY!;!RT_JAR! importsLambdaContext.ImportsLambdaContextKt
|
||||||
|
Connected to the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
|
||||||
|
importsLambdaContext.kt:10
|
||||||
|
Compile bytecode for Collections.emptyList<String>()
|
||||||
|
Compile bytecode for ArrayList<Int>()
|
||||||
|
Compile bytecode for HashSet<Int>()
|
||||||
|
Compile bytecode for JHashMap<Int, Int>()
|
||||||
|
Disconnected from the target VM, address: '!HOST_NAME!:PORT_NAME!', transport: 'socket'
|
||||||
|
|
||||||
|
Process finished with exit code 0
|
||||||
+23
@@ -0,0 +1,23 @@
|
|||||||
|
package importsLambdaContext
|
||||||
|
|
||||||
|
import java.util.Collections
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashSet
|
||||||
|
import java.util.HashMap as JHashMap
|
||||||
|
|
||||||
|
fun main(args: Array<String>) {
|
||||||
|
//Breakpoint! (lambdaOrdinal = 0)
|
||||||
|
arrayOf(1).map { args.size() }
|
||||||
|
}
|
||||||
|
|
||||||
|
// EXPRESSION: Collections.emptyList<String>()
|
||||||
|
// RESULT: instance of java.util.Collections$EmptyList(id=ID): Ljava/util/Collections$EmptyList;
|
||||||
|
|
||||||
|
// EXPRESSION: ArrayList<Int>()
|
||||||
|
// RESULT: instance of java.util.ArrayList(id=ID): Ljava/util/ArrayList;
|
||||||
|
|
||||||
|
// EXPRESSION: HashSet<Int>()
|
||||||
|
// RESULT: instance of java.util.HashSet(id=ID): Ljava/util/HashSet;
|
||||||
|
|
||||||
|
// EXPRESSION: JHashMap<Int, Int>()
|
||||||
|
// RESULT: instance of java.util.HashMap(id=ID): Ljava/util/HashMap;
|
||||||
+6
@@ -151,6 +151,12 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat
|
|||||||
doSingleBreakpointTest(fileName);
|
doSingleBreakpointTest(fileName);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@TestMetadata("importsLambdaContext.kt")
|
||||||
|
public void testImportsLambdaContext() throws Exception {
|
||||||
|
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/importsLambdaContext.kt");
|
||||||
|
doSingleBreakpointTest(fileName);
|
||||||
|
}
|
||||||
|
|
||||||
@TestMetadata("inlineFunction.kt")
|
@TestMetadata("inlineFunction.kt")
|
||||||
public void testInlineFunction() throws Exception {
|
public void testInlineFunction() throws Exception {
|
||||||
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunction.kt");
|
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint/inlineFunction.kt");
|
||||||
|
|||||||
Reference in New Issue
Block a user