azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AA: reuse CoreJarFileSystem from KotlinCoreEnvironment in tests

Browse Source
This commit is contained in:
Jinseong Jeon
2022-03-07 23:22:09 -08:00
committed by teamcity
parent 89725941df
commit 6ec6def8e3
8 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/FirFrontendApiTestConfiguratorService.kt
+5 -2
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir
import com.intellij.mock.MockApplication
import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable
import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.utils.configureOptionalTestCompilerPlugin
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
@@ -41,14 +42,16 @@ object FirFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorServic
compilerConfig: CompilerConfiguration,
files: List<KtFile>,
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
projectStructureProvider: ProjectStructureProvider
projectStructureProvider: ProjectStructureProvider,
jarFileSystem: CoreJarFileSystem,
) {
FirLowLevelFrontendApiTestConfiguratorService.registerProjectServices(
project,
compilerConfig,
files,
packagePartProvider,
projectStructureProvider
projectStructureProvider,
jarFileSystem
)
}
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/binary/LibraryFrontendApiTestConfiguratorService.kt
+3 -1
View File
@@ -10,6 +10,7 @@ import com.intellij.mock.MockApplication
import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable
import com.intellij.openapi.extensions.LoadingOrder
import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.ClassFileViewProviderFactory
import com.intellij.psi.FileTypeFileViewProviders
import com.intellij.psi.compiled.ClassFileDecompilers
@@ -42,7 +43,8 @@ object LibraryFrontendApiTestConfiguratorService : FrontendApiTestConfiguratorSe
compilerConfig: CompilerConfiguration,
files: List<KtFile>,
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
projectStructureProvider: ProjectStructureProvider
projectStructureProvider: ProjectStructureProvider,
jarFileSystem: CoreJarFileSystem,
) {
project.registerTestServices(files, packagePartProvider, projectStructureProvider)
}
analysis/analysis-api-fir/tests/org/jetbrains/kotlin/analysis/api/fir/utils/libraries/source/LibrarySourceFrontendApiTestConfiguratorService.kt
+3 -1
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.analysis.api.fir.utils.libraries.source
import com.intellij.mock.MockApplication
import com.intellij.mock.MockProject
import com.intellij.openapi.Disposable
import com.intellij.openapi.vfs.impl.jar.CoreJarFileSystem
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.analysis.api.fir.FirFrontendApiTestConfiguratorService
import org.jetbrains.kotlin.analysis.api.impl.barebone.test.FrontendApiTestConfiguratorService
@@ -35,7 +36,8 @@ object LibrarySourceFrontendApiTestConfiguratorService : FrontendApiTestConfigur
compilerConfig: CompilerConfiguration,
files: List<KtFile>,
packagePartProvider: (GlobalSearchScope) -> PackagePartProvider,
projectStructureProvider: ProjectStructureProvider
projectStructureProvider: ProjectStructureProvider,
jarFileSystem: CoreJarFileSystem,
) {
project.registerTestServices(files, packagePartProvider, projectStructureProvider)
}