From bc61189599f4f3aa8efa3312d37ed48eaa17898a Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Mon, 19 Sep 2011 19:06:47 +0200
Subject: [PATCH] IDEA-72104 Code completion for the final attribute of the
 enum

---
 .../com/intellij/codeInsight/completion/ModifierChooser.java | 2 +-
 .../codeInsight/completion/normal/EnumPrivateFinal.java      | 5 +++++
 .../completion/normal/EnumPrivateFinal_after.java            | 5 +++++
 .../codeInsight/completion/NormalCompletionTest.groovy       | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal.java
 create mode 100644 java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal_after.java

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java b/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java
index 4326012d0bb7..496d067d579e 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/ModifierChooser.java
@@ -99,7 +99,7 @@ scopes:
               boolean containModifierFlag = false;
               if (list != null) {
                 for (@Modifier String keyword : keywords) {
-                  if (list.hasModifierProperty(keyword)) {
+                  if (list.hasExplicitModifier(keyword)) {
                     containModifierFlag = true;
                     break;
                   }
diff --git a/java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal.java b/java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal.java
new file mode 100644
index 000000000000..5ac67b9d3a15
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal.java
@@ -0,0 +1,5 @@
+enum Goo {
+    a,b;
+
+    private fin<caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal_after.java b/java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal_after.java
new file mode 100644
index 000000000000..30b4ad080a0e
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/completion/normal/EnumPrivateFinal_after.java
@@ -0,0 +1,5 @@
+enum Goo {
+    a,b;
+
+    private final <caret>
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
index a6781ea3f805..5ac71e462daf 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.groovy
@@ -928,6 +928,7 @@ public class NormalCompletionTest extends LightFixtureCompletionTestCase {
   public void testMethodParameterTypeDot() throws Throwable { doAntiTest() }
   public void testNewGenericClass() throws Throwable { doTest('\n') }
   public void testNewGenericInterface() throws Throwable { doTest() }
+  public void testEnumPrivateFinal() throws Throwable { doTest() }
 
   public void testUnfinishedMethodTypeParameter() throws Throwable {
     configure()