java completion: group fields together with local variables (IDEA-168743 , IDEA-172888)

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

@@ -0,0 +1,9 @@
+class Foo {
+  String text;
+
+  void doSmth() {}
+
+  void foo(String text) {
+    this.<caret>
+  }
+}

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

@@ -0,0 +1,6 @@
+class Foo {
+  String field;
+  void foo(Integer local) {
+    String s = <caret>
+  }
+}