azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switched to new FUS adapter API

Browse Source
This commit is contained in:
Anton Yalyshev
2019-04-24 21:29:28 +03:00
parent 63ffff175b
commit 01f34a0ba7
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt
+3 -3
View File
@@ -28,8 +28,8 @@ import com.intellij.openapi.roots.ModifiableRootModel
import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger
import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
import org.jetbrains.kotlin.idea.versions.*
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
@@ -144,7 +144,7 @@ abstract class GradleKotlinFrameworkSupportProvider(
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
}
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName)
KotlinFUSLogger.log(FUSEventGroups.NPWizards, this.javaClass.simpleName)
}
protected open fun updateSettingsScript(settingsBuilder: SettingsScriptBuilder, specifyPluginVersionIfNeeded: Boolean) { }
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinDslGradleKotlinFrameworkSupportProvider.kt
+3 -3
View File
@@ -30,8 +30,8 @@ import org.jetbrains.kotlin.idea.configuration.KotlinBuildScriptManipulator.Comp
import org.jetbrains.kotlin.idea.configuration.KotlinBuildScriptManipulator.Companion.getKotlinModuleDependencySnippet
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger
import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
import org.jetbrains.kotlin.idea.versions.*
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider
@@ -107,7 +107,7 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider(
GradlePropertiesFileFacade.forProject(module.project).addCodeStyleProperty(KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
}
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName)
KotlinFUSLogger.log(FUSEventGroups.NPWizards, this.javaClass.simpleName)
}
private fun RepositoryDescription.toKotlinRepositorySnippet() = "maven { setUrl(\"$url\") }"
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
+3 -3
View File
@@ -26,8 +26,8 @@ import org.jetbrains.plugins.gradle.service.project.wizard.GradleModuleBuilder
import org.jetbrains.plugins.gradle.service.settings.GradleProjectSettingsControl
import org.jetbrains.plugins.gradle.settings.DistributionType
import com.intellij.openapi.externalSystem.model.project.ProjectData
import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger
import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
import javax.swing.Icon
abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
@@ -77,7 +77,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
override fun setupModule(module: Module) {
try {
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName)
KotlinFUSLogger.log(FUSEventGroups.NPWizards, this.javaClass.simpleName)
module.gradleModuleBuilder = this
super.setupModule(module)
idea/idea-jvm/src/org/jetbrains/kotlin/idea/framework/KotlinModuleBuilder.kt
+3 -3
View File
@@ -24,8 +24,8 @@ import com.intellij.openapi.projectRoots.SdkTypeId
import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.ui.configuration.ModulesProvider
import org.jetbrains.kotlin.idea.roots.migrateNonJvmSourceFolders
import org.jetbrains.kotlin.idea.statistics.KotlinEventTrigger
import org.jetbrains.kotlin.idea.statistics.KotlinStatisticsTrigger
import org.jetbrains.kotlin.idea.statistics.FUSEventGroups
import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger
import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
import javax.swing.Icon
@@ -57,7 +57,7 @@ class KotlinModuleBuilder(
}
override fun setupRootModel(rootModel: ModifiableRootModel) {
KotlinStatisticsTrigger.trigger(KotlinEventTrigger.KotlinIdeWizardsTrigger, this.javaClass.simpleName + ": ${this.targetPlatform}")
KotlinFUSLogger.log(FUSEventGroups.NPWizards, this.javaClass.simpleName + ": ${this.targetPlatform}")
super.setupRootModel(rootModel)
if (targetPlatform !is JvmPlatform) {
migrateNonJvmSourceFolders(rootModel)