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

Don't stick list of headers files to cache recounting

Browse Source
This commit is contained in:
Nikolay Krasko
2012-06-08 01:32:43 +04:00
parent e3b8e977fb
commit c5d209b06e
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeWithCache.java
+6 -5
View File
@@ -84,8 +84,7 @@ public final class AnalyzerFacadeWithCache {
// System.out.println("===============ReCache - In-Block=============="); // System.out.println("===============ReCache - In-Block==============");
// Collect context for headers first // Collect context for headers first
Collection<JetFile> allFilesToAnalyze = declarationProvider.fun(file); AnalyzeExhaust analyzeExhaustHeaders = analyzeHeadersWithCacheOnFile(file, declarationProvider);
AnalyzeExhaust analyzeExhaustHeaders = analyzeHeadersWithCacheOnFile(file, allFilesToAnalyze);
BodiesResolveContext context = analyzeExhaustHeaders.getBodiesResolveContext(); BodiesResolveContext context = analyzeExhaustHeaders.getBodiesResolveContext();
assert context != null : "Headers resolver should prepare and stored information for bodies resolve"; assert context != null : "Headers resolver should prepare and stored information for bodies resolve";
@@ -125,8 +124,10 @@ public final class AnalyzerFacadeWithCache {
} }
} }
private static AnalyzeExhaust analyzeHeadersWithCacheOnFile(@NotNull final JetFile fileToCache, private static AnalyzeExhaust analyzeHeadersWithCacheOnFile(
@NotNull final Collection<JetFile> headerFiles) { @NotNull final JetFile fileToCache,
@NotNull final Function<JetFile, Collection<JetFile>> declarationProvider
) {
CachedValue<AnalyzeExhaust> bindingContextCachedValue = fileToCache.getUserData(ANALYZE_EXHAUST_HEADERS); CachedValue<AnalyzeExhaust> bindingContextCachedValue = fileToCache.getUserData(ANALYZE_EXHAUST_HEADERS);
if (bindingContextCachedValue == null) { if (bindingContextCachedValue == null) {
bindingContextCachedValue = bindingContextCachedValue =
@@ -136,7 +137,7 @@ public final class AnalyzerFacadeWithCache {
// System.out.println("===============ReCache - OUT-OF-BLOCK=============="); // System.out.println("===============ReCache - OUT-OF-BLOCK==============");
AnalyzeExhaust exhaust = AnalyzerFacadeProvider.getAnalyzerFacadeForFile(fileToCache) AnalyzeExhaust exhaust = AnalyzerFacadeProvider.getAnalyzerFacadeForFile(fileToCache)
.analyzeFiles(fileToCache.getProject(), .analyzeFiles(fileToCache.getProject(),
headerFiles, declarationProvider.fun(fileToCache),
Collections.<AnalyzerScriptParameter>emptyList(), Collections.<AnalyzerScriptParameter>emptyList(),
Predicates.<PsiFile>alwaysFalse()); Predicates.<PsiFile>alwaysFalse());