From 3136e5eefd2375853d3cfe7f3eb98f262569c0a3 Mon Sep 17 00:00:00 2001 From: nik Date: Mon, 4 May 2015 11:43:10 +0200 Subject: [PATCH] removed registration of deprecated extensions points without implementations --- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 4 ---- j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt | 2 -- .../kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt | 4 ---- 3 files changed, 10 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index 5f2dbf4330e..b70029394ff 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -31,7 +31,6 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.extensions.ExtensionsArea -import com.intellij.openapi.fileTypes.ContentBasedFileSubstitutor import com.intellij.openapi.fileTypes.FileTypeExtensionPoint import com.intellij.openapi.fileTypes.PlainTextFileType import com.intellij.openapi.project.Project @@ -48,7 +47,6 @@ import com.intellij.psi.impl.JavaClassSupersImpl import com.intellij.psi.impl.PsiElementFinderImpl import com.intellij.psi.impl.PsiTreeChangePreprocessor import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy -import com.intellij.psi.impl.compiled.ClsStubBuilderFactory import com.intellij.psi.impl.file.impl.JavaFileManager import com.intellij.psi.meta.MetaDataContributor import com.intellij.psi.stubs.BinaryFileStubBuilders @@ -324,12 +322,10 @@ public class KotlinCoreEnvironment private constructor( } private fun registerAppExtensionPoints() { - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ContentBasedFileSubstitutor.EP_NAME, javaClass()) CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), BinaryFileStubBuilders.EP_NAME, javaClass>()) CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), FileContextProvider.EP_NAME, javaClass()) // CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), MetaDataContributor.EP_NAME, javaClass()) - CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), ClsStubBuilderFactory.EP_NAME, javaClass>()) CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), PsiAugmentProvider.EP_NAME, javaClass()) CoreApplicationEnvironment.registerExtensionPoint(Extensions.getRootArea(), JavaMainMethodProvider.EP_NAME, javaClass()) // diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt index a12b0c8b06a..d1d352d6cf4 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinTranslator.kt @@ -30,11 +30,9 @@ import com.intellij.codeInsight.NullableNotNullManager import com.intellij.psi.PsiModifierListOwner import com.intellij.openapi.extensions.Extensions import com.intellij.core.CoreApplicationEnvironment -import com.intellij.psi.impl.compiled.ClsStubBuilderFactory import com.intellij.psi.augment.PsiAugmentProvider import com.intellij.codeInsight.runner.JavaMainMethodProvider import com.intellij.codeInsight.ContainerProvider -import com.intellij.openapi.fileTypes.ContentBasedFileSubstitutor import com.intellij.openapi.fileTypes.FileTypeExtensionPoint import com.intellij.psi.stubs.BinaryFileStubBuilders import com.intellij.psi.FileContextProvider diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt index b2063b6f9d5..0bb988aec47 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterForWebDemoTest.kt @@ -24,7 +24,6 @@ import com.intellij.core.JavaCoreApplicationEnvironment import com.intellij.core.JavaCoreProjectEnvironment import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.extensions.ExtensionsArea -import com.intellij.openapi.fileTypes.ContentBasedFileSubstitutor import com.intellij.openapi.fileTypes.FileTypeExtensionPoint import junit.framework.TestCase import com.intellij.openapi.util.io.FileUtil @@ -35,7 +34,6 @@ import com.intellij.psi.compiled.ClassFileDecompilers import com.intellij.psi.impl.JavaClassSupersImpl import com.intellij.psi.impl.PsiTreeChangePreprocessor import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy -import com.intellij.psi.impl.compiled.ClsStubBuilderFactory import com.intellij.psi.meta.MetaDataContributor import com.intellij.psi.stubs.BinaryFileStubBuilders import com.intellij.psi.util.JavaClassSupers @@ -91,12 +89,10 @@ public abstract class AbstractJavaToKotlinConverterForWebDemoTest : TestCase() { } private fun registerExtensionPoints(area: ExtensionsArea) { - CoreApplicationEnvironment.registerExtensionPoint(area, ContentBasedFileSubstitutor.EP_NAME, javaClass()) CoreApplicationEnvironment.registerExtensionPoint(area, BinaryFileStubBuilders.EP_NAME, javaClass>()) CoreApplicationEnvironment.registerExtensionPoint(area, FileContextProvider.EP_NAME, javaClass()) CoreApplicationEnvironment.registerExtensionPoint(area, MetaDataContributor.EP_NAME, javaClass()) - CoreApplicationEnvironment.registerExtensionPoint(area, ClsStubBuilderFactory.EP_NAME, javaClass>()) CoreApplicationEnvironment.registerExtensionPoint(area, PsiAugmentProvider.EP_NAME, javaClass()) CoreApplicationEnvironment.registerExtensionPoint(area, JavaMainMethodProvider.EP_NAME, javaClass())