Merge remote-tracking branch 'origin/master'

java/java-tests/testData/codeInsight/completion/normalSorting/NoBooleansInMultiplication.java

@@ -0,0 +1,7 @@
+public class Foo {
+  
+  int foo(Object fact) {
+    return 42 * fa<caret>x
+  }
+}
+

java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionOrderingTest.groovy

@@ -629,6 +629,10 @@ interface TxANotAnno {}
     checkPreferredItems 0, 'value'
   }
 
+  public void testNoBooleansInMultiplication() {
+    checkPreferredItems 0, 'fact'
+  }
+
   public void testGlobalStaticMemberStats() {
     configureNoCompletion(getTestName(false) + ".java")
     myFixture.complete(CompletionType.BASIC, 2)