local members are more preferrable than global static ones

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

@@ -0,0 +1,7 @@
+class Util {
+  void foox() {
+    int fooy;
+    foo<caret>
+  }
+
+}

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

@@ -206,7 +206,7 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase {
   }
 
   public void testLocalVarsOverMethods() {
-    checkPreferredItems(0, "value", "valueOf");
+    checkPreferredItems(0, "value", "validate", "validateTree", "valueOf");
   }
 
   public void testCurrentClassBest() {
@@ -370,4 +370,12 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase {
     checkPreferredItems 0, 'Calendar', 'Calendar.FIELD_COUNT'
   }
 
+  public void testPreferLocalsToStaticsInSecondCompletion() {
+    myFixture.addClass('public class FooZoo { public static void fooBar() {}  }')
+    myFixture.addClass('public class fooAClass {}')
+    configureNoCompletion(getTestName(false) + ".java");
+    myFixture.complete(CompletionType.BASIC, 2);
+    assertPreferredItems(0, 'fooy', 'foox', 'fooAClass', 'fooBar');
+  }
+
 }