From bf38da7bb1b20bba69536593e14b767cd4a20c83 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 7 Nov 2014 22:35:03 +0300
Subject: [PATCH] Made private things private

---
 .../DeclarationProviderFactoryService.kt      | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
index 4dc0fa516c9..7b51359d104 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactoryService.kt
@@ -44,28 +44,25 @@ public abstract class DeclarationProviderFactoryService {
                 filesScope: GlobalSearchScope
         ): DeclarationProviderFactory {
             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 {
-            return super.contains(file) && file !in originals
-        }
+    private class SyntheticFilesFilteringScope(syntheticFiles: Collection<JetFile>, baseScope: GlobalSearchScope)
+        : DelegatingGlobalSearchScope(baseScope) {
 
-        class object {
-            fun filter(syntheticFiles: Collection<JetFile>, baseScope: GlobalSearchScope): GlobalSearchScope {
-                if (syntheticFiles.isEmpty()) {
-                    return baseScope
-                }
-                return SyntheticFilesFilteringScope(syntheticFiles, baseScope)
-            }
-        }
+        private val originals = syntheticFiles
+                .map { it.getOriginalFile().getVirtualFile() }
+                .filterNotNullTo(HashSet<VirtualFile>())
+
+        override fun contains(file: VirtualFile) = super.contains(file) && file !in originals
     }
 }