From 5b83f7b15de152090d31fda660ced822068487e5 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 8 Jun 2012 17:08:36 +0400 Subject: [PATCH] EA-36519 - IAE: RefactoringUtil.sortDepthFirstRightLeftOrder --- .../src/com/intellij/refactoring/util/RefactoringUtil.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java index 2eda3ad6425f..4d725b7759b6 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -175,7 +175,11 @@ public class RefactoringUtil { public int compare(final UsageInfo usage1, final UsageInfo usage2) { final PsiElement element1 = usage1.getElement(); final PsiElement element2 = usage2.getElement(); - if (element1 == null || element2 == null) return 0; + if (element1 == null) { + if (element2 == null) return 0; + return 1; + } + if (element2 == null) return -1; return element2.getTextRange().getStartOffset() - element1.getTextRange().getStartOffset(); } });