Skip to content

1048: Fixed bug with wrong text range #1063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2022
Merged

1048: Fixed bug with wrong text range #1063

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions src/com/magento/idea/magento2plugin/reference/provider/FilePathReferenceProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ public class FilePathReferenceProvider extends PsiReferenceProvider {
"PMD.CognitiveComplexity",
"PMD.CyclomaticComplexity",
"PMD.NPathComplexity",
"PMD.AvoidInstantiatingObjectsInLoops"
"PMD.AvoidInstantiatingObjectsInLoops",
"PMD.AvoidDeeplyNestedIfStmts"
})
@NotNull
@Override
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
}