From 3c93824e1672c3bf483f1d4df2e2d3672f611ce9 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 6 Oct 2015 19:25:19 +0200 Subject: [PATCH] mark JS features as experimental in the UI --- idea/src/META-INF/plugin.xml | 2 +- .../idea/configuration/KotlinJavascriptMavenConfigurator.java | 2 +- .../kotlin/idea/configuration/KotlinJsModuleConfigurator.java | 2 +- .../org/jetbrains/kotlin/idea/framework/JSFrameworkType.java | 2 +- .../jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt | 4 ++-- .../kotlin/idea/k2jsrun/K2JSRunConfigurationType.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index b4063c0edb7..0f4864d45bb 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -93,7 +93,7 @@ + text="Configure Kotlin (JavaScript - experimental) in Project"> diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java index 23e14eb9551..8bcb50e0a6a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java @@ -30,7 +30,7 @@ public class KotlinJavascriptMavenConfigurator extends KotlinMavenConfigurator { private static final String JS_GOAL = "js"; private static final String JS_TEST_GOAL = "test-js"; private static final String JS_EXECUTION_ID = "js"; - private static final String PRESENTABLE_TEXT = "JavaScript Maven"; + private static final String PRESENTABLE_TEXT = "JavaScript Maven - experimental"; public KotlinJavascriptMavenConfigurator() { super(STD_LIB_ID, NAME, PRESENTABLE_TEXT); diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java index f09c8dae952..9406401accf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java @@ -48,7 +48,7 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator { @NotNull @Override public String getPresentableText() { - return JavaScript.FULL_NAME; + return JavaScript.FULL_NAME + " - experimental"; } @Override diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java index 8954708b043..6d0c423ced5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkType.java @@ -41,7 +41,7 @@ public class JSFrameworkType extends FrameworkTypeEx { @NotNull @Override public String getPresentableName() { - return "Kotlin (JavaScript)"; + return "Kotlin (JavaScript - experimental)"; } @NotNull diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt index 943ce31e72f..de1cff288e0 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinTemplatesFactory.kt @@ -33,7 +33,7 @@ public class KotlinTemplatesFactory : ProjectTemplatesFactory() { override fun createTemplates(group: String?, context: WizardContext?) = arrayOf( - BuilderBasedTemplate(KotlinModuleBuilder(JvmPlatform, "Kotlin - JVM", "Kotlin module for JVM target")), - BuilderBasedTemplate(KotlinModuleBuilder(JsPlatform, "Kotlin - JavaScript", "Kotlin module for JavaScript target")) + BuilderBasedTemplate(KotlinModuleBuilder(JvmPlatform, "Kotlin (JVM)", "Kotlin module for JVM target")), + BuilderBasedTemplate(KotlinModuleBuilder(JsPlatform, "Kotlin (JavaScript - experimental)", "Kotlin module for JavaScript target")) ) } diff --git a/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationType.java b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationType.java index 73c9636816d..12588debd0b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationType.java +++ b/idea/src/org/jetbrains/kotlin/idea/k2jsrun/K2JSRunConfigurationType.java @@ -26,7 +26,7 @@ public final class K2JSRunConfigurationType extends ConfigurationTypeBase { } public K2JSRunConfigurationType() { - super("K2JSConfigurationType", "Kotlin (JavaScript)", "Kotlin to JavaScript configuration", JetIcons.LAUNCH); + super("K2JSConfigurationType", "Kotlin (JavaScript - experimental)", "Kotlin to JavaScript configuration", JetIcons.LAUNCH); addFactory(new K2JSConfigurationFactory()); }