Remove unneded parameter of ResolverForProjectImpl
This commit is contained in:
@@ -39,7 +39,6 @@ import org.jetbrains.kotlin.name.FqName
|
|||||||
import org.jetbrains.kotlin.name.Name
|
import org.jetbrains.kotlin.name.Name
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
import org.jetbrains.kotlin.resolve.CompilerEnvironment
|
import org.jetbrains.kotlin.resolve.CompilerEnvironment
|
||||||
import org.jetbrains.kotlin.resolve.MultiTargetPlatform
|
|
||||||
import org.jetbrains.kotlin.resolve.TargetEnvironment
|
import org.jetbrains.kotlin.resolve.TargetEnvironment
|
||||||
import org.jetbrains.kotlin.resolve.TargetPlatform
|
import org.jetbrains.kotlin.resolve.TargetPlatform
|
||||||
import org.jetbrains.kotlin.storage.StorageManager
|
import org.jetbrains.kotlin.storage.StorageManager
|
||||||
@@ -93,7 +92,6 @@ class ResolverForProjectImpl<M : ModuleInfo>(
|
|||||||
private val projectContext: ProjectContext,
|
private val projectContext: ProjectContext,
|
||||||
modules: Collection<M>,
|
modules: Collection<M>,
|
||||||
private val modulesContent: (M) -> ModuleContent<M>,
|
private val modulesContent: (M) -> ModuleContent<M>,
|
||||||
private val modulePlatforms: (M) -> MultiTargetPlatform?,
|
|
||||||
private val moduleLanguageSettingsProvider: LanguageSettingsProvider,
|
private val moduleLanguageSettingsProvider: LanguageSettingsProvider,
|
||||||
private val resolverForModuleFactoryByPlatform: (TargetPlatform?) -> ResolverForModuleFactory,
|
private val resolverForModuleFactoryByPlatform: (TargetPlatform?) -> ResolverForModuleFactory,
|
||||||
private val platformParameters: (TargetPlatform) -> PlatformAnalysisParameters,
|
private val platformParameters: (TargetPlatform) -> PlatformAnalysisParameters,
|
||||||
@@ -256,7 +254,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
|
|||||||
module.name,
|
module.name,
|
||||||
projectContext.storageManager,
|
projectContext.storageManager,
|
||||||
builtIns,
|
builtIns,
|
||||||
modulePlatforms(module),
|
module.platform?.multiTargetPlatform,
|
||||||
module.capabilities,
|
module.capabilities,
|
||||||
module.stableName
|
module.stableName
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -86,7 +86,6 @@ object CommonAnalyzerFacade : ResolverForModuleFactory() {
|
|||||||
ProjectContext(project),
|
ProjectContext(project),
|
||||||
listOf(moduleInfo),
|
listOf(moduleInfo),
|
||||||
modulesContent = { ModuleContent(it, files, GlobalSearchScope.allScope(project)) },
|
modulesContent = { ModuleContent(it, files, GlobalSearchScope.allScope(project)) },
|
||||||
modulePlatforms = { MultiTargetPlatform.Common },
|
|
||||||
moduleLanguageSettingsProvider = object : LanguageSettingsProvider {
|
moduleLanguageSettingsProvider = object : LanguageSettingsProvider {
|
||||||
override fun getLanguageVersionSettings(
|
override fun getLanguageVersionSettings(
|
||||||
moduleInfo: ModuleInfo,
|
moduleInfo: ModuleInfo,
|
||||||
|
|||||||
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.name.Name
|
|||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
|
import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
|
||||||
import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
|
import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
|
||||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
|
||||||
|
|
||||||
fun createResolveSessionForFiles(
|
fun createResolveSessionForFiles(
|
||||||
project: Project,
|
project: Project,
|
||||||
@@ -42,7 +41,6 @@ fun createResolveSessionForFiles(
|
|||||||
"test",
|
"test",
|
||||||
projectContext, listOf(testModule),
|
projectContext, listOf(testModule),
|
||||||
{ ModuleContent(it, syntheticFiles, GlobalSearchScope.allScope(project)) },
|
{ ModuleContent(it, syntheticFiles, GlobalSearchScope.allScope(project)) },
|
||||||
modulePlatforms = { JvmPlatform.multiTargetPlatform },
|
|
||||||
moduleLanguageSettingsProvider = LanguageSettingsProvider.Default,
|
moduleLanguageSettingsProvider = LanguageSettingsProvider.Default,
|
||||||
resolverForModuleFactoryByPlatform = { JvmAnalyzerFacade },
|
resolverForModuleFactoryByPlatform = { JvmAnalyzerFacade },
|
||||||
platformParameters = { _ ->
|
platformParameters = { _ ->
|
||||||
|
|||||||
@@ -39,7 +39,6 @@ import org.jetbrains.kotlin.resolve.descriptorUtil.annotationClass
|
|||||||
import org.jetbrains.kotlin.resolve.descriptorUtil.module
|
import org.jetbrains.kotlin.resolve.descriptorUtil.module
|
||||||
import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
|
import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade
|
||||||
import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
|
import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
|
||||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
|
||||||
import org.jetbrains.kotlin.test.ConfigurationKind
|
import org.jetbrains.kotlin.test.ConfigurationKind
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
import org.jetbrains.kotlin.test.TestJdkKind
|
import org.jetbrains.kotlin.test.TestJdkKind
|
||||||
@@ -69,7 +68,6 @@ class MultiModuleJavaAnalysisCustomTest : KtUsefulTestCase() {
|
|||||||
"test",
|
"test",
|
||||||
projectContext, modules,
|
projectContext, modules,
|
||||||
modulesContent = { module -> ModuleContent(module, module.kotlinFiles, module.javaFilesScope) },
|
modulesContent = { module -> ModuleContent(module, module.kotlinFiles, module.javaFilesScope) },
|
||||||
modulePlatforms = { JvmPlatform.multiTargetPlatform },
|
|
||||||
moduleLanguageSettingsProvider = LanguageSettingsProvider.Default,
|
moduleLanguageSettingsProvider = LanguageSettingsProvider.Default,
|
||||||
resolverForModuleFactoryByPlatform = { JvmAnalyzerFacade },
|
resolverForModuleFactoryByPlatform = { JvmAnalyzerFacade },
|
||||||
platformParameters = { _ ->
|
platformParameters = { _ ->
|
||||||
|
|||||||
-2
@@ -44,7 +44,6 @@ import org.jetbrains.kotlin.platform.idePlatformKind
|
|||||||
import org.jetbrains.kotlin.psi.KtElement
|
import org.jetbrains.kotlin.psi.KtElement
|
||||||
import org.jetbrains.kotlin.psi.KtFile
|
import org.jetbrains.kotlin.psi.KtFile
|
||||||
import org.jetbrains.kotlin.resolve.CompositeBindingContext
|
import org.jetbrains.kotlin.resolve.CompositeBindingContext
|
||||||
import org.jetbrains.kotlin.resolve.TargetPlatform
|
|
||||||
import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
|
import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters
|
||||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform
|
||||||
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
|
import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
|
||||||
@@ -139,7 +138,6 @@ internal class ProjectResolutionFacade(
|
|||||||
projectContext,
|
projectContext,
|
||||||
modulesToCreateResolversFor,
|
modulesToCreateResolversFor,
|
||||||
modulesContentFactory,
|
modulesContentFactory,
|
||||||
modulePlatforms = { module -> module.platform?.multiTargetPlatform },
|
|
||||||
moduleLanguageSettingsProvider = IDELanguageSettingsProvider,
|
moduleLanguageSettingsProvider = IDELanguageSettingsProvider,
|
||||||
resolverForModuleFactoryByPlatform = { modulePlatform ->
|
resolverForModuleFactoryByPlatform = { modulePlatform ->
|
||||||
val platform = modulePlatform ?: settings.platform
|
val platform = modulePlatform ?: settings.platform
|
||||||
|
|||||||
Reference in New Issue
Block a user