prefer return

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

@@ -33,6 +33,7 @@ public class PreferLocalVariablesLiteralsAndAnnoMethodsWeigher extends LookupEle
 
   enum MyResult {
     annoMethod,
+    returnKeyword,
     localOrParameter,
     superMethodParameters,
     normal,
@@ -42,9 +43,13 @@ public class PreferLocalVariablesLiteralsAndAnnoMethodsWeigher extends LookupEle
 
   @NotNull
   @Override
-  public Comparable weigh(@NotNull LookupElement item) {
+  public MyResult weigh(@NotNull LookupElement item) {
     final Object object = item.getObject();
 
+    if (object instanceof PsiKeyword && PsiKeyword.RETURN.equals(((PsiKeyword)object).getText())) {
+      return MyResult.returnKeyword;
+    }
+
     if (object instanceof PsiLocalVariable || object instanceof PsiParameter || object instanceof PsiThisExpression) {
       return MyResult.localOrParameter;
     }

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

@@ -0,0 +1,10 @@
+public class Test {
+
+    void rMethod() {}
+
+    int foo(int rParam) {
+        Object rLocal;
+        r<caret>
+    }
+
+}

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

@@ -209,4 +209,8 @@ public class NormalCompletionOrderingTest extends CompletionSortingTestCase {
     checkPreferredItems(0, "Zoo");
   }
 
+  public void testPreferReturn() {
+    checkPreferredItems(0, "return", "rLocal", "rParam", "rMethod");
+  }
+
 }