Minor: rename PsiFile.moduleInfo -> forcedModuleInfo
This commit is contained in:
@@ -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<out T>(
|
||||
}
|
||||
|
||||
private fun <T> PsiElement.collectInfos(c: ModuleInfoCollector<T>): T {
|
||||
(containingFile?.moduleInfo as? IdeaModuleInfo)?.let {
|
||||
(containingFile?.forcedModuleInfo as? IdeaModuleInfo)?.let {
|
||||
return c.onResult(it)
|
||||
}
|
||||
|
||||
@@ -156,7 +156,7 @@ private fun <T> PsiElement.collectInfos(c: ModuleInfoCollector<T>): 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)
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
+2
-2
@@ -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)
|
||||
}
|
||||
|
||||
|
||||
@@ -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!!
|
||||
|
||||
+2
-2
@@ -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!!
|
||||
|
||||
Reference in New Issue
Block a user