diff options
Diffstat (limited to 'platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosTreeStructure.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosTreeStructure.java | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosTreeStructure.java b/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosTreeStructure.java index 322cc44bc99c..500e17b56534 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosTreeStructure.java @@ -24,22 +24,14 @@ import com.intellij.ide.todo.nodes.ToDoRootNode; import com.intellij.ide.util.scopeChooser.ScopeChooserCombo; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ChangeListManager; -import com.intellij.openapi.vfs.VfsUtil; -import com.intellij.packageDependencies.DependencyValidationManager; import com.intellij.psi.PsiFile; -import com.intellij.psi.search.scope.packageSet.NamedScope; -import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; -import com.intellij.psi.search.scope.packageSet.PackageSet; - -import javax.swing.*; -import java.util.Collection; +import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.SearchScope; public class ScopeBasedTodosTreeStructure extends TodoTreeStructure { - private final JComboBox myScopes; + private final ScopeChooserCombo myScopes; - public ScopeBasedTodosTreeStructure(Project project, JComboBox scopes) { + public ScopeBasedTodosTreeStructure(Project project, ScopeChooserCombo scopes) { super(project); myScopes = scopes; } @@ -48,12 +40,9 @@ public class ScopeBasedTodosTreeStructure extends TodoTreeStructure { public boolean accept(final PsiFile psiFile) { if (!psiFile.isValid()) return false; boolean isAffected = false; - final ScopeBasedTodosPanel.ScopeWrapper scope = (ScopeBasedTodosPanel.ScopeWrapper)myScopes.getSelectedItem(); - if (scope != null) { - final PackageSet value = scope.getNamedScope().getValue(); - if (value != null) { - isAffected = value.contains(psiFile, NamedScopesHolder.getHolder(myProject, scope.getName(), DependencyValidationManager.getInstance(myProject))); - } + SearchScope scope = myScopes.getSelectedScope(); + if (scope instanceof GlobalSearchScope) { + isAffected = ((GlobalSearchScope)scope).contains(psiFile.getVirtualFile()); } return isAffected && (myTodoFilter != null && myTodoFilter.accept(mySearchHelper, psiFile) || (myTodoFilter == null && mySearchHelper.getTodoItemsCount(psiFile) > 0)); |