diff --git a/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java b/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java
index c64a664f0dbb..12f4cbfba954 100644
--- a/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java
+++ b/platform/analysis-impl/src/com/intellij/openapi/paths/PsiDynaReference.java
@@ -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
diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java
index f3996c94900d..28655c2d9b73 100644
--- a/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java
@@ -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();