From 463d9b690f9bbcb04a5a8fed6e6d791ab5aa0efe Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 5 Jun 2018 17:03:05 +0200 Subject: [PATCH] Minor: rename PsiFile.moduleInfo -> forcedModuleInfo --- .../jetbrains/kotlin/idea/caches/project/getModuleInfo.kt | 6 +++--- .../src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt | 4 ++-- .../changeSignature/KotlinChangeSignatureUsageProcessor.kt | 4 ++-- .../refactoring/move/moveDeclarations/moveConflictUtils.kt | 4 ++-- .../idea/spring/generate/generateDependenciesUtils.kt | 4 ++-- .../idea/spring/generate/generateDependenciesUtils.kt.172 | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt index 58f269a5374..3cf9ea8344c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.utils.yieldIfNotNull import kotlin.coroutines.experimental.buildSequence -var PsiFile.moduleInfo: ModuleInfo? by UserDataProperty(Key.create("MODULE_INFO")) +var PsiFile.forcedModuleInfo: ModuleInfo? by UserDataProperty(Key.create("FORCED_MODULE_INFO")) fun PsiElement.getModuleInfo(): IdeaModuleInfo = this.collectInfos(ModuleInfoCollector.NotNullTakeFirst) @@ -136,7 +136,7 @@ private sealed class ModuleInfoCollector( } private fun PsiElement.collectInfos(c: ModuleInfoCollector): T { - (containingFile?.moduleInfo as? IdeaModuleInfo)?.let { + (containingFile?.forcedModuleInfo as? IdeaModuleInfo)?.let { return c.onResult(it) } @@ -156,7 +156,7 @@ private fun PsiElement.collectInfos(c: ModuleInfoCollector): T { return c.onFailure("Should not analyze element: $text in file ${containingKtFile.name}\n$it") } - val explicitModuleInfo = containingKtFile?.moduleInfo ?: (containingKtFile?.originalFile as? KtFile)?.moduleInfo + val explicitModuleInfo = containingKtFile?.forcedModuleInfo ?: (containingKtFile?.originalFile as? KtFile)?.forcedModuleInfo if (explicitModuleInfo is IdeaModuleInfo) { return c.onResult(explicitModuleInfo) } diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt index a0b29715dee..9a62deb2005 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/KotlinConsoleRunner.kt @@ -56,7 +56,7 @@ import org.jetbrains.kotlin.console.gutter.IconWithTooltip import org.jetbrains.kotlin.console.gutter.ReplIcons import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.idea.caches.project.NotUnderContentRootModuleInfo -import org.jetbrains.kotlin.idea.caches.project.moduleInfo +import org.jetbrains.kotlin.idea.caches.project.forcedModuleInfo import org.jetbrains.kotlin.idea.caches.project.productionSourceInfo import org.jetbrains.kotlin.idea.caches.project.testSourceInfo import org.jetbrains.kotlin.idea.caches.resolve.* @@ -293,7 +293,7 @@ class KotlinConsoleRunner( } private fun configureFileDependencies(psiFile: KtFile) { - psiFile.moduleInfo = module.testSourceInfo() ?: module.productionSourceInfo() ?: + psiFile.forcedModuleInfo = module.testSourceInfo() ?: module.productionSourceInfo() ?: NotUnderContentRootModuleInfo } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt index 9812533c966..fc5c6f8b156 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.idea.analysis.analyzeInContext import org.jetbrains.kotlin.idea.caches.project.getModuleInfo -import org.jetbrains.kotlin.idea.caches.project.moduleInfo +import org.jetbrains.kotlin.idea.caches.project.forcedModuleInfo import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMethodDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaOrKotlinMemberDescriptor @@ -950,7 +950,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor { val dummyClass = JavaPsiFacade.getElementFactory(method.project).createClass("Dummy") val dummyMethod = createJavaMethod(method, dummyClass) - dummyMethod.containingFile.moduleInfo = baseFunction.getModuleInfo() + dummyMethod.containingFile.forcedModuleInfo = baseFunction.getModuleInfo() try { changeInfo.updateMethod(dummyMethod) JavaChangeSignatureUsageProcessor().processPrimaryMethod(changeInfo) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt index fc0b317dd81..dbd5ffa11e9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor import org.jetbrains.kotlin.idea.caches.project.getModuleInfoByVirtualFile -import org.jetbrains.kotlin.idea.caches.project.moduleInfo +import org.jetbrains.kotlin.idea.caches.project.forcedModuleInfo import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaMemberDescriptor import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde @@ -289,7 +289,7 @@ class MoveConflictChecker( val targetModuleInfo = getModuleInfoByVirtualFile(project, targetScope) val dummyFile = KtPsiFactory(targetElement.project).createFile("dummy.kt", "").apply { - moduleInfo = targetModuleInfo + forcedModuleInfo = targetModuleInfo forcedTargetPlatform = TargetPlatformDetector.getPlatform(targetModule) } diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt index 6bd8f36cab7..fbd41e51ae3 100644 --- a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt +++ b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt @@ -56,7 +56,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.idea.caches.project.getModuleInfo -import org.jetbrains.kotlin.idea.caches.project.moduleInfo +import org.jetbrains.kotlin.idea.caches.project.forcedModuleInfo import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaOrKotlinMemberDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.getParameterDescriptor @@ -399,7 +399,7 @@ private fun createConstructorWithTemplate( ShortenReferences.DEFAULT.process(factoryFunction) val dummyMethod = JavaPsiFacade.getElementFactory(beanClass.project).createMethod("foo", PsiType.VOID) - dummyMethod.containingFile.moduleInfo = ktBeanClass.getModuleInfo() + dummyMethod.containingFile.forcedModuleInfo = ktBeanClass.getModuleInfo() SpringConstructorArgResolveUtil.suggestParamsForConstructorArgs(currentBean).forEach { dummyMethod.parameterList.add(it) } val parameterList = factoryFunction.valueParameterList!! diff --git a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.172 b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.172 index 485c856fef9..1697650ce99 100644 --- a/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.172 +++ b/ultimate/src/org/jetbrains/kotlin/idea/spring/generate/generateDependenciesUtils.kt.172 @@ -55,7 +55,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.idea.caches.project.getModuleInfo -import org.jetbrains.kotlin.idea.caches.project.moduleInfo +import org.jetbrains.kotlin.idea.caches.project.forcedModuleInfo import org.jetbrains.kotlin.idea.caches.resolve.* import org.jetbrains.kotlin.idea.caches.resolve.util.getJavaOrKotlinMemberDescriptor import org.jetbrains.kotlin.idea.caches.resolve.util.getParameterDescriptor @@ -398,7 +398,7 @@ private fun createConstructorWithTemplate( ShortenReferences.DEFAULT.process(factoryFunction) val dummyMethod = JavaPsiFacade.getElementFactory(beanClass.project).createMethod("foo", PsiType.VOID) - dummyMethod.containingFile.moduleInfo = ktBeanClass.getModuleInfo() + dummyMethod.containingFile.forcedModuleInfo = ktBeanClass.getModuleInfo() SpringConstructorArgResolveUtil.suggestParamsForConstructorArgs(currentBean).forEach { dummyMethod.parameterList.add(it) } val parameterList = factoryFunction.valueParameterList!!