MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

patch: apply-somehow - fix hunk sorting

Browse Source
This commit is contained in:
Aleksey Pivovarov
2016-09-20 21:18:33 +03:00
parent cc0e4a2b9a
commit 68d7db3dd3
2 changed files with 63 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+2 -2
View File
@@ -692,8 +692,8 @@ public class DiffUtil {
}
ContainerUtil.sort(indexes, (i1, i2) -> {
T val1 = values.get(indexes.get(i1));
T val2 = values.get(indexes.get(i2));
T val1 = values.get(i1);
T val2 = values.get(i2);
return comparator.compare(val1, val2);
});
platform/diff-impl/tests/com/intellij/diff/util/DiffUtilTest.kt
+61
View File
@@ -0,0 +1,61 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* Copyright 2000-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.diff.util
import com.intellij.diff.DiffTestCase
import com.intellij.util.containers.ContainerUtil
class `DiffUtil getSortedIndexes() Test` : DiffTestCase() {
fun testSmth() {
doTest(1, 2, 3, 4, 5, 6, 7, 8) { v1, v2 -> v1 - v2 }
doTest(8, 7, 6, 5, 4, 3, 2, 1) { v1, v2 -> v1 - v2 }
doTest(1, 3, 5, 7, 8, 6, 4, 2) { v1, v2 -> v1 - v2 }
doTest(1, 2, 3, 4, 5, 6, 7, 8) { v1, v2 -> v2 - v1 }
doTest(8, 7, 6, 5, 4, 3, 2, 1) { v1, v2 -> v2 - v1 }
doTest(1, 3, 5, 7, 8, 6, 4, 2) { v1, v2 -> v2 - v1 }
}
private fun <T> doTest(vararg values: T, comparator: (T, T) -> Int) {
val list = values.toList()
val sortedIndexes = DiffUtil.getSortedIndexes(list, comparator);
val expected = ContainerUtil.sorted(list, comparator);
val actual = (0..values.size - 1).map { values[sortedIndexes[it]] }
assertOrderedEquals(actual, expected)
assertEquals(sortedIndexes.toSet().size, list.size)
}
}