azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name script run configuration after script file name

Browse Source 
This makes more evident difference between script and non-script run configurations.
This commit is contained in:
Nikolay Krasko
2016-12-29 18:51:21 +03:00
parent 139ec8c920
commit 9ff8192aff
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt
+1 -1
View File
@@ -101,7 +101,7 @@ class KotlinStandaloneScriptRunConfiguration(
override fun getState(executor: Executor, environment: ExecutionEnvironment): RunProfileState = ScriptCommandLineState(environment, this) 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<out RunConfiguration> { override fun getConfigurationEditor(): SettingsEditor<out RunConfiguration> {
val group = SettingsEditorGroup<KotlinStandaloneScriptRunConfiguration>() val group = SettingsEditorGroup<KotlinStandaloneScriptRunConfiguration>()
idea/tests/org/jetbrains/kotlin/idea/run/StandaloneScriptRunConfigurationTest.kt
+7 -7
View File
@@ -39,7 +39,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() {
val runConfiguration = createConfigurationFromElement(script) as KotlinStandaloneScriptRunConfiguration val runConfiguration = createConfigurationFromElement(script) as KotlinStandaloneScriptRunConfiguration
Assert.assertEquals(script.containingFile.virtualFile.canonicalPath, runConfiguration.filePath) Assert.assertEquals(script.containingFile.virtualFile.canonicalPath, runConfiguration.filePath)
Assert.assertEquals("SimpleScript", runConfiguration.name) Assert.assertEquals("simpleScript.kts", runConfiguration.name)
val javaParameters = getJavaRunParameters(runConfiguration) val javaParameters = getJavaRunParameters(runConfiguration)
val programParametersList = javaParameters.programParametersList.list val programParametersList = javaParameters.programParametersList.list
@@ -53,7 +53,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() {
val script = KotlinScriptFqnIndex.instance.get("foo.SimpleScript", project, project.allScope()).single() val script = KotlinScriptFqnIndex.instance.get("foo.SimpleScript", project, project.allScope()).single()
val runConfiguration = createConfigurationFromElement(script, save = true) as KotlinStandaloneScriptRunConfiguration 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 scriptVirtualFileBefore = script.containingFile.virtualFile
val originalPath = scriptVirtualFileBefore.canonicalPath val originalPath = scriptVirtualFileBefore.canonicalPath
val originalWorkingDirectory = scriptVirtualFileBefore.parent.canonicalPath val originalWorkingDirectory = scriptVirtualFileBefore.parent.canonicalPath
@@ -62,7 +62,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() {
RefactoringFactory.getInstance(project).createRename(script.containingFile, "renamedScript.kts").run() 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 val scriptVirtualFileAfter = script.containingFile.virtualFile
assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath) assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath)
@@ -77,7 +77,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() {
val script = KotlinScriptFqnIndex.instance.get("foo.Script", project, project.allScope()).single() val script = KotlinScriptFqnIndex.instance.get("foo.Script", project, project.allScope()).single()
val runConfiguration = createConfigurationFromElement(script, save = true) as KotlinStandaloneScriptRunConfiguration 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 scriptVirtualFileBefore = script.containingFile.virtualFile
val originalPath = scriptVirtualFileBefore.canonicalPath val originalPath = scriptVirtualFileBefore.canonicalPath
val originalWorkingDirectory = scriptVirtualFileBefore.parent.canonicalPath val originalWorkingDirectory = scriptVirtualFileBefore.parent.canonicalPath
@@ -86,7 +86,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() {
moveScriptFile(script.containingFile) moveScriptFile(script.containingFile)
Assert.assertEquals("Script", runConfiguration.name) Assert.assertEquals("script.kts", runConfiguration.name)
val scriptVirtualFileAfter = script.containingFile.virtualFile val scriptVirtualFileAfter = script.containingFile.virtualFile
assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath) assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath)
@@ -101,7 +101,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() {
val script = KotlinScriptFqnIndex.instance.get("foo.Script", project, project.allScope()).single() val script = KotlinScriptFqnIndex.instance.get("foo.Script", project, project.allScope()).single()
val runConfiguration = createConfigurationFromElement(script, save = true) as KotlinStandaloneScriptRunConfiguration val runConfiguration = createConfigurationFromElement(script, save = true) as KotlinStandaloneScriptRunConfiguration
Assert.assertEquals("Script", runConfiguration.name) Assert.assertEquals("script.kts", runConfiguration.name)
runConfiguration.workingDirectory = runConfiguration.workingDirectory + "/customWorkingDirectory" runConfiguration.workingDirectory = runConfiguration.workingDirectory + "/customWorkingDirectory"
val scriptVirtualFileBefore = script.containingFile.virtualFile val scriptVirtualFileBefore = script.containingFile.virtualFile
val originalPath = scriptVirtualFileBefore.canonicalPath val originalPath = scriptVirtualFileBefore.canonicalPath
@@ -112,7 +112,7 @@ class StandaloneScriptRunConfigurationTest : KotlinCodeInsightTestCase() {
moveScriptFile(script.containingFile) moveScriptFile(script.containingFile)
Assert.assertEquals("Script", runConfiguration.name) Assert.assertEquals("script.kts", runConfiguration.name)
val scriptVirtualFileAfter = script.containingFile.virtualFile val scriptVirtualFileAfter = script.containingFile.virtualFile
assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath) assertEquals(scriptVirtualFileAfter.canonicalPath, runConfiguration.filePath)