Drop redundant usages of the ScriptDefinitionProvider
This commit is contained in:
@@ -14,9 +14,6 @@ import com.intellij.openapi.project.Project
|
|||||||
import com.intellij.openapi.util.Disposer
|
import com.intellij.openapi.util.Disposer
|
||||||
import org.jetbrains.kotlin.idea.KotlinFileType
|
import org.jetbrains.kotlin.idea.KotlinFileType
|
||||||
import org.jetbrains.kotlin.parsing.KotlinParserDefinition
|
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(
|
internal data class PsiSetup(
|
||||||
val applicationEnvironment: CoreApplicationEnvironment,
|
val applicationEnvironment: CoreApplicationEnvironment,
|
||||||
@@ -35,7 +32,6 @@ internal fun setup(): PsiSetup {
|
|||||||
CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaLanguage.EP_NAME, MetaLanguage::class.java)
|
CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaLanguage.EP_NAME, MetaLanguage::class.java)
|
||||||
|
|
||||||
|
|
||||||
applicationEnvironment.registerApplicationService(ScriptDefinitionProvider::class.java, NoopScriptDefinitionProvider())
|
|
||||||
applicationEnvironment.registerFileType(KotlinFileType.INSTANCE, "kt")
|
applicationEnvironment.registerFileType(KotlinFileType.INSTANCE, "kt")
|
||||||
applicationEnvironment.registerParserDefinition(KotlinParserDefinition())
|
applicationEnvironment.registerParserDefinition(KotlinParserDefinition())
|
||||||
|
|
||||||
@@ -51,20 +47,3 @@ internal inline fun <T> withPsiSetup(l: PsiSetup.() -> T): T {
|
|||||||
return 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.KtNodeTypes;
|
||||||
import org.jetbrains.kotlin.TestsCompilerError;
|
import org.jetbrains.kotlin.TestsCompilerError;
|
||||||
import org.jetbrains.kotlin.psi.*;
|
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.KotlinTestUtils;
|
||||||
import org.jetbrains.kotlin.test.testFramework.KtParsingTestCase;
|
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
|
@Override
|
||||||
protected void tearDown() throws Exception {
|
protected void tearDown() throws Exception {
|
||||||
super.tearDown();
|
super.tearDown();
|
||||||
|
|||||||
Reference in New Issue
Block a user