Merge pull request #1649 from adamwojs/exclude_non_public_consts

Excluded non-public consts from !php/const autocompletion

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/completion/PhpConstGotoCompletionProvider.java

@@ -55,7 +55,7 @@ public void getLookupElements(@NotNull GotoCompletionProviderLookupArguments arg
             if (phpClass != null) {
                 // reset the prefix matcher, starting after ::
                 resultSet = resultSet.withPrefixMatcher(prefix.substring(prefix.indexOf(SCOPE_OPERATOR) + 2));
-                resultSet.addAllElements(PhpVariantsUtil.getLookupItems(phpClass.getFields().stream().filter(Field::isConstant).collect(Collectors.toList()), false, null));
+                resultSet.addAllElements(PhpVariantsUtil.getLookupItems(phpClass.getFields().stream().filter(f -> f.isConstant() && f.getModifier().isPublic()).collect(Collectors.toList()), false, null));
             }
             return;
         }
@@ -102,7 +102,7 @@ private void addAllClasses(Collection<LookupElement> elements, Collection<PhpCla
     private void addAllClassConstants(Collection<LookupElement> elements, Collection<PhpClass> classes) {
         for (PhpClass phpClass : classes) {
             // All class constants
-            List<Field> fields = Arrays.stream(phpClass.getOwnFields()).filter(Field::isConstant).collect(Collectors.toList());
+            List<Field> fields = Arrays.stream(phpClass.getOwnFields()).filter(f -> f.isConstant() && f.getModifier().isPublic()).collect(Collectors.toList());
             for (PhpNamedElement field : fields) {
                 // Foo::BAR
                 String lookupString = phpClass.getName() + SCOPE_OPERATOR + field.getName();

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/YamlGotoCompletionRegistrarTest.java

@@ -123,6 +123,16 @@ public void testThatPhpConstAreCompletedAndNavigable() {
             "BAZ"
         );
 
+        assertCompletionNotContains(
+            YAMLFileType.YML,
+            "services:\n" +
+            "    foo:\n" +
+            "       class: Foo\\Foobar\n" +
+            "       arguments: \n" +
+            "           - !php/const Foo\\Bar::<caret>\n",
+            "PROTECTED_CONST", "PRIVATE_CONST"
+        );
+
         assertCompletionIsEmpty(
             YAMLFileType.YML,
             "services:\n" +

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/completion/yaml/fixtures/YamlGotoCompletionRegistrar.php

@@ -5,6 +5,8 @@
     class Bar
     {
         public const BAZ = 'baz';
+        private const PRIVATE_CONST = 'private';
+        protected const PROTECTED_CONST = 'protected';
 
         public function create() {}
     }