1 files changed, 27 insertions, 9 deletions

diff --git a/platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java
index f90fe7876987..052c73022d53 100644
--- a/platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java
+++ b/platform/indexing-impl/src/com/intellij/openapi/module/impl/ModuleScopeProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,8 +31,7 @@ public class ModuleScopeProviderImpl implements ModuleScopeProvider {
   private GlobalSearchScope myModuleWithDependentsScope;
   private GlobalSearchScope myModuleTestsWithDependentsScope;
 
-
-  public ModuleScopeProviderImpl(Module module) {
+  public ModuleScopeProviderImpl(@NotNull Module module) {
     myModule = module;
   }
 
@@ -47,53 +46,72 @@ public class ModuleScopeProviderImpl implements ModuleScopeProvider {
   }
 
 
+  @Override
+  @NotNull
   public GlobalSearchScope getModuleScope() {
     return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS);
   }
 
+  @NotNull
   @Override
   public GlobalSearchScope getModuleScope(boolean includeTests) {
     return getCachedScope(ModuleWithDependenciesScope.COMPILE | (includeTests ? ModuleWithDependenciesScope.TESTS : 0));
   }
 
+  @Override
+  @NotNull
   public GlobalSearchScope getModuleWithLibrariesScope() {
     return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS | ModuleWithDependenciesScope.LIBRARIES);
   }
 
+  @Override
+  @NotNull
   public GlobalSearchScope getModuleWithDependenciesScope() {
     return getCachedScope(ModuleWithDependenciesScope.COMPILE | ModuleWithDependenciesScope.TESTS | ModuleWithDependenciesScope.MODULES);
   }
 
+  @NotNull
   @Override
   public GlobalSearchScope getModuleContentScope() {
     return getCachedScope(ModuleWithDependenciesScope.CONTENT);
   }
 
+  @NotNull
   @Override
   public GlobalSearchScope getModuleContentWithDependenciesScope() {
     return getCachedScope(ModuleWithDependenciesScope.CONTENT | ModuleWithDependenciesScope.MODULES);
   }
 
+  @Override
+  @NotNull
   public GlobalSearchScope getModuleWithDependenciesAndLibrariesScope(boolean includeTests) {
     return getCachedScope(ModuleWithDependenciesScope.COMPILE |
                           ModuleWithDependenciesScope.MODULES |
                           ModuleWithDependenciesScope.LIBRARIES | (includeTests ? ModuleWithDependenciesScope.TESTS : 0));
   }
 
+  @Override
+  @NotNull
   public GlobalSearchScope getModuleWithDependentsScope() {
-    if (myModuleWithDependentsScope == null) {
-      myModuleWithDependentsScope = new ModuleWithDependentsScope(myModule, false);
+    GlobalSearchScope scope = myModuleWithDependentsScope;
+    if (scope == null) {
+      myModuleWithDependentsScope = scope = new ModuleWithDependentsScope(myModule, false);
     }
-    return myModuleWithDependentsScope;
+    return scope;
   }
 
+  @Override
+  @NotNull
   public GlobalSearchScope getModuleTestsWithDependentsScope() {
-    if (myModuleTestsWithDependentsScope == null) {
-      myModuleTestsWithDependentsScope = new ModuleWithDependentsScope(myModule, true);
+    GlobalSearchScope scope = myModuleTestsWithDependentsScope;
+    if (scope == null) {
+      myModuleTestsWithDependentsScope = scope = new ModuleWithDependentsScope(myModule, true);
     }
-    return myModuleTestsWithDependentsScope;
+    return scope;
   }
 
+  @Override
+  @NotNull
   public GlobalSearchScope getModuleRuntimeScope(boolean includeTests) {
     return getCachedScope(
       ModuleWithDependenciesScope.MODULES | ModuleWithDependenciesScope.LIBRARIES | (includeTests ? ModuleWithDependenciesScope.TESTS : 0));