IDEA-158497 "catch" completion of "try {}"

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

@@ -164,7 +164,7 @@ public class PreferByKindWeigher extends LookupElementWeigher {
           isLastStatement(PsiTreeUtil.getParentOfType(myPosition, PsiStatement.class))) {
         return MyResult.probableKeyword;
       }
-      if (PsiKeyword.ELSE.equals(keyword) || PsiKeyword.FINALLY.equals(keyword)) {
+      if (PsiKeyword.ELSE.equals(keyword) || PsiKeyword.FINALLY.equals(keyword) || PsiKeyword.CATCH.equals(keyword)) {
         return MyResult.probableKeyword;
       }
       if (PsiKeyword.TRUE.equals(keyword) || PsiKeyword.FALSE.equals(keyword)) {

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

@@ -0,0 +1,7 @@
+class Log {
+  {
+    try {
+
+    } <caret>
+  }
+}

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

@@ -781,4 +781,8 @@ class ContainerUtil extends ContainerUtilRt {
     assert (myFixture.lookupElements[0].psiElement as PsiMethod).containingClass.name == 'ContainerUtil'
   }
 
+  public void testPreferCatchAndFinallyAfterTry() {
+    checkPreferredItems 0, 'catch', 'finally'
+  }
+
 }