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

[vcs-log] leave regular expression branch filters in recent

Browse Source
This commit is contained in:
Julia Beliaeva
2018-04-10 23:11:46 +03:00
parent 7041d0ec61
commit 1611a60768
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/impl/VcsLogUiPropertiesImpl.java
+1 -2
View File
@@ -198,8 +198,7 @@ public abstract class VcsLogUiPropertiesImpl implements PersistentStateComponent
@Override
@NotNull
public List<List<String>> getRecentlyFilteredBranchGroups() {
List<List<String>> groups = getRecentGroup(getState().RECENTLY_FILTERED_BRANCH_GROUPS);
return ContainerUtil.filter(groups, group -> group.size() > 1);
return getRecentGroup(getState().RECENTLY_FILTERED_BRANCH_GROUPS);
}
@NotNull
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/BranchFilterPopupComponent.java
+18 -1
View File
@@ -33,6 +33,7 @@ import com.intellij.vcs.log.VcsLogBranchFilter;
import com.intellij.vcs.log.VcsLogDataPack;
import com.intellij.vcs.log.VcsRef;
import com.intellij.vcs.log.impl.MainVcsLogUiProperties;
import com.intellij.vcs.log.util.VcsLogUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,6 +42,8 @@ import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
public class BranchFilterPopupComponent extends MultipleValueFilterPopupComponent<VcsLogBranchFilter> {
private final VcsLogClassicFilterUi.BranchFilterModel myBranchFilterModel;
@@ -89,7 +92,21 @@ public class BranchFilterPopupComponent extends MultipleValueFilterPopupComponen
@NotNull
@Override
protected List<List<String>> getRecentValuesFromSettings() {
return myUiProperties.getRecentlyFilteredBranchGroups();
List<List<String>> groups = myUiProperties.getRecentlyFilteredBranchGroups();
return ContainerUtil.filter(groups, group -> (group.size() == 1 && isPattern(group.get(0))) || group.size() > 1);
}
private static boolean isPattern(@NotNull String string) {
if (string.startsWith("-")) return true;
if (VcsLogUtil.maybeRegexp(string)) {
try {
Pattern.compile(string);
return true;
}
catch (PatternSyntaxException ignored) {
}
}
return false;
}
@Override