From db3eb5707bbf7252e53bff228cebd4e2d9e6b5af Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 20 Feb 2019 11:24:26 +0100
Subject: [PATCH] Drop redundant usages of the ScriptDefinitionProvider

---
 .../tree/visitors-generator/src/PsiSetup.kt   | 21 -------------------
 .../kotlin/parsing/AbstractParsingTest.java   |  8 -------
 2 files changed, 29 deletions(-)

diff --git a/compiler/fir/tree/visitors-generator/src/PsiSetup.kt b/compiler/fir/tree/visitors-generator/src/PsiSetup.kt
index 8d895ef7c58..83292b830f4 100644
--- a/compiler/fir/tree/visitors-generator/src/PsiSetup.kt
+++ b/compiler/fir/tree/visitors-generator/src/PsiSetup.kt
@@ -14,9 +14,6 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Disposer
 import org.jetbrains.kotlin.idea.KotlinFileType
 import org.jetbrains.kotlin.parsing.KotlinParserDefinition
-import org.jetbrains.kotlin.script.KotlinScriptDefinition
-import org.jetbrains.kotlin.script.ScriptDefinitionProvider
-import org.jetbrains.kotlin.script.StandardScriptDefinition
 
 internal data class PsiSetup(
     val applicationEnvironment: CoreApplicationEnvironment,
@@ -35,7 +32,6 @@ internal fun setup(): PsiSetup {
     CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaLanguage.EP_NAME, MetaLanguage::class.java)
 
 
-    applicationEnvironment.registerApplicationService(ScriptDefinitionProvider::class.java, NoopScriptDefinitionProvider())
     applicationEnvironment.registerFileType(KotlinFileType.INSTANCE, "kt")
     applicationEnvironment.registerParserDefinition(KotlinParserDefinition())
 
@@ -51,20 +47,3 @@ internal inline fun <T> withPsiSetup(l: PsiSetup.() -> T): T {
     return t
 }
 
-private class NoopScriptDefinitionProvider : ScriptDefinitionProvider {
-    override fun getDefaultScriptDefinition(): KotlinScriptDefinition {
-        return StandardScriptDefinition
-    }
-
-    override fun getKnownFilenameExtensions(): Sequence<String> {
-        return emptySequence()
-    }
-
-    override fun isScript(fileName: String): Boolean {
-        return false
-    }
-
-    override fun findScriptDefinition(fileName: String): KotlinScriptDefinition? {
-        return null
-    }
-}
diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java
index d90ed39b45a..7a3548a21eb 100644
--- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java
+++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java
@@ -31,8 +31,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.KtNodeTypes;
 import org.jetbrains.kotlin.TestsCompilerError;
 import org.jetbrains.kotlin.psi.*;
-import org.jetbrains.kotlin.script.ScriptDefinitionProvider;
-import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.testFramework.KtParsingTestCase;
 
@@ -139,12 +137,6 @@ public abstract class AbstractParsingTest extends KtParsingTestCase {
         }
     }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        getProject().registerService(ScriptDefinitionProvider.class, CliScriptDefinitionProvider.class);
-    }
-
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();