[T3CMS] Handle StringIndexOutOfBoundsException in AbstractServiceLocatorTypeProvider (#336)

Author: cedricziel

.travis.yml

@@ -29,14 +29,7 @@ before_install:
 - java -version
 
 script:
-- |
-  if [[ ${SINCE_BUILD} == "193" ]]; then
-    sed -i '25d' typo3-cms/src/main/resources/META-INF/plugin.xml
-    cat typo3-cms/src/main/resources/META-INF/plugin.xml
-  fi
-
-- "./gradlew check"
-- "./gradlew buildPlugin"
+- "./gradlew clean build"
 
 deploy:
   provider: releases

typo3-cms/src/main/java/com/cedricziel/idea/typo3/provider/AbstractServiceLocatorTypeProvider.java

@@ -1,5 +1,6 @@
 package com.cedricziel.idea.typo3.provider;
 
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
@@ -13,6 +14,8 @@
 
 abstract public class AbstractServiceLocatorTypeProvider implements PhpTypeProvider4 {
 
+    private static final Logger LOG = Logger.getInstance(AbstractServiceLocatorTypeProvider.class);
+
     public static final char TRIM_KEY = '%';
 
     @Nullable
@@ -30,16 +33,22 @@ public Collection<? extends PhpNamedElement> getBySignature(String expression, S
         // Get FQN from parameter string.
         // Example (PhpStorm 8): #K#C\Foo\Bar::get()%#K#C\Bar\Baz. -> \Bar\Baz.
         // Example (PhpStorm 9): #K#C\Foo\Bar::get()%#K#C\Bar\Baz.class -> \Bar\Baz.class
-        String parameter = expression.substring(endIndex + 5);
+        try {
+            String parameter = expression.substring(endIndex + 5);
 
-        if (parameter.contains(".class")) { // for PhpStorm 9
-            parameter = parameter.replace(".class", "");
-        }
+            if (parameter.contains(".class")) { // for PhpStorm 9
+                parameter = parameter.replace(".class", "");
+            }
 
-        if (parameter.contains(".")) {
-            parameter = parameter.replace(".", "");
-        }
+            if (parameter.contains(".")) {
+                parameter = parameter.replace(".", "");
+            }
 
-        return PhpIndex.getInstance(project).getAnyByFQN(parameter);
+            return PhpIndex.getInstance(project).getAnyByFQN(parameter);
+        } catch (StringIndexOutOfBoundsException e) {
+            LOG.warn("Unable to find PhpNamedElement by signature from \"" + expression + "\"");
+
+            return Collections.emptySet();
+        }
     }
 }