MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup (formatting)

Browse Source
This commit is contained in:
Roman Shevchenko
2017-09-15 20:34:27 +03:00
parent 1c2cc91f35
commit 4da0df539b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-impl/src/com/intellij/psi/impl/file/impl/ResolveScopeManagerImpl.java
+8 -10
View File
@@ -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<VirtualFile> asSet(final Collection<VirtualFile> collection) {
return collection instanceof Set ? (Set)collection : newTroveSet(collection);
}
}
}