Allow different orders in CodeRename

Author: nicolasstucki

language-server/test/dotty/tools/languageserver/util/Responses.scala

@@ -12,14 +12,17 @@ object Responses {
     checkRange(loc.getRange, ref)
   }
 
-  def checkRange(range: Range, ref: CodeRange): PosCtx[Unit] = {
+  def checkRange(range: Range, ref: CodeRange): PosCtx[Unit] =
+    assert(rangeEqual(range, ref), (range, ref.show))
+
+  def rangeEqual(range: Range, ref: CodeRange): PosCtx[Boolean] = {
     ref.check()
     val start = ref.start
     val end = ref.end
-    assert(range.getStart.getLine == start.line, (range, ref.show))
-    assert(range.getStart.getCharacter == start.character, (range, ref.show))
-    assert(range.getEnd.getLine == end.line, (range, ref.show))
-    assert(range.getEnd.getCharacter == end.character, (range, ref.show))
+    range.getStart.getLine == start.line &&
+    range.getStart.getCharacter == start.character &&
+    range.getEnd.getLine == end.line &&
+    range.getEnd.getCharacter == end.character
   }
 
 }

language-server/test/dotty/tools/languageserver/util/actions/CodeRename.scala

@@ -11,10 +11,13 @@ class CodeRename(val marker: CodeMarker, newName: String, expected: List[CodeRan
   override def onPosition(file: TestFile, line: Int, char: Int): Exec = {
     val res = implicitly[TestServer].rename(file, line, char, newName)
     assert(res.getDocumentChanges == null, res)
-    for ( (edit, exp) <- res.getChanges.values().asScala.flatMap(_.asScala).zip(expected)) {
-      assert(edit.getNewText == newName, res)
-      Responses.checkRange(edit.getRange, exp)
-    }
+    val editItems = res.getChanges.values().asScala.flatMap(_.asScala) // TDO use a Map
+    assert(expected.forall { exp =>
+      editItems.exists { editItem =>
+        editItem.getNewText == newName &&
+        Responses.rangeEqual(editItem.getRange, exp)
+      }
+    }, res)
   }
 
   override def show: PositionContext.PosCtx[String] =