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

FIR IDE: Make ModuleLibrariesSearchScope work only on .class sources

Browse Source 
If this scope will accepts sources, then it will cause problems later
(when we will get libraries' sources from indices and will try to
resolve them to FIR declaration)
This commit is contained in:
Roman Golyshev
2021-04-30 11:12:12 +03:00
committed by Space
parent caa852061a
commit 9e4c5eed5f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/util/ModuleLibrariesSearchScope.kt
+10 -4
View File
@@ -9,19 +9,25 @@ import com.intellij.openapi.module.Module
import com.intellij.openapi.roots.JdkOrderEntry import com.intellij.openapi.roots.JdkOrderEntry
import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.LibraryOrderEntry
import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.ModuleRootManager
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.util.Comparing import com.intellij.openapi.util.Comparing
import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.GlobalSearchScope
private class ModuleLibrariesSearchScope(private val module: Module) : GlobalSearchScope(module.project) { private class ModuleLibrariesSearchScope(module: Module) : GlobalSearchScope(module.project) {
private val projectFileIndex = ProjectRootManager.getInstance(module.project).fileIndex
private val moduleFileIndex = ModuleRootManager.getInstance(module).fileIndex
override fun contains(file: VirtualFile): Boolean { override fun contains(file: VirtualFile): Boolean {
val orderEntry = ModuleRootManager.getInstance(module).fileIndex.getOrderEntryForFile(file) // We want this scope to work only on .class files, not on source files
if (!projectFileIndex.isInLibraryClasses(file)) return false
val orderEntry = moduleFileIndex.getOrderEntryForFile(file)
return orderEntry is JdkOrderEntry || orderEntry is LibraryOrderEntry return orderEntry is JdkOrderEntry || orderEntry is LibraryOrderEntry
} }
override fun compare(file1: VirtualFile, file2: VirtualFile): Int { override fun compare(file1: VirtualFile, file2: VirtualFile): Int {
val fileIndex = ModuleRootManager.getInstance(module).fileIndex return Comparing.compare(moduleFileIndex.getOrderEntryForFile(file2), moduleFileIndex.getOrderEntryForFile(file1))
return Comparing.compare(fileIndex.getOrderEntryForFile(file2), fileIndex.getOrderEntryForFile(file1))
} }
override fun isSearchInModuleContent(aModule: Module): Boolean = false override fun isSearchInModuleContent(aModule: Module): Boolean = false