Debugger: Navigate to the right file in MPP projects (#KT-25152, #KT-25147)

plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3BuilderFactory.kt

@@ -1,83 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.kapt3
-
-import org.jetbrains.kotlin.codegen.AbstractClassBuilder
-import org.jetbrains.kotlin.codegen.ClassBuilder
-import org.jetbrains.kotlin.codegen.ClassBuilderFactory
-import org.jetbrains.kotlin.codegen.ClassBuilderMode
-import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
-import org.jetbrains.org.objectweb.asm.*
-import org.jetbrains.org.objectweb.asm.tree.*
-
-internal class Kapt3BuilderFactory : ClassBuilderFactory {
-    internal val compiledClasses = mutableListOf<ClassNode>()
-    internal val origins = mutableMapOf<Any, JvmDeclarationOrigin>()
-
-    override fun getClassBuilderMode(): ClassBuilderMode = ClassBuilderMode.KAPT3
-
-    override fun newClassBuilder(origin: JvmDeclarationOrigin): AbstractClassBuilder.Concrete {
-        val classNode = ClassNode()
-        compiledClasses += classNode
-        origins.put(classNode, origin)
-        return Kapt3ClassBuilder(classNode)
-    }
-
-    private inner class Kapt3ClassBuilder(val classNode: ClassNode) : AbstractClassBuilder.Concrete(classNode) {
-        override fun newField(
-                origin: JvmDeclarationOrigin,
-                access: Int,
-                name: String,
-                desc: String,
-                signature: String?,
-                value: Any?
-        ): FieldVisitor {
-            val fieldNode = super.newField(origin, access, name, desc, signature, value) as FieldNode
-            origins.put(fieldNode, origin)
-            return fieldNode
-        }
-
-        override fun newMethod(
-                origin: JvmDeclarationOrigin,
-                access: Int,
-                name: String,
-                desc: String,
-                signature: String?,
-                exceptions: Array<out String>?
-        ): MethodVisitor {
-            val methodNode = super.newMethod(origin, access, name, desc, signature, exceptions) as MethodNode
-            origins.put(methodNode, origin)
-
-            // ASM doesn't read information about local variables for the `abstract` methods so we need to get it manually
-            if ((access and Opcodes.ACC_ABSTRACT) != 0 && methodNode.localVariables == null) {
-                methodNode.localVariables = mutableListOf<LocalVariableNode>()
-            }
-
-            return methodNode
-        }
-    }
-
-    override fun asBytes(builder: ClassBuilder): ByteArray {
-        val classWriter = ClassWriter(0)
-        (builder as Kapt3ClassBuilder).classNode.accept(classWriter)
-        return classWriter.toByteArray()
-    }
-
-    override fun asText(builder: ClassBuilder) = throw UnsupportedOperationException()
-
-    override fun close() {}
-}

plugins/kapt3/kapt3-compiler/src/org/jetbrains/kotlin/kapt3/Kapt3Extension.kt

@@ -28,8 +28,10 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.OUTPUT
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
 import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil
 import org.jetbrains.kotlin.cli.common.output.outputUtils.writeAll
+import org.jetbrains.kotlin.codegen.ClassBuilderMode
 import org.jetbrains.kotlin.codegen.CompilationErrorHandler
 import org.jetbrains.kotlin.codegen.KotlinCodegenFacade
+import org.jetbrains.kotlin.codegen.OriginCollectingClassBuilderFactory
 import org.jetbrains.kotlin.codegen.state.GenerationState
 import org.jetbrains.kotlin.config.CommonConfigurationKeys
 import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -219,7 +221,7 @@ abstract class AbstractKapt3Extension(
             bindingContext: BindingContext,
             files: List<KtFile>
     ): KaptContextForStubGeneration {
-        val builderFactory = Kapt3BuilderFactory()
+        val builderFactory = OriginCollectingClassBuilderFactory(ClassBuilderMode.KAPT3)
 
         val targetId = TargetId(
                 name = compilerConfiguration[CommonConfigurationKeys.MODULE_NAME] ?: module.name.asString(),

plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3IntegrationTest.kt

@@ -19,8 +19,10 @@ package org.jetbrains.kotlin.kapt3.test
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.cli.common.messages.MessageCollector
+import org.jetbrains.kotlin.codegen.ClassBuilderMode
 import org.jetbrains.kotlin.codegen.CodegenTestCase
 import org.jetbrains.kotlin.codegen.GenerationUtils
+import org.jetbrains.kotlin.codegen.OriginCollectingClassBuilderFactory
 import org.jetbrains.kotlin.config.CompilerConfiguration
 import org.jetbrains.kotlin.kapt3.*
 import org.jetbrains.kotlin.kapt3.AptMode.STUBS_AND_APT
@@ -140,7 +142,8 @@ abstract class AbstractKotlinKapt3IntegrationTest : CodegenTestCase() {
         try {
             loadMultiFiles(files)
 
-            GenerationUtils.compileFiles(myFiles.psiFiles, myEnvironment, Kapt3BuilderFactory()).factory
+            val classBuilderFactory = OriginCollectingClassBuilderFactory(ClassBuilderMode.KAPT3)
+            GenerationUtils.compileFiles(myFiles.psiFiles, myEnvironment, classBuilderFactory).factory
 
             val actualRaw = kapt3Extension.savedStubs ?: error("Stubs were not saved")
             val actual = StringUtil.convertLineSeparators(actualRaw.trim({ it <= ' ' }))

plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt

@@ -29,9 +29,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageRenderer
 import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector
 import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
 import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot
-import org.jetbrains.kotlin.codegen.CodegenTestCase
-import org.jetbrains.kotlin.codegen.CodegenTestFiles
-import org.jetbrains.kotlin.codegen.GenerationUtils
+import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.kapt3.*
 import org.jetbrains.kotlin.kapt3.base.KaptContext
 import org.jetbrains.kotlin.kapt3.base.KaptPaths
@@ -112,7 +110,7 @@ abstract class AbstractKotlinKapt3Test : CodegenTestCase() {
         loadMultiFiles(files)
 
         val txtFile = File(wholeFile.parentFile, wholeFile.nameWithoutExtension + ".txt")
-        val classBuilderFactory = Kapt3BuilderFactory()
+        val classBuilderFactory = OriginCollectingClassBuilderFactory(ClassBuilderMode.KAPT3)
         val generationState = GenerationUtils.compileFiles(myFiles.psiFiles, myEnvironment, classBuilderFactory)
 
         val logger = MessageCollectorBackedKaptLogger(isVerbose = true, messageCollector = messageCollector)