MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[kotlin] Add .kotlin folder in .gitignore in the wizard-generated Gradle projects

Browse Source 
#KTIJ-30076 Fixed

GitOrigin-RevId: 9142b4e89b74942ae3c666e70b37326e75dad2a5
This commit is contained in:
Vladimir Dolzhenko
2024-07-19 14:15:04 +02:00
committed by intellij-monorepo-bot
parent 786f4f4493
commit 33993e55ff
8 changed files with 110 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/kotlin/project-wizard/compose/kotlin.project-wizard.compose.iml
View File

@@ -20,5 +20,6 @@
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
<orderEntry type="module" module-name="intellij.java.tests" scope="TEST" />
<orderEntry type="module" module-name="kotlin.project-wizard.core" />
</component>
</module>

3
plugins/kotlin/project-wizard/compose/src/org/jetbrains/kotlin/tools/composeProjectWizard/ComposeModuleBuilder.kt
View File

@@ -14,6 +14,7 @@ import com.intellij.openapi.roots.ui.configuration.ModulesProvider
import com.intellij.pom.java.LanguageLevel
import com.intellij.util.lang.JavaVersion
import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.tools.projectWizard.core.KotlinAssetsProvider
import javax.swing.Icon
class ComposeModuleBuilder : StarterModuleBuilder() {
@@ -76,7 +77,7 @@ class ComposeModuleBuilder : StarterModuleBuilder() {
assets.addAll(standardAssetsProvider.getGradlewAssets())
if (starterContext.isCreatingNewProject) {
assets.addAll(standardAssetsProvider.getGradleIgnoreAssets())
assets.addAll(KotlinAssetsProvider.getKotlinGradleIgnoreAssets())
}
assets.add(

32
plugins/kotlin/project-wizard/core/resources/assets/ignore/kotlin.gitignore.txt Normal file
View File

@@ -0,0 +1,32 @@
### IntelliJ IDEA ###
out/
!**/src/main/**/out/
!**/src/test/**/out/
### Kotlin ###
.kotlin
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store

45
plugins/kotlin/project-wizard/core/resources/assets/ignore/kotlin.gradle.gitignore.txt Normal file
View File

@@ -0,0 +1,45 @@
.gradle
build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr
out/
!**/src/main/**/out/
!**/src/test/**/out/
### Kotlin ###
.kotlin
### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
bin/
!**/src/main/**/bin/
!**/src/test/**/bin/
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
### VS Code ###
.vscode/
### Mac OS ###
.DS_Store

25
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/core/KotlinAssetsProvider.kt Normal file
View File

@@ -0,0 +1,25 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.kotlin.tools.projectWizard.core
import com.intellij.ide.starters.local.GeneratorAsset
import com.intellij.ide.starters.local.GeneratorResourceFile
object KotlinAssetsProvider {
fun getKotlinGradleIgnoreAssets(): List<GeneratorAsset> {
return listOf(
GeneratorResourceFile(
relativePath = ".gitignore",
resource = javaClass.getResource("/assets/ignore/kotlin.gradle.gitignore.txt") ?: error("kotlin.gradle.gitignore.txt not found")
)
)
}
fun getKotlinIgnoreAssets(): List<GeneratorAsset> {
return listOf(
GeneratorResourceFile(
relativePath = ".gitignore",
resource = javaClass.getResource("/assets/ignore/kotlin.gitignore.txt") ?: error("kotlin.gitignore.txt not found")
)
)
}
}

3
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/plugins/buildSystem/gradle/GradlePlugin.kt
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.gradle
import com.intellij.ide.starters.local.StandardAssetsProvider
import com.intellij.ide.starters.local.generator.AssetsProcessor
import kotlinx.collections.immutable.toPersistentList
@@ -125,7 +124,7 @@ abstract class GradlePlugin(context: Context) : BuildSystemPlugin(context) {
).andThen(
// This is here temporarily until the Kotlin Multiplatform wizard has been removed
compute {
val assets = StandardAssetsProvider().getGradlewAssets() + StandardAssetsProvider().getGradleIgnoreAssets()
val assets = StandardAssetsProvider().getGradlewAssets() + KotlinAssetsProvider.getKotlinGradleIgnoreAssets()
AssetsProcessor.getInstance().generateSources(projectPath, assets, emptyMap())
Unit
}

4
plugins/kotlin/project-wizard/gradle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt
View File

@@ -7,7 +7,6 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampl
import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsFinished
import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.GRADLE
import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep
import com.intellij.ide.starters.local.StandardAssetsProvider
import com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep
import com.intellij.ide.wizard.NewProjectWizardStep
import com.intellij.ide.wizard.NewProjectWizardStep.Companion.ADD_SAMPLE_CODE_PROPERTY_NAME
@@ -44,6 +43,7 @@ import org.jetbrains.kotlin.tools.projectWizard.BuildSystemKotlinNewProjectWizar
import org.jetbrains.kotlin.tools.projectWizard.BuildSystemKotlinNewProjectWizardData.Companion.SRC_TEST_RESOURCES_PATH
import org.jetbrains.kotlin.tools.projectWizard.compatibility.KotlinGradleCompatibilityStore
import org.jetbrains.kotlin.tools.projectWizard.compatibility.KotlinWizardVersionStore
import org.jetbrains.kotlin.tools.projectWizard.core.KotlinAssetsProvider
import org.jetbrains.kotlin.tools.projectWizard.plugins.kotlin.ProjectKind
import org.jetbrains.kotlin.tools.projectWizard.wizard.AssetsKotlinNewProjectWizardStep
import org.jetbrains.kotlin.tools.projectWizard.wizard.service.IdeaKotlinVersionProviderService
@@ -287,7 +287,7 @@ internal class GradleKotlinNewProjectWizard : BuildSystemKotlinNewProjectWizard
override fun setupAssets(project: Project) {
if (context.isCreatingNewProject) {
addAssets(StandardAssetsProvider().getGradleIgnoreAssets())
addAssets(KotlinAssetsProvider.getKotlinGradleIgnoreAssets())
addTemplateAsset("gradle.properties", "KotlinCodeStyleProperties")
}
createKotlinContentRoots()

4
plugins/kotlin/project-wizard/idea/src/org/jetbrains/kotlin/tools/projectWizard/IntelliJKotlinNewProjectWizard.kt
View File

@@ -5,7 +5,6 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.Kotlin.logUseCom
import com.intellij.ide.projectWizard.NewProjectWizardCollector.Kotlin.logUseCompactProjectStructureFinished
import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.INTELLIJ
import com.intellij.ide.projectWizard.generators.IntelliJNewProjectWizardStep
import com.intellij.ide.starters.local.StandardAssetsProvider
import com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep
import com.intellij.ide.wizard.NewProjectWizardStep
import com.intellij.openapi.application.readAction
@@ -23,6 +22,7 @@ import com.intellij.ui.dsl.builder.whenStateChangedFromUi
import com.intellij.util.indexing.DumbModeAccessType
import com.intellij.util.indexing.FileBasedIndex
import org.jetbrains.kotlin.idea.vfilefinder.KotlinStdlibIndex
import org.jetbrains.kotlin.tools.projectWizard.core.KotlinAssetsProvider
import org.jetbrains.kotlin.tools.projectWizard.wizard.AssetsKotlinNewProjectWizardStep
import org.jetbrains.kotlin.tools.projectWizard.wizard.KotlinNewProjectWizardUIBundle
import org.jetbrains.kotlin.tools.projectWizard.wizard.ui.StdlibVersionChooserDialog
@@ -138,7 +138,7 @@ internal class IntelliJKotlinNewProjectWizard : BuildSystemKotlinNewProjectWizar
override fun setupAssets(project: Project) {
if (context.isCreatingNewProject) {
addAssets(StandardAssetsProvider().getIntelliJIgnoreAssets())
addAssets(KotlinAssetsProvider.getKotlinIgnoreAssets())
}
if (parent.addSampleCode) {
val sourceRootPath = if (parent.useCompactProjectStructure) "src" else "src/main/kotlin"