diff --git a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java index 971149105ef2..a43183db02c5 100644 --- a/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java +++ b/platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java @@ -56,27 +56,25 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { myManager = psiManager; myAdditionalIndexableFileSet = new AdditionalIndexableFileSet(project); - myDefaultResolveScopesCache = ConcurrentFactoryMap.createMap(key-> { + myDefaultResolveScopesCache = ConcurrentFactoryMap.createMap( + key -> { GlobalSearchScope scope = null; - for(ResolveScopeProvider resolveScopeProvider: ResolveScopeProvider.EP_NAME.getExtensions()) { + for (ResolveScopeProvider resolveScopeProvider : ResolveScopeProvider.EP_NAME.getExtensions()) { scope = resolveScopeProvider.getResolveScope(key, myProject); if (scope != null) break; } if (scope == null) scope = getInherentResolveScope(key); for (ResolveScopeEnlarger enlarger : ResolveScopeEnlarger.EP_NAME.getExtensions()) { - final SearchScope extra = enlarger.getAdditionalResolveScope(key, myProject); + SearchScope extra = enlarger.getAdditionalResolveScope(key, myProject); if (extra != null) { scope = scope.union(extra); } } - return scope; }, + ContainerUtil::createConcurrentWeakKeySoftValueMap); - ContainerUtil::createConcurrentWeakKeySoftValueMap - - ); - ((PsiManagerImpl) psiManager).registerRunnableToRunOnChange(myDefaultResolveScopesCache::clear); + ((PsiManagerImpl)psiManager).registerRunnableToRunOnChange(myDefaultResolveScopesCache::clear); } private GlobalSearchScope getResolveScopeFromProviders(@NotNull final VirtualFile vFile) { @@ -98,7 +96,7 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { } return allScope; } - + return LibraryScopeCache.getInstance(myProject).getLibraryScope(projectFileIndex.getOrderEntriesForFile(vFile)); } @@ -217,4 +215,4 @@ public class ResolveScopeManagerImpl extends ResolveScopeManager { private static Set asSet(final Collection collection) { return collection instanceof Set ? (Set)collection : newTroveSet(collection); } -} +} \ No newline at end of file