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

[shelve]: improve matching change list strategy for unshelve

Browse Source
This commit is contained in:
Nadya Zabrodina
2015-09-18 14:02:37 +03:00
parent fb82620bd9
commit 948ff3207b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/UnshelveChangesAction.java
+12 -2
View File
@@ -98,12 +98,22 @@ public class UnshelveChangesAction extends DumbAwareAction {
@Nullable
private static LocalChangeList tryToMatchWithExistingChangelist(@NotNull ChangeListManager changeListManager,
@NotNull final String defaultName) {
return ContainerUtil.find(changeListManager.getChangeListsCopy(), new Condition<LocalChangeList>() {
List<LocalChangeList> matched = ContainerUtil.findAll(changeListManager.getChangeListsCopy(), new Condition<LocalChangeList>() {
@Override
public boolean value(LocalChangeList list) {
return defaultName.contains(list.getName());
return defaultName.contains(list.getName().trim());
}
});
int maxLen = -1;
LocalChangeList bestMatch = null;
for (LocalChangeList changeList : matched) {
int len = changeList.getName().trim().length();
if (len > maxLen) {
maxLen = len;
bestMatch = changeList;
}
}
return bestMatch;
}
@Override