1 files changed, 5 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
index 5ac14956fe4c..f5e43aa7bcec 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaCompletionData.java
@@ -484,7 +484,7 @@ public class JavaCompletionData extends JavaAwareCompletionData {
       }
     }
 
-    if ((isInsideParameterList(position) || isAtResourceVariableStart(position)) &&
+    if ((isInsideParameterList(position) || isAtResourceVariableStart(position) || isAtCatchVariableStart(position)) &&
         !psiElement().afterLeaf(PsiKeyword.FINAL).accepts(position) &&
         !AFTER_DOT.accepts(position)) {
       result.addElement(TailTypeDecorator.withTail(createKeyword(position, PsiKeyword.FINAL), TailType.HUMBLE_SPACE_BEFORE_WORD));
@@ -673,6 +673,10 @@ public class JavaCompletionData extends JavaAwareCompletionData {
     return psiElement().insideStarting(psiElement(PsiTypeElement.class).withParent(PsiResourceList.class)).accepts(position);
   }
 
+  private static boolean isAtCatchVariableStart(PsiElement position) {
+    return psiElement().insideStarting(psiElement(PsiTypeElement.class).withParent(PsiCatchSection.class)).accepts(position);
+  }
+
   private static void addBreakContinue(CompletionResultSet result, PsiElement position) {
     PsiLoopStatement loop = PsiTreeUtil.getParentOfType(position, PsiLoopStatement.class);