Remove detection of new projects from the list of modules
This commit is contained in:
+3
-2
@@ -20,6 +20,7 @@ import com.intellij.framework.FrameworkTypeEx
|
|||||||
import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable
|
import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable
|
||||||
import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
|
import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
|
||||||
import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel
|
import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel
|
||||||
|
import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import com.intellij.openapi.projectRoots.Sdk
|
import com.intellij.openapi.projectRoots.Sdk
|
||||||
import com.intellij.openapi.roots.ModifiableModelsProvider
|
import com.intellij.openapi.roots.ModifiableModelsProvider
|
||||||
@@ -28,7 +29,6 @@ import org.jetbrains.kotlin.idea.KotlinIcons
|
|||||||
import org.jetbrains.kotlin.idea.core.platform.impl.CommonIdePlatformKindTooling.MAVEN_COMMON_STDLIB_ID
|
import org.jetbrains.kotlin.idea.core.platform.impl.CommonIdePlatformKindTooling.MAVEN_COMMON_STDLIB_ID
|
||||||
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
||||||
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
||||||
import org.jetbrains.kotlin.idea.framework.isInNewProject
|
|
||||||
import org.jetbrains.kotlin.idea.versions.*
|
import org.jetbrains.kotlin.idea.versions.*
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
|
import org.jetbrains.plugins.gradle.frameworkSupport.GradleFrameworkSupportProvider
|
||||||
@@ -129,7 +129,8 @@ abstract class GradleKotlinFrameworkSupportProvider(
|
|||||||
buildScriptData.addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH)
|
buildScriptData.addBuildscriptDependencyNotation(KotlinWithGradleConfigurator.CLASSPATH)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isInNewProject(module)) {
|
val isNewProject = module.project.getUserData(ExternalSystemDataKeys.NEWLY_CREATED_PROJECT) == true
|
||||||
|
if (isNewProject) {
|
||||||
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
||||||
GradlePropertiesFileUtils.addCodeStyleProperty(module.project, KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
GradlePropertiesFileUtils.addCodeStyleProperty(module.project, KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-2
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.configuration
|
|||||||
import com.intellij.framework.FrameworkTypeEx
|
import com.intellij.framework.FrameworkTypeEx
|
||||||
import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
|
import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
|
||||||
import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel
|
import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel
|
||||||
|
import com.intellij.openapi.externalSystem.model.ExternalSystemDataKeys
|
||||||
import com.intellij.openapi.externalSystem.model.project.ProjectId
|
import com.intellij.openapi.externalSystem.model.project.ProjectId
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import com.intellij.openapi.roots.ModifiableModelsProvider
|
import com.intellij.openapi.roots.ModifiableModelsProvider
|
||||||
@@ -29,7 +30,6 @@ import org.jetbrains.kotlin.idea.configuration.KotlinBuildScriptManipulator.Comp
|
|||||||
import org.jetbrains.kotlin.idea.configuration.KotlinBuildScriptManipulator.Companion.getKotlinModuleDependencySnippet
|
import org.jetbrains.kotlin.idea.configuration.KotlinBuildScriptManipulator.Companion.getKotlinModuleDependencySnippet
|
||||||
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle
|
||||||
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
import org.jetbrains.kotlin.idea.formatter.ProjectCodeStyleImporter
|
||||||
import org.jetbrains.kotlin.idea.framework.isInNewProject
|
|
||||||
import org.jetbrains.kotlin.idea.versions.*
|
import org.jetbrains.kotlin.idea.versions.*
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
import org.jetbrains.plugins.gradle.frameworkSupport.BuildScriptDataBuilder
|
||||||
import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider
|
import org.jetbrains.plugins.gradle.frameworkSupport.KotlinDslGradleFrameworkSupportProvider
|
||||||
@@ -99,7 +99,8 @@ abstract class KotlinDslGradleKotlinFrameworkSupportProvider(
|
|||||||
|
|
||||||
buildScriptData.addRepositoriesDefinition("mavenCentral()")
|
buildScriptData.addRepositoriesDefinition("mavenCentral()")
|
||||||
|
|
||||||
if (isInNewProject(module)) {
|
val isNewProject = module.project.getUserData(ExternalSystemDataKeys.NEWLY_CREATED_PROJECT) == true
|
||||||
|
if (isNewProject) {
|
||||||
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
||||||
GradlePropertiesFileUtils.addCodeStyleProperty(module.project, KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
GradlePropertiesFileUtils.addCodeStyleProperty(module.project, KotlinStyleGuideCodeStyle.CODE_STYLE_SETTING)
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-1
@@ -49,7 +49,8 @@ class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
|
|||||||
|
|
||||||
description!!.finishLibConfiguration(module, rootModel, false)
|
description!!.finishLibConfiguration(module, rootModel, false)
|
||||||
|
|
||||||
if (isInNewProject(module)) {
|
val isNewProject = model.project == null
|
||||||
|
if (isNewProject) {
|
||||||
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
ProjectCodeStyleImporter.apply(module.project, KotlinStyleGuideCodeStyle.INSTANCE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2010-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.framework
|
|
||||||
|
|
||||||
import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
|
|
||||||
import com.intellij.openapi.module.Module
|
|
||||||
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
|
|
||||||
|
|
||||||
@Suppress("unused")
|
|
||||||
fun FrameworkSupportInModuleProvider.isInNewProject(module: Module): Boolean {
|
|
||||||
return module.project.allModules().isEmpty()
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user