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

KTIJ-15770 Project Wizard creates files not named according to Kotlin code style

Browse Source 
^KTIJ-15770 Fixed

GitOrigin-RevId: ec129212260d5e35c2e886510842ccd4f9ebe8c0
This commit is contained in:
Andrei Klunnyi
2021-06-04 19:11:13 +02:00
committed by intellij-monorepo-bot
parent 28abdfe1b9
commit 0bd8a50fbd
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/ConsoleJvmApplicationTemplate.kt
View File

@@ -40,6 +40,6 @@ class ConsoleJvmApplicationTemplate : Template() {
override fun Reader.getFileTemplates(module: ModuleIR) =
buildList<FileTemplateDescriptorWithPath> {
+(FileTemplateDescriptor("$id/main.kt.vm", "main.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/main.kt.vm", "Main.kt".asPath()) asSrcOf SourcesetType.main)
}
}

2
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/KtorServerTemplate.kt
View File

@@ -60,7 +60,7 @@ class KtorServerTemplate : Template() {
targetConfigurationIR.addWithJavaIntoJvmTarget()
override fun Reader.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> = listOf(
FileTemplateDescriptor("$id/server.kt.vm", "server.kt".asPath()) asSrcOf SourcesetType.main
FileTemplateDescriptor("$id/server.kt.vm", "Server.kt".asPath()) asSrcOf SourcesetType.main
)
val imports = InterceptionPoint("imports", emptyList<String>())

2
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/NativeConsoleApplicationTemplate.kt
View File

@@ -36,6 +36,6 @@ class NativeConsoleApplicationTemplate : Template() {
targetConfigurationIR.withIrs(NativeTargetInternalIR("main"))
override fun Reader.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> = buildList {
+(FileTemplateDescriptor("$id/main.kt.vm", "main.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/main.kt.vm", "Main.kt".asPath()) asSrcOf SourcesetType.main)
}
}

4
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/ReactJsClientTemplate.kt
View File

@@ -86,8 +86,8 @@ class ReactJsClientTemplate : JsClientTemplate() {
if (!hasKtorServNeighbourTarget) {
+(FileTemplateDescriptor("jsClient/index.html.vm") asResourceOf SourcesetType.main)
}
+(FileTemplateDescriptor("$id/reactClient.kt.vm", "client.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/reactComponent.kt.vm", "welcome.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/reactClient.kt.vm", "Client.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/reactComponent.kt.vm", "Welcome.kt".asPath()) asSrcOf SourcesetType.main)
if (useStyledComponents.reference.settingValue) {
+(FileTemplateDescriptor("$id/WelcomeStyles.kt.vm") asSrcOf SourcesetType.main)

6
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt
View File

@@ -57,11 +57,11 @@ class SimpleJsClientTemplate : JsClientTemplate() {
+(FileTemplateDescriptor("jsClient/index.html.vm") asResourceOf SourcesetType.main)
}
if (useKotlinxHtml.reference.settingValue()) {
+(FileTemplateDescriptor("$id/client.kt.vm") asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/client.kt.vm", "Client.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/TestClient.kt.vm", "TestClient.kt".asPath()) asSrcOf SourcesetType.test)
} else {
+(FileTemplateDescriptor("$id/simple.kt.vm") asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/SimpleTest.kt.vm", "TestClient.kt".asPath()) asSrcOf SourcesetType.test)
+(FileTemplateDescriptor("$id/simple.kt.vm", "Simple.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/SimpleTest.kt.vm", "SimpleTest.kt".asPath()) asSrcOf SourcesetType.test)
}
}
}

2
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleNodeJsTemplate.kt
View File

@@ -69,7 +69,7 @@ class SimpleNodeJsTemplate : Template() {
override fun Reader.getFileTemplates(module: ModuleIR): List<FileTemplateDescriptorWithPath> =
withSettingsOf(module.originalModule) {
buildList {
+(FileTemplateDescriptor("$id/main.kt.vm") asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/main.kt.vm", "Main.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/GreetingTest.kt.vm") asSrcOf SourcesetType.test)
}
}

4
plugins/kotlin/project-wizard/core/src/org/jetbrains/kotlin/tools/projectWizard/templates/compose/ComposeJvmDesktopTemplate.kt
View File

@@ -70,10 +70,10 @@ class ComposeJvmDesktopTemplate : Template() {
val dependsOnMppModule: Module? =
module.originalModule.dependencies.map { moduleByReference(it) }.firstOrNull { it.template is ComposeMppModuleTemplate }
if (dependsOnMppModule == null) {
+(FileTemplateDescriptor("$id/main.kt", "main.kt".asPath()) asSrcOf SourcesetType.main)
+(FileTemplateDescriptor("$id/main.kt", "Main.kt".asPath()) asSrcOf SourcesetType.main)
} else {
val javaPackage = dependsOnMppModule.javaPackage(pomIR()).asCodePackage()
+(FileTemplateDescriptor("composeMpp/main.kt.vm", "main.kt".asPath())
+(FileTemplateDescriptor("composeMpp/main.kt.vm", "Main.kt".asPath())
asSrcOf SourcesetType.main
withSettings ("sharedPackage" to javaPackage)
)