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

getModuleInfo, minor: clarify parameter parameter

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-03-18 21:04:29 +03:00
parent c7f147d058
commit 569e7ac593
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt
+5 -5
View File
@@ -77,17 +77,17 @@ private fun PsiElement.getModuleInfo(onFailure: (String) -> IdeaModuleInfo?): Id
return getModuleInfoByVirtualFile( return getModuleInfoByVirtualFile(
project, project,
virtualFile, virtualFile,
isDecompiledFile = (containingFile as? KtFile)?.isCompiled ?: false treatAsLibrarySource = (containingFile as? KtFile)?.isCompiled ?: false
) )
} }
private fun getModuleInfoByVirtualFile(project: Project, virtualFile: VirtualFile, isDecompiledFile: Boolean): IdeaModuleInfo { fun getModuleInfoByVirtualFile(project: Project, virtualFile: VirtualFile, treatAsLibrarySource: Boolean): IdeaModuleInfo {
val projectFileIndex = ProjectFileIndex.SERVICE.getInstance(project) val projectFileIndex = ProjectFileIndex.SERVICE.getInstance(project)
val module = projectFileIndex.getModuleForFile(virtualFile) val module = projectFileIndex.getModuleForFile(virtualFile)
if (module != null) { if (module != null) {
fun warnIfDecompiled() { fun warnIfDecompiled() {
if (isDecompiledFile) { if (treatAsLibrarySource) {
LOG.warn("Decompiled file for ${virtualFile.canonicalPath} is in content of $module") LOG.warn("Decompiled file for ${virtualFile.canonicalPath} is in content of $module")
} }
} }
@@ -111,10 +111,10 @@ private fun getModuleInfoByVirtualFile(project: Project, virtualFile: VirtualFil
when (orderEntry) { when (orderEntry) {
is LibraryOrderEntry -> { is LibraryOrderEntry -> {
val library = orderEntry.library ?: continue@entries val library = orderEntry.library ?: continue@entries
if (ProjectRootsUtil.isLibraryClassFile(project, virtualFile) && !isDecompiledFile) { if (ProjectRootsUtil.isLibraryClassFile(project, virtualFile) && !treatAsLibrarySource) {
return LibraryInfo(project, library) return LibraryInfo(project, library)
} }
else if (ProjectRootsUtil.isLibraryFile(project, virtualFile) || isDecompiledFile) { else if (ProjectRootsUtil.isLibraryFile(project, virtualFile) || treatAsLibrarySource) {
return LibrarySourceInfo(project, library) return LibrarySourceInfo(project, library)
} }
} }