From 668098f3a866570bf3734e09c8477588b5cb77c1 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Tue, 8 Sep 2020 15:44:35 +0300 Subject: [PATCH] [Gradle, JS] Add simple files without kotlinx.html ^KT-41696 fixed --- .../templates/simpleJsClient/SimpleTest.kt.vm | 9 +++++++++ .../projectWizard/templates/simpleJsClient/simple.kt.vm | 5 +++++ .../projectWizard/templates/SimpleJsClientTemplate.kt | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/SimpleTest.kt.vm create mode 100644 libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/simple.kt.vm diff --git a/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/SimpleTest.kt.vm b/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/SimpleTest.kt.vm new file mode 100644 index 00000000000..63f94bd345c --- /dev/null +++ b/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/SimpleTest.kt.vm @@ -0,0 +1,9 @@ +import kotlin.test.Test +import kotlin.test.assertEquals + +class TestClient { + @Test + fun testGreet() { + assertEquals("world", greet()) + } +} \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/simple.kt.vm b/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/simple.kt.vm new file mode 100644 index 00000000000..85b554aa344 --- /dev/null +++ b/libraries/tools/new-project-wizard/resources/org/jetbrains/kotlin/tools/projectWizard/templates/simpleJsClient/simple.kt.vm @@ -0,0 +1,5 @@ +fun main() { + console.log("Hello, #[[${greet()}]]#") +} + +fun greet() = "world" \ No newline at end of file diff --git a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt index 1d7fd809310..6065b2d1bb0 100644 --- a/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt +++ b/libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/templates/SimpleJsClientTemplate.kt @@ -63,6 +63,9 @@ class SimpleJsClientTemplate : JsClientTemplate() { if (useKotlinxHtml.reference.settingValue()) { +(FileTemplateDescriptor("$id/client.kt.vm") 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) } } }