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

Made private things private

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-11-07 22:35:03 +03:00
parent 6729a72ef8
commit bf38da7bb1
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
+14 -17
View File
@@ -44,28 +44,25 @@ public abstract class DeclarationProviderFactoryService {
filesScope: GlobalSearchScope filesScope: GlobalSearchScope
): DeclarationProviderFactory { ): DeclarationProviderFactory {
return ServiceManager.getService(project, javaClass<DeclarationProviderFactoryService>())!! return ServiceManager.getService(project, javaClass<DeclarationProviderFactoryService>())!!
.create(project, storageManager, syntheticFiles, SyntheticFilesFilteringScope.filter(syntheticFiles, filesScope)) .create(project, storageManager, syntheticFiles, filteringScope(syntheticFiles, filesScope))
} }
private fun filteringScope(syntheticFiles: Collection<JetFile>, baseScope: GlobalSearchScope): GlobalSearchScope {
if (syntheticFiles.isEmpty()) {
return baseScope
}
return SyntheticFilesFilteringScope(syntheticFiles, baseScope)
}
} }
class SyntheticFilesFilteringScope(syntheticFiles: Collection<JetFile>, baseScope: GlobalSearchScope) :
DelegatingGlobalSearchScope(baseScope) {
val originals = syntheticFiles.map {
it.getOriginalFile().getVirtualFile()
}.filterNotNullTo(HashSet<VirtualFile>())
override fun contains(file: VirtualFile): Boolean { private class SyntheticFilesFilteringScope(syntheticFiles: Collection<JetFile>, baseScope: GlobalSearchScope)
return super.contains(file) && file !in originals : DelegatingGlobalSearchScope(baseScope) {
}
class object { private val originals = syntheticFiles
fun filter(syntheticFiles: Collection<JetFile>, baseScope: GlobalSearchScope): GlobalSearchScope { .map { it.getOriginalFile().getVirtualFile() }
if (syntheticFiles.isEmpty()) { .filterNotNullTo(HashSet<VirtualFile>())
return baseScope
} override fun contains(file: VirtualFile) = super.contains(file) && file !in originals
return SyntheticFilesFilteringScope(syntheticFiles, baseScope)
}
}
} }
} }