Choose implementing module correctly in "create actual fix"

Take implements / expectedBy dependency into account So #KT-20803 Fixed
2017-10-27 16:30:39 +03:00
parent f0da58531e
commit 561d7749b1
16 changed files with 54 additions and 11 deletions
@@ -23,7 +23,6 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleUtilCore
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.psi.JavaDirectoryService
 import com.intellij.psi.codeStyle.CodeStyleManager
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
@@ -32,13 +31,13 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic
 import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
 import org.jetbrains.kotlin.diagnostics.Errors
 import org.jetbrains.kotlin.idea.core.*
+import org.jetbrains.kotlin.idea.facet.implementingModules
 import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
 import org.jetbrains.kotlin.idea.quickfix.KotlinQuickFixAction
 import org.jetbrains.kotlin.idea.quickfix.KotlinSingleIntentionActionFactory
 import org.jetbrains.kotlin.idea.refactoring.createKotlinFile
 import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
 import org.jetbrains.kotlin.idea.util.application.runWriteAction
-import org.jetbrains.kotlin.idea.util.projectStructure.allModules
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.MultiTargetPlatform
@@ -62,7 +61,7 @@ sealed class CreateActualFix<out D : KtNamedDeclaration>(
        val element = element ?: return
        val factory = KtPsiFactory(project)

-        val actualFile = getOrCreateImplementationFile(project) ?: return
+        val actualFile = getOrCreateImplementationFile() ?: return
        val generated = factory.generateIt(project, element) ?: return

        runWriteAction {
@@ -87,16 +86,13 @@ sealed class CreateActualFix<out D : KtNamedDeclaration>(
        }
    }

-    private fun Project.implementationModuleOf(expectedModule: Module) =
-            allModules().firstOrNull {
+    private fun implementationModuleOf(expectedModule: Module) =
+            expectedModule.implementingModules.firstOrNull {
                PackageUtil.checkSourceRootsConfigured(it, false) &&
-                TargetPlatformDetector.getPlatform(it).multiTargetPlatform == actualPlatform &&
-                expectedModule in ModuleRootManager.getInstance(it).dependencies
+                TargetPlatformDetector.getPlatform(it).multiTargetPlatform == actualPlatform
            }

-    private fun getOrCreateImplementationFile(
-            project: Project
-    ): KtFile? {
+    private fun getOrCreateImplementationFile(): KtFile? {
        val declaration = element as? KtNamedDeclaration ?: return null
        val name = declaration.name ?: return null

@@ -104,7 +100,7 @@ sealed class CreateActualFix<out D : KtNamedDeclaration>(
        val expectedPackage = JavaDirectoryService.getInstance().getPackage(expectedDir)

        val expectedModule = ModuleUtilCore.findModuleForPsiElement(declaration) ?: return null
-        val actualModule = project.implementationModuleOf(expectedModule) ?: return null
+        val actualModule = implementationModuleOf(expectedModule) ?: return null
        val actualDirectory = PackageUtil.findOrCreateDirectoryForPackage(
                actualModule, expectedPackage?.qualifiedName ?: "", null, false
        ) ?: return null
@@ -0,0 +1 @@
+// foo: NOT to be implemented
@@ -0,0 +1 @@
+// foo: NOT to be implemented
@@ -0,0 +1,3 @@
+// "Create actual function for platform JVM" "true"
+
+expect fun <caret>foo(arg: Int): String
@@ -0,0 +1,3 @@
+// "Create actual function for platform JVM" "true"
+
+expect fun foo(arg: Int): String
@@ -0,0 +1 @@
+// foo: to be implemented
@@ -0,0 +1,4 @@
+// foo: to be implemented
+actual fun foo(arg: Int): String {
+    TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+}
@@ -0,0 +1,3 @@
+// "Create actual function for platform JVM" "true"
+
+expect fun <caret>testHelper()
@@ -0,0 +1,3 @@
+// "Create actual function for platform JVM" "true"
+
+expect fun testHelper()
@@ -0,0 +1 @@
+// TEST
@@ -0,0 +1 @@
+// TEST
@@ -0,0 +1 @@
+// testHelper: to be implemented
@@ -0,0 +1,2 @@
+// testHelper: to be implemented
+actual fun testHelper() {}
@@ -0,0 +1,2 @@
+// testHelper: NOT to be implemented
+// TEST
@@ -0,0 +1,2 @@
+// testHelper: NOT to be implemented
+// TEST
@@ -169,11 +169,30 @@ class QuickFixMultiModuleTest : AbstractQuickFixMultiModuleTest() {
        doMultiPlatformTest()
    }

+    @Test
+    fun testWithFakeJvm() {
+        val commonModule = module("header")
+        commonModule.createFacet(TargetPlatformKind.Common, false)
+        val jvmKind = TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]
+        arrayOf("fake_jvm" to jvmKind, "jvm" to jvmKind).forEach { (implName, implKind) ->
+            val implModule = module(implName)
+            implModule.createFacet(implKind, implementedModuleName = "header".takeIf { implName == "jvm" })
+            implModule.enableMultiPlatform()
+            implModule.addDependency(commonModule)
+        }
+        doQuickFixTest()
+    }
+
    @Test
    fun testWithTest() {
        doMultiPlatformTest(expectName = "common", withTests = true)
    }

+    @Test
+    fun testWithTestDummy() {
+        doMultiPlatformTest(expectName = "common", withTests = true)
+    }
+
    @Test
    fun testMemberFunToExtensionByHeader() = doTestHeaderWithJvmAndJs()