Merge pull request #1645 from adamwojs/issue_1631

Fixed #1631: PhpConstGotoCompletionProvider throws IndexOutOfBoundsException when cursor is before scope operator

Author: Haehnchen

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

@@ -42,12 +42,16 @@ public void getLookupElements(@NotNull GotoCompletionProviderLookupArguments arg
         PhpIndex phpIndex = PhpIndex.getInstance(this.getProject());
         CompletionResultSet resultSet = arguments.getResultSet();
 
-        final String prefix = getElement().getText().replace(CompletionUtil.DUMMY_IDENTIFIER_TRIMMED, "");
+        var elementText = getElement().getText();
+        var scopeOperatorPos = elementText.indexOf(SCOPE_OPERATOR);
+        var cursorPos = elementText.indexOf(CompletionUtil.DUMMY_IDENTIFIER_TRIMMED);
 
         // Class constants:  !php/const Foo::<caret>
-        if (prefix.contains(SCOPE_OPERATOR)) {
-            String classFQN = prefix.substring(0, getElement().getText().indexOf(SCOPE_OPERATOR));
-            PhpClass phpClass = PhpElementsUtil.getClassInterface(this.getProject(), classFQN);
+        if (scopeOperatorPos > -1 && scopeOperatorPos < cursorPos) {
+            var prefix = elementText.replace(CompletionUtil.DUMMY_IDENTIFIER_TRIMMED, "");
+            var classFQN = prefix.substring(0, scopeOperatorPos);
+            var phpClass = PhpElementsUtil.getClassInterface(this.getProject(), classFQN);
+
             if (phpClass != null) {
                 // reset the prefix matcher, starting after ::
                 resultSet = resultSet.withPrefixMatcher(prefix.substring(prefix.indexOf(SCOPE_OPERATOR) + 2));

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

@@ -101,4 +101,35 @@ public void testThatDecoratesPrioritizeLookupElementOnInstance() {
             lookupElement -> "foo".equals(lookupElement.getItemText()) && lookupElement.isItemTextBold() && lookupElement.isItemTextBold()
         );
     }
+
+    public void testThatPhpConstAreCompletedAndNavigable() {
+        assertCompletionContains(
+            YAMLFileType.YML,
+            "services:\n" +
+            "    foo:\n" +
+            "       class: Foo\\Foobar\n" +
+            "       arguments: \n" +
+            "           - !php/const <caret>\n",
+            "Bar", "Foobar"
+        );
+
+        assertCompletionContains(
+            YAMLFileType.YML,
+            "services:\n" +
+            "    foo:\n" +
+            "       class: Foo\\Foobar\n" +
+            "       arguments: \n" +
+            "           - !php/const Foo\\Bar::<caret>\n",
+            "BAZ"
+        );
+
+        assertCompletionIsEmpty(
+            YAMLFileType.YML,
+            "services:\n" +
+            "    foo:\n" +
+            "       class: Foo\\Foobar\n" +
+            "       arguments: \n" +
+            "           - !php/const Foo\\Bar<caret>::BAZ\n"
+        );
+    }
 }

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

@@ -4,10 +4,13 @@
 {
     class Bar
     {
+        public const BAZ = 'baz';
+
         public function create() {}
     }
 
     class Foobar extends Bar
     {
+        public function __construct($arg = null) {}
     }
 }