Thread-safe ScopeProvider

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java

@@ -17,9 +17,10 @@
 package org.jetbrains.jet.lang.resolve.lazy;
 
 import com.google.common.collect.Lists;
-import com.intellij.openapi.util.NotNullLazyValue;
+import com.intellij.openapi.util.Computable;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.util.Function;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;
 import org.jetbrains.jet.lang.psi.*;
@@ -32,34 +33,37 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
+
-import java.util.WeakHashMap;
+import static org.jetbrains.jet.lang.resolve.lazy.StorageManager.MemoizationMode.WEAK;
 
 public class ScopeProvider {
     private final ResolveSession resolveSession;
 
-    private final Map<JetFile, JetScope> fileScopes = new WeakHashMap<JetFile, JetScope>();
+    private final Function<JetFile, JetScope> fileScopes;
 
-    private final NotNullLazyValue<JetScope> defaultImportsScope = new NotNullLazyValue<JetScope>() {
+    private final LazyValue<JetScope> defaultImportsScope;
-        @NotNull
-        @Override
-        protected JetScope compute() {
-            return createScopeWithDefaultImports();
-        }
-    };
 
     public ScopeProvider(@NotNull ResolveSession resolveSession) {
         this.resolveSession = resolveSession;
+
+        this.fileScopes = resolveSession.getStorageManager().createMemoizedFunction(new Function<JetFile, JetScope>() {
+            @Override
+            public JetScope fun(@NotNull JetFile file) {
+                return createFileScope(file);
+            }
+        }, WEAK);
+
+        this.defaultImportsScope = resolveSession.getStorageManager().createLazyValue(new Computable<JetScope>() {
+            @Override
+            public JetScope compute() {
+                return createScopeWithDefaultImports();
+            }
+        });
     }
 
     @NotNull
-    public JetScope getFileScope(JetFile file) {
+    public JetScope getFileScope(final JetFile file) {
-        JetScope scope = fileScopes.get(file);
+        return fileScopes.fun(file);
-        if (scope == null) {
-            scope = createFileScope(file);
-            fileScopes.put(file, scope);
-        }
-        return scope;
     }
 
     private JetScope createFileScope(JetFile file) {
@@ -82,7 +86,7 @@ public class ScopeProvider {
                                 rootPackageDescriptor.getMemberScope(),
                                 packageDescriptor.getMemberScope(),
                                 importsScope,
-                                defaultImportsScope.getValue());
+                                defaultImportsScope.get());
     }
 
     private JetScope createScopeWithDefaultImports() {