IDEA-127668 Smart type completion prefers constants to fields, normal completion prefers fields to constants

java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java

@@ -138,8 +138,8 @@ public class PreferByKindWeigher extends LookupElementWeigher {
     qualifiedWithField,
     qualifiedWithGetter,
     superMethodParameters,
-    expectedTypeConstant,
     field,
+    expectedTypeConstant,
     getter,
     normal,
     collectionFactory,

java/java-tests/testData/codeInsight/completion/smartTypeSorting/PreferFieldsToConstants.java

@@ -0,0 +1,17 @@
+public class Foo {
+
+  private LocalDate dateField;
+
+  void foo(LocalDate date) {
+
+  }
+
+  void bar() {
+    foo(<caret>)
+  }
+}
+
+class LocalDate {
+  public static final LocalDate MAX;
+  public static final LocalDate MIN;
+}

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

@@ -160,6 +160,10 @@ public class SmartTypeCompletionOrderingTest extends CompletionSortingTestCase {
     checkPreferredItems(0, "myVersion", "getVersion", "getSelectedVersion", "calculateVersion");
   }
 
+  public void testPreferFieldsToConstants() {
+    checkPreferredItems(0, "dateField", "LocalDate.MAX", "LocalDate.MIN");
+  }
+
   public void testPreferParametersToGetters() throws Throwable {
     checkPreferredItems(0, "a", "I._1", "getLastI", "valueOf");
   }