FIR: Fix bunch files for 181

This commit is contained in:
Denis Zharkov
2019-03-28 11:14:45 +03:00
parent 59398536d7
commit 48f0790785
2 changed files with 20 additions and 3 deletions
@@ -48,7 +48,11 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() {
val sessionProvider = FirProjectSessionProvider(project)
//For BuiltIns, registered in sessionProvider automatically
FirLibrarySession(builtInsModuleInfo, sessionProvider, GlobalSearchScope.EMPTY_SCOPE)
val allProjectScope = GlobalSearchScope.allScope(project)
FirLibrarySession.create(
builtInsModuleInfo, sessionProvider, allProjectScope,
environment
)
val configToSession = modules.mapValues { (config, info) ->
val moduleFiles = groupedByModule.getValue(config)
@@ -152,4 +156,4 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() {
dependencies += builtInsModuleInfo
}
}
}
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.fir
import com.intellij.openapi.extensions.Extensions
import com.intellij.openapi.project.Project
import com.intellij.psi.PsiElementFinder
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
@@ -16,4 +17,16 @@ import org.jetbrains.kotlin.test.KotlinTestWithEnvironment
abstract class AbstractFirResolveWithSessionTestCase : KotlinTestWithEnvironment() {
}
override fun setUp() {
super.setUp()
prepareProjectExtensions(project)
}
protected fun prepareProjectExtensions(project: Project) {
// No relevant API in 181
// Extensions.getArea(project)
// .getExtensionPoint(PsiElementFinder.EP_NAME)
// .unregisterExtension(JavaElementFinder::class.java)
}
}