javac ast indices: add scope invalidation multi-module test case

java/compiler/impl/src/com/intellij/compiler/backwardRefs/CompilerReferenceServiceImpl.java

@@ -327,22 +327,6 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService imple
     }
   }
 
-  @TestOnly
-  @Nullable
-  public Set<VirtualFile> getReferentFiles(@NotNull PsiElement element) {
-    FileBasedIndex fileIndex = FileBasedIndex.getInstance();
-    final TIntHashSet ids = getReferentFileIds(element);
-    if (ids == null) return null;
-    Set<VirtualFile> fileSet = new THashSet<>();
-    ids.forEach(id -> {
-      final VirtualFile vFile = fileIndex.findFileById(myProject, id);
-      assert vFile != null;
-      fileSet.add(vFile);
-      return true;
-    });
-    return fileSet;
-  }
-
   ProjectFileIndex getFileIndex() {
     return myProjectFileIndex;
   }
@@ -450,4 +434,26 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService imple
       return 31 * mySearchType.hashCode() + mySearchFileType.hashCode();
     }
   }
+
+  @TestOnly
+  @Nullable
+  public Set<VirtualFile> getReferentFiles(@NotNull PsiElement element) {
+    FileBasedIndex fileIndex = FileBasedIndex.getInstance();
+    final TIntHashSet ids = getReferentFileIds(element);
+    if (ids == null) return null;
+    Set<VirtualFile> fileSet = new THashSet<>();
+    ids.forEach(id -> {
+      final VirtualFile vFile = fileIndex.findFileById(myProject, id);
+      assert vFile != null;
+      fileSet.add(vFile);
+      return true;
+    });
+    return fileSet;
+  }
+
+  @TestOnly
+  @NotNull
+  public DirtyModulesHolder getDirtyModulesHolder() {
+    return myDirtyModulesHolder;
+  }
 }

java/compiler/impl/src/com/intellij/compiler/backwardRefs/DirtyModulesHolder.java

@@ -31,11 +31,12 @@ import com.intellij.util.ObjectUtils;
 import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.TestOnly;
 
 import java.util.Collections;
 import java.util.Set;
 
-class DirtyModulesHolder extends UserDataHolderBase {
+public class DirtyModulesHolder extends UserDataHolderBase {
   private final CompilerReferenceServiceImpl myService;
   private final FileDocumentManager myFileDocManager;
   private final PsiDocumentManager myPsiDocManager;
@@ -82,6 +83,11 @@ class DirtyModulesHolder extends UserDataHolderBase {
   }
 
   private GlobalSearchScope calculateDirtyModules() {
+    return getAllDirtyModules().stream().map(Module::getModuleWithDependentsScope).reduce(GlobalSearchScope.EMPTY_SCOPE, (s1, s2) -> s1.union(s2));
+  }
+
+  @NotNull
+  private Set<Module> getAllDirtyModules() {
     final Set<Module> dirtyModules = new THashSet<>(myVFSChangedModules);
     for (Document document : myFileDocManager.getUnsavedDocuments()) {
       final Module m = getModuleForSourceContentFile(myFileDocManager.getFile(document));
@@ -91,7 +97,7 @@ class DirtyModulesHolder extends UserDataHolderBase {
       final Module m = getModuleForSourceContentFile(ObjectUtils.notNull(myPsiDocManager.getPsiFile(document)).getVirtualFile());
       if (m != null) dirtyModules.add(m);
     }
-    return dirtyModules.stream().map(Module::getModuleWithDependentsScope).reduce(GlobalSearchScope.EMPTY_SCOPE, (s1, s2) -> s1.union(s2));
+    return dirtyModules;
   }
 
   boolean contains(VirtualFile file) {
@@ -162,4 +168,12 @@ class DirtyModulesHolder extends UserDataHolderBase {
     }
     return null;
   }
+
+  @TestOnly
+  @NotNull
+  public Set<Module> getAllDirtyModulesForTest() {
+    synchronized (myLock) {
+      return getAllDirtyModules();
+    }
+  }
 }

java/java-tests/testSrc/com/intellij/codeInsight/completion/AbstractCompilerAwareTest.java

@@ -17,9 +17,11 @@ package com.intellij.codeInsight.completion;
 
 import com.intellij.openapi.compiler.CompilerMessage;
 import com.intellij.openapi.compiler.CompilerMessageCategory;
+import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.testFramework.CompilerTester;
 import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase;
+import com.intellij.util.containers.ContainerUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,13 +35,23 @@ public abstract class AbstractCompilerAwareTest extends JavaCodeInsightFixtureTe
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    myCompilerTester = new CompilerTester(myModule);
+  }
+
+  protected void installCompiler() {
+    try {
+      myCompilerTester = new CompilerTester(getProject(), ContainerUtil.list(ModuleManager.getInstance(getProject()).getModules()));
+    }
+    catch (Exception e) {
+      fail(e.getMessage());
+    }
   }
 
   @Override
   protected void tearDown() throws Exception {
     try {
-      myCompilerTester.tearDown();
+      if (myCompilerTester != null) {
+        myCompilerTester.tearDown();
+      }
     }
     finally {
       myCompilerTester = null;

java/java-tests/testSrc/com/intellij/codeInsight/completion/MethodChainsCompletionTest.java

@@ -41,6 +41,7 @@ public class MethodChainsCompletionTest extends AbstractCompilerAwareTest {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
+    installCompiler();
     ClassFilesIndexFeature.METHOD_CHAINS_COMPLETION.enable();
   }
 

java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesMultiModuleTest.kt

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2000-2016 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.compiler
+
+import com.intellij.compiler.backwardRefs.CompilerReferenceServiceImpl
+import com.intellij.openapi.fileEditor.FileDocumentManager
+import com.intellij.openapi.module.JavaModuleType
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.ModuleRootModificationUtil
+import com.intellij.testFramework.PsiTestUtil
+
+class CompilerReferencesMultiModuleTest : CompilerReferencesTestBase() {
+  private var moduleA: Module? = null
+  private var moduleB: Module? = null
+
+  override fun setUp() {
+    super.setUp()
+    addTwoModules()
+    installCompiler()
+  }
+
+  fun testNoChanges() {
+    myFixture.addFileToProject("BaseClass.java", "public interface BaseClass{}")
+    myFixture.addFileToProject("A/ClassA.java", "public class ClassA implements BaseClass{}")
+    myFixture.addFileToProject("B/ClassB.java", "public class ClassB implements BaseClass{}")
+    rebuildProject()
+    assertEmpty(dirtyModules())
+  }
+
+  fun testLeafModuleTyping() {
+    myFixture.addFileToProject("BaseClass.java", "public interface BaseClass{}")
+    val classA = myFixture.addFileToProject("A/ClassA.java", "public class ClassA implements BaseClass{}")
+    myFixture.addFileToProject("B/ClassB.java", "public class ClassB implements BaseClass{}")
+    rebuildProject()
+    myFixture.openFileInEditor(classA.virtualFile)
+    myFixture.type("/*typing in module A*/")
+    assertEquals("A", assertOneElement(dirtyModules()).name)
+    FileDocumentManager.getInstance().saveAllDocuments()
+    assertEquals("A", assertOneElement(dirtyModules()).name)
+  }
+
+  private fun addTwoModules() {
+    moduleA = PsiTestUtil.addModule(project, JavaModuleType.getModuleType(), "A", myFixture.tempDirFixture.findOrCreateDir("A"))
+    moduleB = PsiTestUtil.addModule(project, JavaModuleType.getModuleType(), "B", myFixture.tempDirFixture.findOrCreateDir("B"))
+    ModuleRootModificationUtil.addDependency(moduleA!!, myModule)
+    ModuleRootModificationUtil.addDependency(moduleB!!, myModule)
+  }
+
+  private fun dirtyModules() =
+      (CompilerReferenceService.getInstance(project) as CompilerReferenceServiceImpl)
+          .dirtyModulesHolder
+          .allDirtyModulesForTest
+}

java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesTest.java

@@ -40,6 +40,12 @@ public class CompilerReferencesTest extends CompilerReferencesTestBase {
     return JavaTestUtil.getJavaTestDataPath() + "/compiler/bytecodeReferences/";
   }
 
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    installCompiler();
+  }
+
   public void testIsNotReady() {
     myFixture.configureByFile(getName() + "/Foo.java");
     assertNull(getReferentFilesForElementUnderCaret());

java/java-tests/testSrc/com/intellij/compiler/CompilerReferencesTestBase.java

@@ -17,7 +17,7 @@ package com.intellij.compiler;
 
 import com.intellij.codeInsight.completion.AbstractCompilerAwareTest;
 
-abstract class CompilerReferencesTestBase extends AbstractCompilerAwareTest {
+public abstract class CompilerReferencesTestBase extends AbstractCompilerAwareTest {
   private boolean myDefaultEnableState;
 
   @Override