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

Wrap sourceScope() and binaryScope() using sourceFilterScope

Browse Source 
To avoid having to wrap at call site
This commit is contained in:
Pavel V. Talanov
2017-03-21 15:38:01 +03:00
parent 06fd1f3c44
commit a03e9d340e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfos.kt
+6 -2
View File
@@ -33,6 +33,7 @@ import org.jetbrains.kotlin.analyzer.ModuleInfo
import org.jetbrains.kotlin.caches.resolve.LibraryModuleInfo import org.jetbrains.kotlin.caches.resolve.LibraryModuleInfo
import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.idea.framework.KotlinJavaScriptLibraryDetectionUtil import org.jetbrains.kotlin.idea.framework.KotlinJavaScriptLibraryDetectionUtil
import org.jetbrains.kotlin.idea.stubindex.KotlinSourceFilterScope
import org.jetbrains.kotlin.idea.util.isInSourceContentWithoutInjected import org.jetbrains.kotlin.idea.util.isInSourceContentWithoutInjected
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.resolve.jvm.GlobalSearchScopeWithModuleSources import org.jetbrains.kotlin.resolve.jvm.GlobalSearchScopeWithModuleSources
@@ -221,7 +222,7 @@ data class LibrarySourceInfo(val project: Project, val library: Library) : IdeaM
override val name: Name = Name.special("<sources for library ${library.name}>") override val name: Name = Name.special("<sources for library ${library.name}>")
override fun sourceScope(): GlobalSearchScope = LibrarySourceScope(project, library) override fun sourceScope(): GlobalSearchScope = KotlinSourceFilterScope.librarySources(LibrarySourceScope(project, library), project)
override val isLibrary: Boolean override val isLibrary: Boolean
get() = true get() = true
@@ -307,7 +308,10 @@ enum class ModuleOrigin {
interface BinaryModuleInfo : IdeaModuleInfo { interface BinaryModuleInfo : IdeaModuleInfo {
val sourcesModuleInfo: SourceForBinaryModuleInfo? val sourcesModuleInfo: SourceForBinaryModuleInfo?
fun binariesScope(): GlobalSearchScope = contentScope() fun binariesScope(): GlobalSearchScope {
val contentScope = contentScope()
return KotlinSourceFilterScope.libraryClassFiles(contentScope, contentScope.project!!)
}
} }
interface SourceForBinaryModuleInfo : IdeaModuleInfo { interface SourceForBinaryModuleInfo : IdeaModuleInfo {