From 569e7ac593fb3bcecd09144ba292d085617a2847 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Sat, 18 Mar 2017 21:04:29 +0300 Subject: [PATCH] getModuleInfo, minor: clarify parameter parameter --- .../kotlin/idea/caches/resolve/getModuleInfo.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt index 1af764d9c8d..df5617e6c26 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/getModuleInfo.kt @@ -77,17 +77,17 @@ private fun PsiElement.getModuleInfo(onFailure: (String) -> IdeaModuleInfo?): Id return getModuleInfoByVirtualFile( project, 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 module = projectFileIndex.getModuleForFile(virtualFile) if (module != null) { fun warnIfDecompiled() { - if (isDecompiledFile) { + if (treatAsLibrarySource) { 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) { is LibraryOrderEntry -> { val library = orderEntry.library ?: continue@entries - if (ProjectRootsUtil.isLibraryClassFile(project, virtualFile) && !isDecompiledFile) { + if (ProjectRootsUtil.isLibraryClassFile(project, virtualFile) && !treatAsLibrarySource) { return LibraryInfo(project, library) } - else if (ProjectRootsUtil.isLibraryFile(project, virtualFile) || isDecompiledFile) { + else if (ProjectRootsUtil.isLibraryFile(project, virtualFile) || treatAsLibrarySource) { return LibrarySourceInfo(project, library) } }