From a406f1b36166c23df9a80de93efbf5aebf9ccddf Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 1 Aug 2018 13:42:23 +0300 Subject: [PATCH] Revert registering ClsCustomNavigationPolicy EP in 182 (KT-24891) Registration can't be removed because there's still a usage in ClsFileImpl: Caused by: java.lang.IllegalArgumentException: Missing extension point: com.intellij.psi.clsCustomNavigationPolicy in area null at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.getExtensionPoint(ExtensionsAreaImpl.java:335) at com.intellij.openapi.extensions.impl.ExtensionsAreaImpl.getExtensionPoint(ExtensionsAreaImpl.java:26) at com.intellij.openapi.extensions.Extensions.getExtensions(Extensions.java:104) at com.intellij.openapi.extensions.Extensions.getExtensions(Extensions.java:98) at com.intellij.openapi.extensions.Extensions.getExtensions(Extensions.java:93) at com.intellij.psi.impl.compiled.ClsFileImpl.getNavigationElement(ClsFileImpl.java:312) --- .../kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.182 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.182 b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.182 index 1f7fe07e555..39c14366aa4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.182 +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/IdeaExtensionPoints.kt.182 @@ -9,11 +9,14 @@ import com.intellij.core.CoreApplicationEnvironment import com.intellij.lang.jvm.facade.JvmElementProvider import com.intellij.openapi.extensions.ExtensionsArea import com.intellij.psi.JavaModuleSystem +import com.intellij.psi.impl.compiled.ClsCustomNavigationPolicy internal object IdeaExtensionPoints { const val IDEA_COMPATIBLE_BUILD_NUMBER = "181.3" fun registerVersionSpecificAppExtensionPoints(area: ExtensionsArea) { + @Suppress("DEPRECATION") + CoreApplicationEnvironment.registerExtensionPoint(area, ClsCustomNavigationPolicy.EP_NAME, ClsCustomNavigationPolicy::class.java) CoreApplicationEnvironment.registerExtensionPoint(area, JavaModuleSystem.EP_NAME, JavaModuleSystem::class.java) }