Feat/ide 715 filter tree #226
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| package io.snyk.eclipse.plugin.views.snyktoolview; | ||
|
|
||
| import java.util.function.Predicate; | ||
|
|
||
| import org.eclipse.jface.viewers.TreeViewer; | ||
|
|
||
| import io.snyk.eclipse.plugin.SnykStartup; | ||
| import io.snyk.eclipse.plugin.properties.preferences.Preferences; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.FixableFilter; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.IgnoresFilter; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.IgnoresOpenIssuesFilter; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.OssFixableFilter; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.SeverityCriticalFilter; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.SeverityHighFilter; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.SeverityLowFilter; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.filters.SeverityMediumFilter; | ||
| import io.snyk.languageserver.protocolextension.messageObjects.scanResults.Issue; | ||
|
|
||
| public class TreeFilterManager { | ||
|
|
||
| private TreeViewer treeView; | ||
| private TreeViewerFilter filter; | ||
| private static TreeFilterManager filterManager; | ||
|
|
||
| public synchronized static TreeFilterManager getInstance() { | ||
| if (filterManager != null) { | ||
| return filterManager; | ||
| } | ||
| filterManager = new TreeFilterManager(); | ||
|
|
||
| setupFilters(); | ||
| return filterManager; | ||
| } | ||
|
|
||
| private static void setupFilters() { | ||
| // Severity filters | ||
| new SeverityCriticalFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), | ||
| Preferences.FILTER_CRITICAL).applyFilter(); | ||
| new SeverityHighFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), Preferences.FILTER_HIGH) | ||
| .applyFilter(); | ||
| new SeverityMediumFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), Preferences.FILTER_MEDIUM) | ||
| .applyFilter(); | ||
| new SeverityLowFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), Preferences.FILTER_LOW) | ||
| .applyFilter(); | ||
|
|
||
| // Ignores filters | ||
| new IgnoresFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), | ||
| Preferences.FILTER_IGNORES_SHOW_IGNORED_ISSUES).applyFilter(); | ||
| new IgnoresOpenIssuesFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), | ||
| Preferences.FILTER_IGNORES_SHOW_OPEN_ISSUES).applyFilter(); | ||
|
|
||
| // Fix | ||
| new FixableFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), Preferences.FILTER_FIXABLE_ISSUES) | ||
| .applyFilter(); | ||
| new OssFixableFilter(TreeFilterManager.getInstance(), Preferences.getInstance(), | ||
| Preferences.FILTER_OSS_FIXABLE_ISSUES).applyFilter(); | ||
|
|
||
| } | ||
|
|
||
| private TreeFilterManager() { | ||
| treeView = SnykStartup.getView().getTreeViewer(); | ||
| filter = new TreeViewerFilter(); | ||
| } | ||
|
|
||
| public void addTreeFilter(String filterName, Predicate<? super Issue> filterPredicate) { | ||
| filter.setFilterPredicate(filterName, filterPredicate); | ||
| treeView.addFilter(filter); | ||
| updateTree(treeView); | ||
| } | ||
|
|
||
| public void removeTreeFilter(String filterName) { | ||
| filter.removeFilterPredicate(filterName); | ||
| treeView.addFilter(filter); | ||
| updateTree(treeView); | ||
| } | ||
|
|
||
| public void removeTreeFilters() { | ||
| treeView.resetFilters(); | ||
| updateTree(treeView); | ||
| } | ||
|
|
||
| private void updateTree(TreeViewer treeView) { | ||
| treeView.getControl().setRedraw(false); | ||
| treeView.refresh(); | ||
| treeView.getControl().setRedraw(true); | ||
| treeView.expandAll(); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,66 @@ | ||
| package io.snyk.eclipse.plugin.views.snyktoolview; | ||
|
|
||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.function.Predicate; | ||
|
|
||
| import org.eclipse.jface.viewers.ITreeContentProvider; | ||
| import org.eclipse.jface.viewers.TreeViewer; | ||
| import org.eclipse.jface.viewers.Viewer; | ||
| import org.eclipse.jface.viewers.ViewerFilter; | ||
|
|
||
| import io.snyk.languageserver.protocolextension.messageObjects.scanResults.Issue; | ||
|
|
||
| public class TreeViewerFilter extends ViewerFilter { | ||
| private Map<String, Predicate<? super Issue>> filters; | ||
|
|
||
| public TreeViewerFilter() { | ||
| filters = new ConcurrentHashMap<>(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean select(Viewer viewer, Object parentElement, Object element) { | ||
| if (element instanceof FileTreeNode) { | ||
| return hasVisibleChildren((FileTreeNode) element, viewer); | ||
| } | ||
|
|
||
| if (!(element instanceof IssueTreeNode) || !(viewer instanceof TreeViewer)) { | ||
| return true; | ||
| } | ||
|
|
||
| return isIssueVisible((IssueTreeNode) element); | ||
| } | ||
|
|
||
| private boolean hasVisibleChildren(FileTreeNode fileNode, Viewer viewer) { | ||
| Object[] children = ((ITreeContentProvider) ((TreeViewer) viewer).getContentProvider()).getChildren(fileNode); | ||
| for (Object child : children) { | ||
| if (child instanceof IssueTreeNode && isIssueVisible((IssueTreeNode) child)) { | ||
| return true; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| private boolean isIssueVisible(IssueTreeNode issueNode) { | ||
| Issue issue = issueNode.getIssue(); | ||
| if (issue == null) { | ||
| return true; | ||
|
There was a problem hiding this comment. why would it be visible if null? There was a problem hiding this comment. We don't want to apply filters (and hide) tree elements if we don't match any filters. |
||
| } | ||
|
|
||
| for (var filter : this.filters.values()) { | ||
| if (!filter.test(issue)) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| public void setFilterPredicate(String filterName, Predicate<? super Issue> predicate) { | ||
| this.filters.put(filterName, predicate); | ||
| } | ||
|
|
||
| public void removeFilterPredicate(String filterName) { | ||
| this.filters.remove(filterName); | ||
| } | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package io.snyk.eclipse.plugin.views.snyktoolview.filters; | ||
|
|
||
| public interface BaseFilter { | ||
| public void applyFilter(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package io.snyk.eclipse.plugin.views.snyktoolview.filters; | ||
|
|
||
| import io.snyk.eclipse.plugin.properties.preferences.Preferences; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.TreeFilterManager; | ||
|
|
||
| public class FixableFilter implements BaseFilter { | ||
| private TreeFilterManager filterManager; | ||
| private Preferences preferences; | ||
| private String preferenceKey; | ||
|
|
||
| public FixableFilter(TreeFilterManager filterManager, Preferences preferences, String preferenceKey) { | ||
| this.filterManager = filterManager; | ||
| this.preferences = preferences; | ||
| this.preferenceKey = preferenceKey; | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void applyFilter() { | ||
| boolean booleanPref = this.preferences.getBooleanPref(this.preferenceKey); | ||
|
|
||
| if (booleanPref) { | ||
| this.filterManager.addTreeFilter(this.preferenceKey, issue -> issue.hasFix()); | ||
| } else { | ||
| this.filterManager.removeTreeFilter(this.preferenceKey); | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package io.snyk.eclipse.plugin.views.snyktoolview.filters; | ||
|
|
||
| import io.snyk.eclipse.plugin.properties.preferences.Preferences; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.TreeFilterManager; | ||
|
|
||
| public class IgnoresFilter implements BaseFilter { | ||
| private TreeFilterManager filterManager; | ||
| private Preferences preferences; | ||
| private String preferenceKey; | ||
|
|
||
| public IgnoresFilter(TreeFilterManager filterManager, Preferences preferences, String preferenceKey) { | ||
| this.filterManager = filterManager; | ||
| this.preferences = preferences; | ||
| this.preferenceKey = preferenceKey; | ||
| } | ||
|
|
||
| @Override | ||
| public void applyFilter() { | ||
| boolean booleanPref = this.preferences.getBooleanPref(this.preferenceKey); | ||
|
|
||
| if (booleanPref) { | ||
| filterManager.removeTreeFilter(preferenceKey); | ||
| } else { | ||
| filterManager.addTreeFilter(preferenceKey, issue -> !issue.isIgnored()); | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package io.snyk.eclipse.plugin.views.snyktoolview.filters; | ||
|
|
||
| import io.snyk.eclipse.plugin.properties.preferences.Preferences; | ||
| import io.snyk.eclipse.plugin.views.snyktoolview.TreeFilterManager; | ||
|
|
||
| public class IgnoresOpenIssuesFilter implements BaseFilter { | ||
| private TreeFilterManager filterManager; | ||
| private Preferences preferences; | ||
| private String preferenceKey; | ||
|
|
||
| public IgnoresOpenIssuesFilter(TreeFilterManager filterManager, Preferences preferences, String preferenceKey) { | ||
| this.filterManager = filterManager; | ||
| this.preferences = preferences; | ||
| this.preferenceKey = preferenceKey; | ||
| } | ||
|
|
||
| @Override | ||
| public void applyFilter() { | ||
| boolean booleanPref = this.preferences.getBooleanPref(Preferences.FILTER_IGNORES_SHOW_OPEN_ISSUES); | ||
|
|
||
| if (booleanPref) { | ||
| filterManager.removeTreeFilter(preferenceKey); | ||
| } else { | ||
| filterManager.addTreeFilter(preferenceKey, issue -> issue.isIgnored()); | ||
| } | ||
|
|
||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
that looks good. I hope it wouldn't be a performance bottleneck tho.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed, we only call the
hasVisibleChildrenif the node is a treenode, so its not called for all tree nodes. However this might be slow if a project has very many files.