diff --git a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties index f4cefc85527..6b02654d5a7 100644 --- a/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties +++ b/idea/idea-gradle/res/messages/KotlinIdeaGradleBundle.properties @@ -1,7 +1,7 @@ action.label.text.load.script.configuration=Load script configuration action.text.install=Install action.text.show.kotlin.gradle.dsl.logs.in=Show Kotlin Gradle DSL Logs in {0} -build.0=Build {0} +build.0.project=Build {0} change.build.gradle.configuration=Change build.gradle configuration description.text.a.single.platform.kotlin.library.or.application.targeting.javascript=A single-platform Kotlin library or application targeting JavaScript description.text.a.single.platform.kotlin.library.or.application.targeting.js.for.browser=A single-platform Kotlin library or application targeting JavaScript for browser diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt index 17412f63f80..be1f110ea0a 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/GradleKotlinFrameworkSupportProvider.kt @@ -28,6 +28,8 @@ import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.openapi.vfs.VfsUtil.createDirectoryIfMissing import com.intellij.psi.PsiFile +import org.jetbrains.annotations.Nls +import org.jetbrains.annotations.NonNls import org.jetbrains.kotlin.idea.KotlinIcons import org.jetbrains.kotlin.idea.KotlinIdeaGradleBundle import org.jetbrains.kotlin.idea.formatter.KotlinStyleGuideCodeStyle @@ -162,9 +164,13 @@ abstract class GradleKotlinFrameworkSupportProvider( protected abstract fun getDependencies(sdk: Sdk?): List protected open fun getTestDependencies(): List = listOf() + @NonNls protected abstract fun getPluginId(): String + + @NonNls protected abstract fun getPluginExpression(): String + @Nls protected abstract fun getDescription(): String } @@ -253,7 +259,8 @@ open class GradleKotlinJSBrowserFrameworkSupportProvider( super.addSupport(buildScriptData, module, sdk, specifyPluginVersionIfNeeded, explicitPluginVersion) getNewFileWriter(module, "src/main/resources", "index.html")?.use { - it.write(""" + it.write( + """ @@ -265,18 +272,21 @@ open class GradleKotlinJSBrowserFrameworkSupportProvider( - """.trimIndent().trim()) + """.trimIndent().trim() + ) } getNewFileWriter(module, "src/main/kotlin", "main.kt")?.use { - it.write(""" + it.write( + """ import kotlin.browser.document fun main() { document.write("Hello, world!") } - """.trimIndent().trim()) + """.trimIndent().trim() + ) } } diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinJsGradleModuleConfigurator.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinJsGradleModuleConfigurator.kt index 9a36459eb5d..a48488d8829 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinJsGradleModuleConfigurator.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinJsGradleModuleConfigurator.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.platform.js.JsPlatforms class KotlinJsGradleModuleConfigurator : KotlinWithGradleConfigurator() { override val name: String = "gradle-js" - override val presentableText: String = KotlinIdeaGradleBundle.message("presentable.text.javascript.with.gradle") + override val presentableText: String get() = KotlinIdeaGradleBundle.message("presentable.text.javascript.with.gradle") override val targetPlatform: TargetPlatform = JsPlatforms.defaultJsPlatform override val kotlinPluginName: String = KOTLIN_JS override fun getKotlinPluginExpression(forKotlinDsl: Boolean): String = diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java index fe86aa9cec8..3e95bb13477 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java @@ -152,7 +152,7 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner else { projectName = projectFile.getName(); } - String executionName = KotlinIdeaGradleBundle.message("build.0", projectName); + String executionName = KotlinIdeaGradleBundle.message("build.0.project", projectName); settings.setExecutionName(executionName); settings.setExternalProjectPath(rootProjectPath); settings.setTaskNames(ContainerUtil.collect(ContainerUtil.concat(cleanTasks, buildTasks).iterator())); diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.192 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.192 index d57da1e7396..152a6e45aa8 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.192 +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunner.java.192 @@ -150,7 +150,7 @@ class KotlinMPPGradleProjectTaskRunner extends ProjectTaskRunner else { projectName = projectFile.getName(); } - String executionName = KotlinIdeaGradleBundle.message("build.0", projectName); + String executionName = KotlinIdeaGradleBundle.message("build.0.project", projectName); settings.setExecutionName(executionName); settings.setExternalProjectPath(rootProjectPath); settings.setTaskNames(ContainerUtil.collect(ContainerUtil.concat(cleanTasks, buildTasks).iterator())); diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt index ab2433b95fc..b945e3ded59 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/GradleScriptDefinitionsProvider.kt @@ -255,9 +255,8 @@ class GradleScriptDefinitionsContributor(private val project: Project) : ScriptD private const val KOTLIN_DSL_SCRIPT_EXTENSION = "gradle.kts" } - override val name: String = KotlinIdeaGradleBundle.message("text.default.kotlin.gradle.script") - override val fileExtension: String = - KOTLIN_DSL_SCRIPT_EXTENSION + override val name: String get() = KotlinIdeaGradleBundle.message("text.default.kotlin.gradle.script") + override val fileExtension: String = KOTLIN_DSL_SCRIPT_EXTENSION override val scriptCompilationConfiguration: ScriptCompilationConfiguration = ScriptCompilationConfiguration.Default override val hostConfiguration: ScriptingHostConfiguration = ScriptingHostConfiguration(defaultJvmScriptingHostConfiguration) diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt index ad5c57bbd73..ada549ddd6e 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt @@ -123,7 +123,7 @@ class KotlinConsoleRunner( var compilerHelper: ConsoleCompilerHelper by Delegates.notNull() private val consoleScriptDefinition = object : KotlinScriptDefinition(Any::class) { - override val name = KotlinIdeaReplBundle.message("kotlin.repl") + override val name get() = KotlinIdeaReplBundle.message("kotlin.repl") override fun isScript(fileName: String): Boolean = fileName.startsWith(consoleView.virtualFile.name) override fun getScriptName(script: KtScript) = Name.identifier("REPL") } diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinition.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinition.kt index ffcc3f34f7f..d348d7c64a8 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinition.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinition.kt @@ -21,7 +21,7 @@ import kotlin.script.templates.standard.ScriptTemplateWithArgs // TODO: make deprecated and drop usages where possible open class KotlinScriptDefinition(open val template: KClass) : UserDataHolderBase() { - open val name: String = "Kotlin Script" + open val name: String = KOTLIN_SCRIPT // TODO: consider creating separate type (subtype? for kotlin scripts) open val fileType: LanguageFileType = KotlinFileType.INSTANCE @@ -63,6 +63,10 @@ open class KotlinScriptDefinition(open val template: KClass) : UserData open val targetClassAnnotations: List get() = emptyList() open val targetMethodAnnotations: List get() = emptyList() + + companion object { + val KOTLIN_SCRIPT: String get() = "Kotlin Script" + } } object StandardScriptDefinition : KotlinScriptDefinition(ScriptTemplateWithArgs::class) diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt index c86c3b74a33..0ed8c4e08c5 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt @@ -36,7 +36,7 @@ abstract class KotlinScriptDefinitionAdapterFromNewAPIBase : KotlinScriptDefinit override val template: KClass<*> get() = baseClass override val name: String - get() = scriptCompilationConfiguration[ScriptCompilationConfiguration.displayName] ?: "Kotlin Script" + get() = scriptCompilationConfiguration[ScriptCompilationConfiguration.displayName] ?: KOTLIN_SCRIPT override val fileType: LanguageFileType = KotlinFileType.INSTANCE