From 7c319aca6715ad3ab9ae7f7eb0dbcdbd24dd7990 Mon Sep 17 00:00:00 2001 From: Konstantin Ulitin Date: Tue, 20 Apr 2021 17:28:29 +0200 Subject: [PATCH] sort file references by offset FileReferenceUtil.findFile depends on it. Fixes JSLightResolveTest.testPreferIncludedScript. GitOrigin-RevId: 6bef8a80b03782135d9f38c1d61b3e1a0a1c468d --- .../src/com/intellij/openapi/paths/PathReferenceManagerImpl.java | 1 + 1 file changed, 1 insertion(+) 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 2c84971ba700..1aab3c19ffe6 100644 --- a/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java @@ -162,6 +162,7 @@ public class PathReferenceManagerImpl extends PathReferenceManager { List result = doMerge(element, intersecting); result.addAll(notIntersecting); + result.sort(START_OFFSET_COMPARATOR); return result.toArray(PsiReference.EMPTY_ARRAY); }