FIR: Fix bunch files for 181
This commit is contained in:
+6
-2
@@ -48,7 +48,11 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() {
|
|||||||
val sessionProvider = FirProjectSessionProvider(project)
|
val sessionProvider = FirProjectSessionProvider(project)
|
||||||
|
|
||||||
//For BuiltIns, registered in sessionProvider automatically
|
//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 configToSession = modules.mapValues { (config, info) ->
|
||||||
val moduleFiles = groupedByModule.getValue(config)
|
val moduleFiles = groupedByModule.getValue(config)
|
||||||
@@ -152,4 +156,4 @@ abstract class AbstractFirDiagnosticsSmokeTest : BaseDiagnosticsTest() {
|
|||||||
dependencies += builtInsModuleInfo
|
dependencies += builtInsModuleInfo
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-1
@@ -6,6 +6,7 @@
|
|||||||
package org.jetbrains.kotlin.fir
|
package org.jetbrains.kotlin.fir
|
||||||
|
|
||||||
import com.intellij.openapi.extensions.Extensions
|
import com.intellij.openapi.extensions.Extensions
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.psi.PsiElementFinder
|
import com.intellij.psi.PsiElementFinder
|
||||||
import com.intellij.psi.search.GlobalSearchScope
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
import org.jetbrains.kotlin.asJava.finder.JavaElementFinder
|
||||||
@@ -16,4 +17,16 @@ import org.jetbrains.kotlin.test.KotlinTestWithEnvironment
|
|||||||
|
|
||||||
abstract class AbstractFirResolveWithSessionTestCase : 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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user