Drop redundant usages of the ScriptDefinitionProvider

This commit is contained in:
Ilya Chernikov
2019-02-20 11:24:26 +01:00
parent e99715cf82
commit db3eb5707b
2 changed files with 0 additions and 29 deletions
@@ -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
}
}
@@ -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();