PsiDynaReference cleanup + LinkedHashMap for PathManager

GitOrigin-RevId: f3a52910ab785ed674f3a7c7924406169b20626b
This commit is contained in:
sergey.vasiliev
2023-07-20 12:25:21 +00:00
committed by intellij-monorepo-bot
parent 3c7f7a2fe5
commit fbf4ffdc5a
2 changed files with 2 additions and 5 deletions
@@ -26,9 +26,7 @@ public class PsiDynaReference<T extends PsiElement> extends PsiReferenceBase<T>
implements FileReferenceOwner, PsiPolyVariantReference, LocalQuickFixProvider, EmptyResolveMessageProvider, PsiReferencesWrapper {
private final List<PsiReference> myReferences = new ArrayList<>();
private final int myChosenOne = -1;
private ResolveResult[] myCachedResult;
private @Nullable TextRange myPredefinedRange = null;
public PsiDynaReference(final T psiElement) {
super(psiElement, true);
@@ -54,7 +52,6 @@ public class PsiDynaReference<T extends PsiElement> extends PsiReferenceBase<T>
@Override
public void setRangeInElement(TextRange rangeInElement) {
super.setRangeInElement(rangeInElement);
this.myPredefinedRange = rangeInElement;
}
@Override
@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -114,7 +114,7 @@ public class PathReferenceManagerImpl extends PathReferenceManager {
}
private static PsiReference[] doMerge(final PsiElement element, final List<? extends PsiReference> references) {
Map<TextRange, PsiReference> byTextRanges = new HashMap<>();
Map<TextRange, PsiReference> byTextRanges = new LinkedHashMap<>();
for (PsiReference reference : references) {
final TextRange textRange = reference.getRangeInElement();