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

Minor: rename PsiFile.moduleInfo -> forcedModuleInfo

Browse Source
This commit is contained in:
Pavel V. Talanov
2018-06-05 17:03:05 +02:00
parent 74052542b4
commit 463d9b690f
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
+2 -2
View File
@@ -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)
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveDeclarations/moveConflictUtils.kt
+2 -2
View File
@@ -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)
}