Remove deprecated methods from ScriptDefinitionProvider

^KTIJ-31294

Author: imbananko

plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionProvider.kt

@@ -9,12 +9,6 @@ import com.intellij.openapi.project.Project
 import kotlin.script.experimental.api.SourceCode
 
 interface ScriptDefinitionProvider {
-    @Deprecated("Migrating to configuration refinement", level = DeprecationLevel.ERROR)
-    fun findScriptDefinition(fileName: String): KotlinScriptDefinition?
-
-    @Deprecated("Migrating to configuration refinement", level = DeprecationLevel.ERROR)
-    fun getDefaultScriptDefinition(): KotlinScriptDefinition
-
     fun isScript(script: SourceCode): Boolean
 
     fun findDefinition(script: SourceCode): ScriptDefinition?

plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt

@@ -79,22 +79,11 @@ abstract class LazyScriptDefinitionProvider : ScriptDefinitionProvider {
             cachedDefinitions.firstOrNull { it.isScript(script) }
         }
 
-    @Suppress("OverridingDeprecatedMember", "DEPRECATION", "OVERRIDE_DEPRECATION")
-    override fun findScriptDefinition(fileName: String): KotlinScriptDefinition? =
-        if (nonScriptId(fileName)) {
-            null
-        } else {
-            cachedDefinitions.map { it.legacyDefinition }.firstOrNull { it.isScript(fileName) }
-        }
-
     override fun isScript(script: SourceCode): Boolean = findDefinition(script) != null
 
     override fun getKnownFilenameExtensions(): Sequence<String> =
         cachedDefinitions.map { it.fileExtension }
 
-    @Suppress("OverridingDeprecatedMember", "DEPRECATION", "OVERRIDE_DEPRECATION")
-    override fun getDefaultScriptDefinition(): KotlinScriptDefinition = getDefaultDefinition().legacyDefinition
-
     companion object {
         // TODO: find a common place for storing kotlin-related extensions and reuse values from it everywhere
         protected val nonScriptFilenameSuffixes = arrayOf(".${KotlinFileType.EXTENSION}", ".${JavaFileType.DEFAULT_EXTENSION}")

plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinitionsSource.kt

@@ -6,6 +6,5 @@
 package org.jetbrains.kotlin.scripting.definitions
 
 interface ScriptDefinitionsSource {
-
     val definitions: Sequence<ScriptDefinition>
 }

plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt

@@ -41,9 +41,7 @@ fun PsiFile.isScript(): Boolean {
     // Sometimes - i.e. when event system is disabled for a view provider - requesting
     // virtual file directly from the viewProvider is the only way of obtaining it
     val virtualFile = virtualFile ?: originalFile.virtualFile ?: viewProvider.virtualFile
-    if (virtualFile.isNonScript()) return false
-
-    return true
+    return !virtualFile.isNonScript()
 }
 
 fun PsiFile.findScriptDefinition(): ScriptDefinition? {