172: Restore compilation against Idea 172

Revert "Fix proguard settings for 173" 4dadae2e9c8419bfda9d77f56797e68edbd8ecd7. Revert "Fix compilation in 173" 0633aa925c8e862519ae699e5e3fe81a2bd227c2. Revert "Fix compilation (MockParameterInfoUIContext.java)" 01a7fbfb60d786c56c54f4fd77d9f1233f599ede. Revert "Fix compilation" 043a5dac796f6bf92bbe6c9573c1af07fadcfe4e. Revert "Fix compatibility with BuildScriptDataBuilder API changes" c7df054d0e90a86fbe67f23802e9be49b2117ded.
2018-01-11 20:12:47 +03:00
parent 3b434eeb13
commit fbed7f9c08
4 changed files with 431 additions and 1 deletions
@@ -133,7 +133,7 @@ public class GradleModuleBuilder extends AbstractExternalModuleBuilder<GradlePro
      moduleName = getName();
    }
    else {
-      moduleName = ModuleGrouperKt.isQualifiedModuleNamesEnabled(myWizardContext.getProject()) && StringUtil.isNotEmpty(myProjectId.getGroupId())
+      moduleName = ModuleGrouperKt.isQualifiedModuleNamesEnabled() && StringUtil.isNotEmpty(myProjectId.getGroupId())
                   ? (myProjectId.getGroupId() + '.' + myProjectId.getArtifactId())
                   : myProjectId.getArtifactId();
    }
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2010-2017 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.idea.configuration
+
+import com.intellij.ide.util.projectWizard.ModuleWizardStep
+import com.intellij.ide.util.projectWizard.WizardContext
+import com.intellij.openapi.externalSystem.service.project.wizard.ExternalModuleSettingsStep
+import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.projectRoots.Sdk
+import com.intellij.openapi.roots.ModifiableRootModel
+import com.intellij.openapi.roots.ui.configuration.ModulesProvider
+import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.openapi.vfs.VirtualFile
+import org.jetbrains.kotlin.idea.KotlinIcons
+import org.jetbrains.kotlin.idea.util.application.executeCommand
+import org.jetbrains.kotlin.idea.util.rootManager
+import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
+import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder
+import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl
+import javax.swing.Icon
+
+class KotlinGradleMultiplatformModuleBuilder : GradleModuleBuilder() {
+    var commonModuleName: String? = null
+    var jvmModuleName: String? = null
+    var jdk: Sdk? = null
+    var jsModuleName: String? = null
+
+    override fun getBuilderId() = "kotlin.gradle.multiplatform"
+
+    override fun getNodeIcon(): Icon = KotlinIcons.MPP
+
+    override fun getPresentableName() = "Kotlin (Multiplatform - Experimental)"
+
+    override fun getDescription() =
+        "Multiplatform projects allow reusing the same code between multiple platforms supported by Kotlin. Such projects are built with Gradle."
+
+    override fun createWizardSteps(wizardContext: WizardContext, modulesProvider: ModulesProvider): Array<ModuleWizardStep> {
+        super.createWizardSteps(wizardContext, modulesProvider)  // initializes GradleModuleBuilder.myWizardContext
+        return arrayOf(
+            KotlinGradleMultiplatformWizardStep(this, wizardContext),
+            ExternalModuleSettingsStep(
+                wizardContext, this, GradleProjectSettingsControl(externalProjectSettings)
+            )
+        )
+    }
+
+    override fun setupRootModel(modifiableRootModel: ModifiableRootModel) {
+        super.setupRootModel(modifiableRootModel)
+        if (commonModuleName.isNullOrEmpty()) {
+            val module = modifiableRootModel.module
+            val buildScriptData = getBuildScriptData(module) ?: return
+            val sdk = modifiableRootModel.sdk
+            GradleKotlinMPPCommonFrameworkSupportProvider().addSupport(buildScriptData, sdk)
+        }
+    }
+
+    override fun setupModule(module: Module) {
+        super.setupModule(module)
+
+        val contentRoot = module.rootManager.contentRoots.firstOrNull() ?: return
+        setupCommonModule(module, contentRoot)
+        setupPlatformModule(module, contentRoot, jvmModuleName, GradleKotlinMPPJavaFrameworkSupportProvider(), jdk)
+        setupPlatformModule(module, contentRoot, jsModuleName, GradleKotlinMPPJSFrameworkSupportProvider())
+
+        val settingsGradle = contentRoot.findChild("settings.gradle")
+        settingsGradle?.let {
+            module.project.executeCommand("Update settings.gradle") {
+                val doc = FileDocumentManager.getInstance().getDocument(it) ?: return@executeCommand
+                val includedModules = listOfNotNull(commonModuleName, jvmModuleName, jsModuleName).filter { it.isNotEmpty() }
+                if (includedModules.isNotEmpty()) {
+                    doc.insertString(doc.textLength, includedModules.joinToString(prefix = "include ") { "'$it'" })
+                }
+                FileDocumentManager.getInstance().saveDocument(doc)
+            }
+        }
+    }
+
+    private fun setupChildModule(
+        rootModule: Module,
+        contentRoot: VirtualFile,
+        childModuleName: String?,
+        sdk: Sdk? = null,
+        extendScript: (BuildScriptDataBuilder, Sdk?) -> Unit = { _, _ -> }
+    ) {
+        if (childModuleName.isNullOrEmpty()) return
+
+        val moduleDir = contentRoot.createChildDirectory(this, childModuleName!!)
+        val buildGradle = moduleDir.createChildData(null, "build.gradle")
+        val buildScriptData = BuildScriptDataBuilder(buildGradle)
+        extendScript(buildScriptData, sdk ?: rootModule.rootManager.sdk)
+        VfsUtil.saveText(buildGradle, buildScriptData.build())
+    }
+
+    private fun setupCommonModule(
+        rootModule: Module,
+        contentRoot: VirtualFile
+    ) = setupChildModule(rootModule, contentRoot, commonModuleName) { builder, sdk ->
+        GradleKotlinMPPCommonFrameworkSupportProvider().addSupport(builder, sdk)
+    }
+
+    private fun setupPlatformModule(
+        rootModule: Module,
+        contentRoot: VirtualFile,
+        platformModuleName: String?,
+        supportProvider: GradleKotlinFrameworkSupportProvider,
+        sdk: Sdk? = null
+    ) = setupChildModule(rootModule, contentRoot, platformModuleName, sdk) { builder, finalSdk ->
+        supportProvider.addSupport(builder, finalSdk)
+        val dependency = commonModuleName ?: ""
+        builder.addDependencyNotation("expectedBy project(\":$dependency\")")
+    }
+}
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.parameterInfo;
+
+import com.intellij.lang.parameterInfo.ParameterInfoUIContext;
+import com.intellij.psi.PsiElement;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Collections;
+
+public class MockParameterInfoUIContext implements ParameterInfoUIContext {
+    private final PsiElement myParameterOwner;
+    private final int myCurrentParameterIndex;
+
+    private final ArrayList<String> result = new ArrayList<String>();
+
+    MockParameterInfoUIContext(PsiElement parameterOwner, int currentParameterIndex) {
+        myParameterOwner = parameterOwner;
+        myCurrentParameterIndex = currentParameterIndex;
+    }
+    
+    @Override
+    public String setupUIComponentPresentation(String text, int highlightStartOffset, int highlightEndOffset,
+                                             boolean isDisabled, boolean strikeout,
+                                             boolean isDisabledBeforeHighlight, Color background) {
+        String highlightedText;
+        if (highlightStartOffset != -1 && highlightEndOffset != -1) {
+            highlightedText = text.substring(0, highlightStartOffset)
+                              + "<highlight>"
+                              + text.substring(highlightStartOffset, highlightEndOffset)
+                              + "</highlight>"
+                              + text.substring(highlightEndOffset);
+        }
+        else {
+            highlightedText = text;
+        }
+
+        String resultText = "Text: (" + highlightedText + "), " +
+                            "Disabled: " + isDisabled + ", " +
+                            "Strikeout: " + strikeout + ", " +
+                            "Green: " + KotlinParameterInfoWithCallHandlerBase.GREEN_BACKGROUND.equals(background);
+        result.add(resultText);
+
+        // return value not used, just return something
+        return resultText;
+    }
+
+    @Override
+    public boolean isUIComponentEnabled() {
+        return false;
+    }
+
+    @Override
+    public void setUIComponentEnabled(boolean enabled) {
+    }
+
+    @Override
+    public int getCurrentParameterIndex() {
+        return myCurrentParameterIndex;
+    }
+
+    @Override
+    public PsiElement getParameterOwner() {
+        return myParameterOwner;
+    }
+
+    @Override
+    public boolean isSingleParameterInfo() {
+        return false;
+    }
+
+    @Override
+    public Color getDefaultParameterColor() {
+        return null;
+    }
+    
+    public String getResultText() {
+        StringBuilder stringBuilder = new StringBuilder();
+        Collections.sort(result);
+        for (String s : result) {
+            stringBuilder.append(s).append("\n");
+        }
+        return stringBuilder.toString().trim();
+    }
+}