diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt index 67a068e4201..6c3de9da3b2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinFileAction.kt @@ -46,6 +46,7 @@ import org.jetbrains.kotlin.idea.statistics.FUSEventGroups import org.jetbrains.kotlin.idea.statistics.KotlinFUSLogger import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.lexer.KtTokens +import org.jetbrains.kotlin.parsing.KotlinParserDefinition.Companion.STD_SCRIPT_SUFFIX import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedDeclaration @@ -170,7 +171,7 @@ class NewKotlinFileAction : CreateFileFromTemplateAction( private fun removeKotlinExtensionIfPresent(name: String): String = when { name.endsWith(".$KOTLIN_WORKSHEET_EXTENSION") -> name.removeSuffix(".$KOTLIN_WORKSHEET_EXTENSION") - name.endsWith(".$KOTLIN_SCRIPT_EXTENSION") -> name.removeSuffix(".$KOTLIN_SCRIPT_EXTENSION") + name.endsWith(".$STD_SCRIPT_SUFFIX") -> name.removeSuffix(".$STD_SCRIPT_SUFFIX") name.endsWith(".${KotlinFileType.EXTENSION}") -> name.removeSuffix(".${KotlinFileType.EXTENSION}") else -> name } diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt index 7b64e630afa..1e1fbe34653 100644 --- a/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt +++ b/idea/src/org/jetbrains/kotlin/idea/actions/NewKotlinWorksheetAction.kt @@ -10,7 +10,6 @@ import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiFile const val KOTLIN_WORKSHEET_EXTENSION: String = "ws.kts" -const val KOTLIN_SCRIPT_EXTENSION = "kts" class NewKotlinWorksheetAction : NewKotlinScriptAction( actionName = "Kotlin Worksheet", diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt index 5960474dd0e..1752e983369 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt @@ -22,7 +22,6 @@ import com.intellij.testFramework.TestActionEvent import com.intellij.util.ui.UIUtil import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.idea.KotlinLanguage -import org.jetbrains.kotlin.idea.actions.KOTLIN_SCRIPT_EXTENSION import org.jetbrains.kotlin.idea.actions.KOTLIN_WORKSHEET_EXTENSION import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager import org.jetbrains.kotlin.idea.highlighter.KotlinHighlightingUtil @@ -36,6 +35,7 @@ import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.application.runWriteAction +import org.jetbrains.kotlin.parsing.KotlinParserDefinition.Companion.STD_SCRIPT_SUFFIX import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil @@ -70,7 +70,7 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { } private fun doMultiFileTest(dirName: String, isWorksheet: Boolean) { - val mainFileExtension = if (isWorksheet) KOTLIN_WORKSHEET_EXTENSION else KOTLIN_SCRIPT_EXTENSION + val mainFileExtension = if (isWorksheet) KOTLIN_WORKSHEET_EXTENSION else STD_SCRIPT_SUFFIX val javaFiles = arrayListOf() val kotlinFiles = arrayListOf()