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

review feedback

Browse Source
This commit is contained in:
Maxim.Mossienko
2016-11-03 13:00:08 +01:00
parent 22edb891ce
commit 205ab4170f
2 changed files with 46 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lvcs-impl/src/com/intellij/history/core/tree/DirectoryEntry.java
+15 -20
View File
@@ -20,8 +20,9 @@ import com.intellij.history.core.Paths;
import com.intellij.history.core.StreamUtil;
import com.intellij.history.core.revisions.Difference;
import com.intellij.history.utils.LocalHistoryLog;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.io.DataInputOutputUtil;
import gnu.trove.TIntArrayList;
import gnu.trove.THashMap;
import gnu.trove.TIntObjectHashMap;
import org.jetbrains.annotations.NotNull;
@@ -44,7 +45,7 @@ public class DirectoryEntry extends Entry {
myChildren = new ArrayList<>(3);
}
public DirectoryEntry(DataInput in, boolean dummy /* to distinguish from general constructor*/) throws IOException {
public DirectoryEntry(DataInput in, @SuppressWarnings("unused") boolean dummy /* to distinguish from general constructor*/) throws IOException {
super(in);
int count = DataInputOutputUtil.readINT(in);
myChildren = new ArrayList<>(count);
@@ -146,8 +147,9 @@ public class DirectoryEntry extends Entry {
int commonIndex = 0;
final int myChildrenSize = myChildren.size();
final int rightChildrenSize = e.myChildren.size();
final int minChildrenSize = Math.min(myChildrenSize, rightChildrenSize);
for(int size = Math.min(myChildrenSize, rightChildrenSize); commonIndex < size; ++commonIndex) {
while(commonIndex < minChildrenSize) {
Entry childEntry = myChildren.get(commonIndex);
Entry rightChildEntry = e.myChildren.get(commonIndex);
@@ -156,6 +158,7 @@ public class DirectoryEntry extends Entry {
} else {
break;
}
++commonIndex;
}
if (commonIndex == myChildrenSize && commonIndex == rightChildrenSize) return;
@@ -183,28 +186,20 @@ public class DirectoryEntry extends Entry {
}
if (!Paths.isCaseSensitive() && uniqueNameIdToMyChildEntries.size() > 0 && uniqueNameIdToRightChildEntries.size() > 0) {
TIntArrayList uniqueChildNameIdsToRemove = new TIntArrayList();
TIntArrayList uniqueRightChildNameIdsToRemove = new TIntArrayList();
THashMap<String, Entry> nameToEntryMap = new THashMap<>(uniqueNameIdToMyChildEntries.size(), FileUtil.PATH_HASHING_STRATEGY);
uniqueNameIdToMyChildEntries.forEachValue(myChildEntry -> {
uniqueNameIdToRightChildEntries.forEachValue(rightChildEntry -> {
if (rightChildEntry.nameEquals(myChildEntry.getName()) && rightChildEntry.isDirectory() == myChildEntry.isDirectory()) {
uniqueChildNameIdsToRemove.add(myChildEntry.getNameId());
uniqueRightChildNameIdsToRemove.add(rightChildEntry.getNameId());
myNameIdToRightChildEntries.put(myChildEntry.getNameId(), rightChildEntry);
return false;
}
return true;
});
nameToEntryMap.put(myChildEntry.getName(), myChildEntry);
return true;
});
uniqueChildNameIdsToRemove.forEach(value -> {
uniqueNameIdToMyChildEntries.remove(value);
return true;
});
uniqueRightChildNameIdsToRemove.forEach(value -> {
uniqueNameIdToRightChildEntries.remove(value);
uniqueNameIdToRightChildEntries.forEachValue(rightChildEntry -> {
Entry myChildEntry = nameToEntryMap.get(rightChildEntry.getName());
if (myChildEntry != null && rightChildEntry.isDirectory() == myChildEntry.isDirectory()) {
myNameIdToRightChildEntries.put(myChildEntry.getNameId(), rightChildEntry);
uniqueNameIdToMyChildEntries.remove(myChildEntry.getNameId());
uniqueNameIdToRightChildEntries.remove(rightChildEntry.getNameId());
}
return true;
});
}
platform/platform-tests/testSrc/com/intellij/history/core/tree/DirectoryEntryTest.java
+31
View File
@@ -16,6 +16,7 @@
package com.intellij.history.core.tree;
import com.intellij.history.core.Content;
import com.intellij.history.core.LocalHistoryTestCase;
import com.intellij.history.core.Paths;
import com.intellij.history.core.StoredContent;
@@ -303,6 +304,36 @@ public class DirectoryEntryTest extends LocalHistoryTestCase {
assertEquals(1, Entry.getDifferencesBetween(e1, e2).size());
}
@Test
public void testCaseInsensitiveChildrenDiffProcessing() {
DirectoryEntry e1 = new DirectoryEntry("dir");
Content content = c("content");
final String name = "name";
final String name_v2 = "NAME";
final String name2 = "Name2";
final String name2_v2 = "name2";
e1.addChild(new FileEntry(name, content, -1, false));
e1.addChild(new FileEntry(name2, content, -1, false));
DirectoryEntry e2 = new DirectoryEntry("dir");
e2.addChild(new FileEntry(name_v2, content, -1, false));
e2.addChild(new FileEntry(name2_v2, content, -1, false));
try {
Paths.setCaseSensitive(false);
List<Difference> differences = Entry.getDifferencesBetween(e1, e2);
assertEquals(2, differences.size());
assertEquals(name, differences.get(0).getLeft().getName());
assertEquals(name_v2, differences.get(0).getRight().getName());
assertEquals(name2, differences.get(1).getLeft().getName());
assertEquals(name2_v2, differences.get(1).getRight().getName());
} finally {
Paths.useSystemCaseSensitivity();
}
}
@Test
public void testDifferenceWithCreatedChild() {
Entry e1 = new DirectoryEntry("name");