From 2da51a49dc9504954dd5868755b4d100084cf1eb Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 31 Jan 2014 13:04:57 +0400 Subject: [PATCH] Invalidate ResolveElementCache on exceptions from storage manager --- .../jetbrains/jet/plugin/project/ResolveElementCache.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index 588a7cb7e7f..b229b1a5536 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -62,7 +62,8 @@ public class ResolveElementCache { @Nullable @Override public Result> compute() { - LazyResolveStorageManager manager = ResolveElementCache.this.resolveSession.getStorageManager(); + ResolveSession resolveSession = ResolveElementCache.this.resolveSession; + LazyResolveStorageManager manager = resolveSession.getStorageManager(); MemoizedFunctionToNotNull elementsCacheFunction = manager.createWeaklyRetainedMemoizedFunction(new Function1() { @Override @@ -71,7 +72,9 @@ public class ResolveElementCache { } }); - return Result.create(elementsCacheFunction, PsiModificationTracker.MODIFICATION_COUNT); + return Result.create(elementsCacheFunction, + PsiModificationTracker.MODIFICATION_COUNT, + resolveSession.getExceptionTracker()); } }, false);