reorder usage infos for safe delete to prevent invalidation

java/java-tests/testData/refactoring/safeDelete/NestedTypeParameterBounds.java

@@ -0,0 +1,5 @@
+
+class MyTest {
+  interface N<<caret>X> {}
+  N<? super N<? super N<? super N>>> k;
+}

java/java-tests/testData/refactoring/safeDelete/NestedTypeParameterBounds_after.java

@@ -0,0 +1,5 @@
+
+class MyTest {
+  interface N {}
+  N k;
+}

java/java-tests/testSrc/com/intellij/java/refactoring/SafeDeleteTest.java

@@ -245,6 +245,10 @@ public class SafeDeleteTest extends MultiFileTestCase {
     doSingleFileTest();   
   }
 
+  public void testNestedTypeParameterBounds() throws Exception {
+    doSingleFileTest();
+  }
+
   public void testLocalVariableSideEffect() throws Exception {
     try {
       doTest("Super");

platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessor.java

@@ -151,8 +151,10 @@ public class SafeDeleteProcessor extends BaseRefactoringProcessor {
         addNonCodeUsages(element, usages, getDefaultInsideDeletedCondition(myElements), mySearchNonJava, mySearchInCommentsAndStrings);
       }
     }
-    final UsageInfo[] result = usages.toArray(new UsageInfo[usages.size()]);
-    return UsageViewUtil.removeDuplicatedUsages(result);
+    UsageInfo[] result = usages.toArray(new UsageInfo[usages.size()]);
+    result = UsageViewUtil.removeDuplicatedUsages(result);
+    Arrays.sort(result, (o1, o2) -> PsiUtilCore.compareElementsByPosition(o2.getElement(), o1.getElement()));
+    return result;
   }
 
   public static Condition<PsiElement> getDefaultInsideDeletedCondition(final PsiElement[] elements) {