Merge pull request #1063 from bohdan-harniuk/1048-fix-IllegalArgumentException-while-instantiating-an-TextRange-object

1048: Fixed bug with wrong text range

Author: Vitaliy

src/com/magento/idea/magento2plugin/reference/provider/FilePathReferenceProvider.java

@@ -33,7 +33,8 @@ public class FilePathReferenceProvider extends PsiReferenceProvider {
             "PMD.CognitiveComplexity",
             "PMD.CyclomaticComplexity",
             "PMD.NPathComplexity",
-            "PMD.AvoidInstantiatingObjectsInLoops"
+            "PMD.AvoidInstantiatingObjectsInLoops",
+            "PMD.AvoidDeeplyNestedIfStmts"
     })
     @NotNull
     @Override
@@ -92,14 +93,13 @@ public PsiReference[] getReferencesByElement(
                     if (null != psiElement) {
                         final int currentPathIndex = currentPath.lastIndexOf('/') == -1
                                 ? 0 : currentPath.lastIndexOf('/') + 1;
+                        final int startOffset = origValue.indexOf(filePath) + currentPathIndex;
+                        final int endOffset = startOffset + pathPart.length();
 
-                        final TextRange pathRange = new TextRange(
-                                origValue.indexOf(filePath)
-                                    + currentPathIndex,
-                                origValue.indexOf(filePath)
-                                    + currentPathIndex
-                                    + pathPart.length()
-                        );
+                        if (!isProperRange(startOffset, endOffset)) {
+                            continue;
+                        }
+                        final TextRange pathRange = new TextRange(startOffset, endOffset);
 
                         if (psiPathElements.containsKey(pathRange)) {
                             psiPathElements.get(pathRange).add(psiElement);
@@ -186,4 +186,8 @@ private Collection<VirtualFile> getFiles(final @NotNull PsiElement element) {
     private boolean isModuleNamePresent(final @NotNull PsiElement element) {
         return GetModuleNameUtil.getInstance().execute(element.getText()) != null;
     }
+
+    private boolean isProperRange(final int startOffset, final int endOffset) {
+        return startOffset <= endOffset && startOffset >= 0;
+    }
 }