Merge branch 'db/method-chains-completion'

# Conflicts:
#	jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexUtil.java
#	jps/jps-builders/src/org/jetbrains/jps/backwardRefs/BackwardReferenceIndexWriter.java
#	jps/jps-builders/src/org/jetbrains/jps/incremental/JavaBuilderService.java

java/java-tests/testData/codeInsight/completion/methodChains/testMethodQualifierClass/AfterCompletion.java

@@ -9,7 +9,7 @@ interface PsiClass {}
 
 public class TestCompletion {
   public void method() {
-      PsiMethod psiMethod = <caret><selection>null</selection>;
-      PsiClass c = psiMethod.getContainingClass()
+      PsiMember psiMember = null;
+      PsiClass c = psiMember.getContainingClass()
   }
 }

java/java-tests/testData/codeInsight/completion/methodChains/testNotRelevantMethodsFilteredInResult/TestIndex.java

@@ -18,6 +18,13 @@ public class TestIndex {
     e.getContainingFile();
     e.getContainingFile();
     e.getContainingFile();
+    e.getContainingFile();
+    e.getContainingFile();
+    e.getContainingFile();
+    e.getContainingFile();
+    e.getContainingFile();
+    e.getContainingFile();
+    e.getContainingFile();
   }
 
   void m2() {

java/java-tests/testData/compiler/completionOrdering/testAnonymous/Foo.java

@@ -0,0 +1,43 @@
+import java.util.*;
+
+class Foo {
+  void m() {
+    List l0 = new ArrayList();
+
+    List l1 = new AbstractList() {
+      @Override
+      public int size() {
+        return 0;
+      }
+
+      @Override
+      public Object get(int index) {
+        return null;
+      }
+    };
+    List l2 = new AbstractList() {
+      @Override
+      public int size() {
+        return 0;
+      }
+
+      @Override
+      public Object get(int index) {
+        return null;
+      }
+    };
+    List l3 = new AbstractList() {
+      @Override
+      public int size() {
+        return 0;
+      }
+
+      @Override
+      public Object get(int index) {
+        return null;
+      }
+    };
+
+    <caret>
+  }
+}

java/java-tests/testData/compiler/completionOrdering/testConstructor/Foo.java

@@ -0,0 +1,18 @@
+import java.util.*;
+
+class Foo {
+
+  void m() {
+
+    List l1 = new ArrayList();
+    List l2 = new ArrayList();
+
+    List l3 = new LinkedList();
+    List l4 = new LinkedList();
+    List l5 = new LinkedList();
+
+    <caret>
+
+  }
+
+}

java/java-tests/testData/compiler/completionOrdering/testConstructorSumOccurrences/Foo.java

@@ -0,0 +1,23 @@
+class Foo {
+  void m() {
+    new C();
+    new C();
+
+    new B();
+    new B(0);
+    new B(0, 0);
+
+    <caret>
+  }
+}
+
+abstract class A {}
+
+class B extends A {
+  B() {}
+  B(int i) {}
+  B(int i, int j) {}
+}
+
+class C extends A {
+}

java/java-tests/testData/compiler/completionOrdering/testConstructorSumOccurrences2/Foo.java

@@ -0,0 +1,23 @@
+class Foo {
+  void m() {
+    new C();
+    new C();
+
+    new B();
+    new B(0);
+    new B(0, 0);
+
+    <caret>
+  }
+}
+
+interface A {}
+
+class B implements A {
+  B() {}
+  B(int i) {}
+  B(int i, int j) {}
+}
+
+class C implements A {
+}

java/java-tests/testData/compiler/completionOrdering/testOverloads/Bar.java

@@ -0,0 +1,12 @@
+class Bar {
+
+  void m(Foo foo) {
+    foo.asd();
+
+    foo.asd(null, null, null);
+    foo.asd(null, null, null);
+
+    <caret>
+  }
+
+}

java/java-tests/testData/compiler/completionOrdering/testOverloads/Foo.java

@@ -0,0 +1,7 @@
+public class Foo {
+
+  public void asd() {}
+
+  public void asd(String i, String j, String k) {}
+
+}

java/java-tests/testData/compiler/completionOrdering/testSimpleMembers/Bar.java

@@ -0,0 +1,21 @@
+class Bar {
+
+  void m(Foo foo) {
+    foo.asd();
+    foo.asd();
+    foo.asd();
+
+    System.out.println(foo.qwe);
+    System.out.println(foo.qwe);
+    System.out.println(foo.qwe);
+    System.out.println(foo.qwe);
+    System.out.println(foo.qwe);
+
+    foo.zxc();
+    foo.zxc();
+    foo.zxc();
+
+    <caret>
+  }
+
+}

java/java-tests/testData/compiler/completionOrdering/testSimpleMembers/Foo.java

@@ -0,0 +1,9 @@
+public class Foo {
+
+  public void asd() {}
+
+  public String qwe = "AEDI JilletnI";
+
+  public void zxc() {}
+
+}

java/java-tests/testData/compiler/completionOrdering/testSimpleMethods/Bar.java

@@ -0,0 +1,21 @@
+class Bar {
+
+  void m(Foo foo) {
+    foo.asd();
+    foo.asd();
+    foo.asd();
+
+    foo.qwe();
+    foo.qwe();
+    foo.qwe();
+    foo.qwe();
+    foo.qwe();
+
+    foo.zxc();
+    foo.zxc();
+    foo.zxc();
+
+    <caret>
+  }
+
+}

java/java-tests/testData/compiler/completionOrdering/testSimpleMethods/Foo.java

@@ -0,0 +1,9 @@
+public class Foo {
+
+  public void asd() {}
+
+  public void qwe() {}
+
+  public void zxc() {}
+
+}