From 1f5e89cd32ba65ef6298596680daad5b16c2ecbf Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Thu, 7 Feb 2019 16:07:19 +0300
Subject: [PATCH] Disable JavaElementFinder in FIR tests to avoid old FE

---
 .../fir/AbstractFirResolveWithSessionTestCase.kt      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt
index 6579b3630c7..8928c8f1ae6 100644
--- a/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt
+++ b/compiler/fir/resolve/tests/org/jetbrains/kotlin/fir/AbstractFirResolveWithSessionTestCase.kt
@@ -5,7 +5,10 @@
 
 package org.jetbrains.kotlin.fir
 
+import com.intellij.openapi.extensions.Extensions
+import com.intellij.psi.PsiElementFinder
 import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
 import org.jetbrains.kotlin.fir.java.FirJavaModuleBasedSession
 import org.jetbrains.kotlin.fir.java.FirLibrarySession
 import org.jetbrains.kotlin.fir.java.FirProjectSessionProvider
@@ -13,6 +16,14 @@ import org.jetbrains.kotlin.test.KotlinTestWithEnvironment
 
 abstract class AbstractFirResolveWithSessionTestCase : KotlinTestWithEnvironment() {
 
+    override fun setUp() {
+        super.setUp()
+
+        Extensions.getArea(project)
+            .getExtensionPoint(PsiElementFinder.EP_NAME)
+            .unregisterExtension(JavaElementFinder::class.java)
+    }
+
     open fun createSession(sourceScope: GlobalSearchScope): FirSession {
         val moduleInfo = FirTestModuleInfo()
         val provider = FirProjectSessionProvider(project)