From 9ff8192aff44ff5e9009db9af4f060fa3ae0555b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 29 Dec 2016 18:51:21 +0300 Subject: [PATCH] Name script run configuration after script file name This makes more evident difference between script and non-script run configurations. --- .../KotlinStandaloneScriptRunConfiguration.kt | 2 +- .../run/StandaloneScriptRunConfigurationTest.kt | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt b/idea/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt index e011262d6f3..9312694351d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt +++ b/idea/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt @@ -101,7 +101,7 @@ class KotlinStandaloneScriptRunConfiguration( override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState = ScriptCommandLineState(environment, this) - override fun suggestedName() = filePath?.let { ScriptNameUtil.generateNameByFileName(it, KotlinParserDefinition.STD_SCRIPT_EXT) } + override fun suggestedName() = filePath?.substringAfterLast('/') override fun getConfigurationEditor(): SettingsEditor { val group = SettingsEditorGroup() diff --git a/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt index e19f9a81dad..ed72ee0ed0b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt @@ -39,7 +39,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { val runConfiguration = createConfigurationFromElement(script) as KotlinStandaloneScriptRunConfiguration Assert.assertEquals(script.containingFile.virtualFile.canonicalPath, runConfiguration.filePath) - Assert.assertEquals("SimpleScript", runConfiguration.name) + Assert.assertEquals("simpleScript.kts", runConfiguration.name) val javaParameters = getJavaRunParameters(runConfiguration) val programParametersList = javaParameters.programParametersList.list @@ -53,7 +53,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { val script = KotlinScriptFqnIndex.instance.get("foo.SimpleScript", project, project.allScope()).single() val runConfiguration = createConfigurationFromElement(script, save = true) as KotlinStandaloneScriptRunConfiguration - Assert.assertEquals("SimpleScript", runConfiguration.name) + Assert.assertEquals("simpleScript.kts", runConfiguration.name) val scriptVirtualFileBefore = script.containingFile.virtualFile val originalPath = scriptVirtualFileBefore.canonicalPath val originalWorkingDirectory = scriptVirtualFileBefore.parent.canonicalPath @@ -62,7 +62,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { RefactoringFactory.getInstance(project).createRename(script.containingFile, "renamedScript.kts").run() - Assert.assertEquals("RenamedScript", runConfiguration.name) + Assert.assertEquals("renamedScript.kts", runConfiguration.name) val scriptVirtualFileAfter = script.containingFile.virtualFile assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath) @@ -77,7 +77,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { val script = KotlinScriptFqnIndex.instance.get("foo.Script", project, project.allScope()).single() val runConfiguration = createConfigurationFromElement(script, save = true) as KotlinStandaloneScriptRunConfiguration - Assert.assertEquals("Script", runConfiguration.name) + Assert.assertEquals("script.kts", runConfiguration.name) val scriptVirtualFileBefore = script.containingFile.virtualFile val originalPath = scriptVirtualFileBefore.canonicalPath val originalWorkingDirectory = scriptVirtualFileBefore.parent.canonicalPath @@ -86,7 +86,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { moveScriptFile(script.containingFile) - Assert.assertEquals("Script", runConfiguration.name) + Assert.assertEquals("script.kts", runConfiguration.name) val scriptVirtualFileAfter = script.containingFile.virtualFile assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath) @@ -101,7 +101,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { val script = KotlinScriptFqnIndex.instance.get("foo.Script", project, project.allScope()).single() val runConfiguration = createConfigurationFromElement(script, save = true) as KotlinStandaloneScriptRunConfiguration - Assert.assertEquals("Script", runConfiguration.name) + Assert.assertEquals("script.kts", runConfiguration.name) runConfiguration.workingDirectory = runConfiguration.workingDirectory + "/customWorkingDirectory" val scriptVirtualFileBefore = script.containingFile.virtualFile val originalPath = scriptVirtualFileBefore.canonicalPath @@ -112,7 +112,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() { moveScriptFile(script.containingFile) - Assert.assertEquals("Script", runConfiguration.name) + Assert.assertEquals("script.kts", runConfiguration.name) val scriptVirtualFileAfter = script.containingFile.virtualFile assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath)