Merge branch 'db/method-chains-with-casts'

# Conflicts:
#	java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java

diff --cc java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
index 5234775f3278e42f936614a91f2bdcbce1354cc0,b67bcdfcb083aa2596700afd7fde1d20e9e21181..1997981dec300821b6f3ff717aae12434b60ed29
--- 1/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
--- 2/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
+++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java
@@@ -92,8 -97,9 +94,9 @@@ public class ChainCompletionContext 
      myResolveScope = context.getResolveScope();
      myProject = context.getProject();
      myResolveHelper = PsiResolveHelper.SERVICE.getInstance(myProject);
-     myQualifierClassResolver = FactoryMap.create(sign1 -> sign1.resolveQualifier(myProject, myResolveScope, accessValidator()));
-     myResolver = FactoryMap.create(sign -> sign.resolve(myProject, myResolveScope, accessValidator()));
+     myQualifierClassResolver = new TIntObjectHashMap<>();
 -    myResolver = FactoryMap.createMap(sign -> sign.resolve());
++    myResolver = FactoryMap.create(sign -> sign.resolve());
+     myRefServiceEx = (CompilerReferenceServiceEx)CompilerReferenceService.getInstance(myProject);
    }
  
    @NotNull

diff --cc jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java
index b7c738f03c99c065e8a239755ee508c6bc0bd3c7,22a70409f65817e71a92b7555a2b20ea64023f66..b07f8163287309089b3376625e8e6fc11a0b6b53
--- 1/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java
--- 2/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java
@@@ -24,16 -23,18 +24,20 @@@ import gnu.trove.TObjectIntHashMap
  import org.jetbrains.jps.backwardRefs.index.CompiledFileData;
  import org.jetbrains.jps.javac.ast.api.JavacDef;
  import org.jetbrains.jps.javac.ast.api.JavacRef;
+ import org.jetbrains.jps.javac.ast.api.JavacTypeCast;
  
  import java.io.IOException;
- import java.util.*;
+ import java.util.Collection;
+ import java.util.HashMap;
+ import java.util.Map;
  
  public class BackwardReferenceIndexUtil {
 +  private static final Logger LOG = Logger.getInstance(BackwardReferenceIndexUtil.class);
 +
    static void registerFile(String filePath,
                             TObjectIntHashMap<? extends JavacRef> refs,
-                            List<JavacDef> defs,
+                            Collection<JavacDef> defs,
+                            Collection<JavacTypeCast> casts,
                             final BackwardReferenceIndexWriter writer) {
  
      try {