Android Extensions: put new functionality under the flag

2017-07-14 18:55:55 +03:00
parent 77eafb9716
commit 4851a83a83
21 changed files with 358 additions and 30 deletions
@@ -22,5 +22,8 @@
    <orderEntry type="module" module-name="frontend.java" scope="TEST" />
    <orderEntry type="module" module-name="idea-live-templates" scope="TEST" />
    <orderEntry type="library" name="gradle-and-groovy-plugin" level="project" />
+    <orderEntry type="module" module-name="idea-jps-common" />
+    <orderEntry type="module" module-name="cli-common" />
+    <orderEntry type="module" module-name="backend" />
  </component>
 </module>
@@ -0,0 +1 @@
+org.jetbrains.kotlin.android.synthetic.idea.AndroidExtensionsModelBuilderService
@@ -0,0 +1,121 @@
+/*
+ * 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.android.synthetic.idea
+
+import com.intellij.openapi.externalSystem.model.DataNode
+import com.intellij.openapi.externalSystem.model.ProjectKeys
+import com.intellij.openapi.externalSystem.model.project.ModuleData
+import com.intellij.openapi.externalSystem.model.project.ProjectData
+import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil
+import com.intellij.openapi.util.Key
+import org.gradle.api.Project
+import org.gradle.tooling.model.idea.IdeaModule
+import org.gradle.tooling.model.idea.IdeaProject
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor.Companion.ANDROID_COMPILER_PLUGIN_ID
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor.Companion.EXPERIMENTAL_OPTION
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor.Companion.ENABLED_OPTION
+import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
+import org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler
+import org.jetbrains.kotlin.idea.facet.KotlinFacet
+import org.jetbrains.kotlin.psi.NotNullableUserDataProperty
+import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData
+import org.jetbrains.plugins.gradle.service.project.AbstractProjectResolverExtension
+import org.jetbrains.plugins.gradle.tooling.ErrorMessageBuilder
+import org.jetbrains.plugins.gradle.tooling.ModelBuilderService
+import java.io.Serializable
+import java.lang.Exception
+
+var DataNode<ModuleData>.hasAndroidExtensionsPlugin: Boolean
+        by NotNullableUserDataProperty(Key.create<Boolean>("HAS_ANDROID_EXTENSIONS_PLUGIN"), false)
+
+var DataNode<ModuleData>.isExperimental: Boolean
+        by NotNullableUserDataProperty(Key.create<Boolean>("ANDROID_EXTENSIONS_IS_EXPERIMENTAL"), false)
+
+interface AndroidExtensionsGradleModel : Serializable {
+    val hasAndroidExtensionsPlugin: Boolean
+    val isExperimental: Boolean
+}
+
+class AndroidExtensionsGradleModelImpl(
+        override val hasAndroidExtensionsPlugin: Boolean,
+        override val isExperimental: Boolean
+) : AndroidExtensionsGradleModel
+
+@Suppress("unused")
+class AndroidExtensionsProjectResolverExtension : AbstractProjectResolverExtension() {
+    override fun getExtraProjectModelClasses() = setOf(AndroidExtensionsGradleModel::class.java)
+    override fun getToolingExtensionsClasses() = setOf(AndroidExtensionsModelBuilderService::class.java)
+
+    override fun populateModuleExtraModels(gradleModule: IdeaModule, ideModule: DataNode<ModuleData>) {
+        val androidExtensionsModel = resolverCtx.getExtraProject(gradleModule, AndroidExtensionsGradleModel::class.java) ?: return
+
+        ideModule.hasAndroidExtensionsPlugin = androidExtensionsModel.hasAndroidExtensionsPlugin
+        ideModule.isExperimental = androidExtensionsModel.isExperimental
+
+        super.populateModuleExtraModels(gradleModule, ideModule)
+    }
+}
+
+class AndroidExtensionsModelBuilderService : ModelBuilderService {
+    override fun getErrorMessageBuilder(project: Project, e: Exception): ErrorMessageBuilder {
+        return ErrorMessageBuilder.create(project, e, "Gradle import errors")
+                .withDescription("Unable to build Android Extensions plugin configuration")
+    }
+
+    override fun canBuild(modelName: String?): Boolean = modelName == AndroidExtensionsGradleModel::class.java.name
+
+    override fun buildAll(modelName: String?, project: Project): Any {
+        val androidExtensionsPlugin = project.plugins.findPlugin("kotlin-android-extensions")
+
+        val isExperimental = project.extensions.findByName("androidExtensions")?.let { ext ->
+            val isExperimentalMethod = ext::class.java.methods
+                    .firstOrNull { it.name == "isExperimental" && it.parameterCount == 0 }
+                    ?: return@let false
+
+            isExperimentalMethod.invoke(ext) as? Boolean
+        } ?: false
+
+        return AndroidExtensionsGradleModelImpl(androidExtensionsPlugin != null, isExperimental)
+    }
+}
+
+@Suppress("unused")
+class AndroidExtensionsGradleImportHandler : GradleProjectImportHandler {
+    override fun importBySourceSet(facet: KotlinFacet, sourceSetNode: DataNode<GradleSourceSetData>) {
+        val module = ExternalSystemApiUtil.findParent(sourceSetNode, ProjectKeys.MODULE) ?: return
+        importByModule(facet, module)
+    }
+
+    override fun importByModule(facet: KotlinFacet, moduleNode: DataNode<ModuleData>) {
+        val facetSettings = facet.configuration.settings
+        val commonArguments = facetSettings.compilerArguments ?: CommonCompilerArguments.DummyImpl()
+
+        fun makePluginOption(key: String, value: String) = "plugin:$ANDROID_COMPILER_PLUGIN_ID:$key=$value"
+
+        val newPluginOptions = (commonArguments.pluginOptions ?: emptyArray())
+                .filterTo(mutableListOf()) { !it.startsWith("plugin:$ANDROID_COMPILER_PLUGIN_ID:") } // Filter out old options
+
+        if (moduleNode.hasAndroidExtensionsPlugin) {
+            newPluginOptions += makePluginOption(EXPERIMENTAL_OPTION.name, moduleNode.isExperimental.toString())
+            newPluginOptions += makePluginOption(ENABLED_OPTION.name, moduleNode.hasAndroidExtensionsPlugin.toString())
+        }
+
+        commonArguments.pluginOptions = newPluginOptions.toTypedArray()
+        facetSettings.compilerArguments = commonArguments
+    }
+}
@@ -0,0 +1,38 @@
+/*
+ * 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.android.synthetic.idea
+
+import org.jetbrains.kotlin.analyzer.ModuleInfo
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor.Companion.ANDROID_COMPILER_PLUGIN_ID
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor.Companion.EXPERIMENTAL_OPTION
+import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
+import org.jetbrains.kotlin.idea.facet.KotlinFacet
+
+private val ANNOTATION_OPTION_PREFIX = "plugin:$ANDROID_COMPILER_PLUGIN_ID:${EXPERIMENTAL_OPTION.name}="
+
+internal val ModuleInfo.androidExtensionsIsExperimental: Boolean
+    get() {
+        val module = (this as? ModuleSourceInfo)?.module ?: return false
+        val kotlinFacet = KotlinFacet.get(module) ?: return false
+        val commonArgs = kotlinFacet.configuration.settings.compilerArguments ?: return false
+
+        val isExperimentalString = commonArgs.pluginOptions
+                ?.firstOrNull { it.startsWith(ANNOTATION_OPTION_PREFIX) }
+                ?.substring(ANNOTATION_OPTION_PREFIX.length)
+
+        return isExperimentalString == "true"
+    }
@@ -0,0 +1,28 @@
+/*
+ * 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.android.synthetic.idea
+
+import org.jetbrains.kotlin.android.synthetic.codegen.AbstractAndroidExtensionsExpressionCodegenExtension
+import org.jetbrains.kotlin.idea.caches.resolve.getModuleInfo
+import org.jetbrains.kotlin.psi.KtClassOrObject
+
+class IDEAndroidExtensionsExpressionCodegenExtension : AbstractAndroidExtensionsExpressionCodegenExtension() {
+    override fun isExperimental(clazz: KtClassOrObject): Boolean {
+        val moduleInfo = clazz.getModuleInfo() ?: return false
+        return moduleInfo.androidExtensionsIsExperimental
+    }
+}
@@ -25,14 +25,23 @@ import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiManager
 import org.jetbrains.android.facet.AndroidFacet
 import org.jetbrains.kotlin.analyzer.ModuleInfo
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor.Companion.ANDROID_COMPILER_PLUGIN_ID
+import org.jetbrains.kotlin.android.synthetic.AndroidCommandLineProcessor.Companion.EXPERIMENTAL_OPTION
+import org.jetbrains.kotlin.android.synthetic.idea.androidExtensionsIsExperimental
+import org.jetbrains.kotlin.android.synthetic.idea.isExperimental
 import org.jetbrains.kotlin.android.synthetic.res.AndroidLayoutXmlFileManager
 import org.jetbrains.kotlin.android.synthetic.res.AndroidPackageFragmentProviderExtension
 import org.jetbrains.kotlin.idea.caches.resolve.ModuleSourceInfo
+import org.jetbrains.kotlin.idea.facet.KotlinFacet
 import org.jetbrains.plugins.groovy.lang.psi.GroovyFile

 class IDEAndroidPackageFragmentProviderExtension(val project: Project) : AndroidPackageFragmentProviderExtension() {
    private val psiManager = PsiManager.getInstance(project)

+    override fun isExperimental(moduleInfo: ModuleInfo?): Boolean {
+        return moduleInfo?.androidExtensionsIsExperimental ?: false
+    }
+
    override fun getLayoutXmlFileManager(project: Project, moduleInfo: ModuleInfo?): AndroidLayoutXmlFileManager? {
        val moduleSourceInfo = moduleInfo as? ModuleSourceInfo ?: return null
        val module = moduleSourceInfo.module
				`@@ -0,0 +1 @@`
				`org.jetbrains.kotlin.android.synthetic.idea.AndroidExtensionsModelBuilderService`