keep problems scope and VCS scopes together

This commit is contained in:
Sergey Malenkov
2018-03-23 13:54:41 +03:00
parent 1303117a28
commit 6d35cff3ae
3 changed files with 13 additions and 1 deletions
@@ -6,10 +6,14 @@ import com.intellij.ide.IdeBundle;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.problems.WolfTheProblemSolver;
import com.intellij.psi.search.scope.packageSet.CustomScopesProvider;
import com.intellij.psi.search.scope.packageSet.NamedScope;
import com.intellij.psi.search.scope.packageSet.FilteredPackageSet;
import org.jetbrains.annotations.NotNull;
import java.util.Collections;
import java.util.List;
/**
* @author Sergey Malenkov
*/
@@ -26,4 +30,12 @@ public final class ProblemsScope extends NamedScope {
}
});
}
public static final class Provider implements CustomScopesProvider {
@NotNull
@Override
public List<NamedScope> getCustomScopes() {
return Collections.singletonList(INSTANCE);
}
}
}
@@ -31,7 +31,6 @@ public class DefaultScopesProvider extends CustomScopesProviderEx {
public DefaultScopesProvider(@NotNull Project project) {
myProject = project;
myScopes = Arrays.asList(ProjectFilesScope.INSTANCE,
ProblemsScope.INSTANCE,
getAllScope(),
NonProjectFilesScope.INSTANCE,
new ScratchesNamedScope());
@@ -486,6 +486,7 @@
<patternDialectProvider implementation="com.intellij.packageDependencies.ui.ProjectPatternProvider" id="file"/>
<customScopesProvider implementation="com.intellij.packageDependencies.DefaultScopesProvider"/>
<customScopesProvider implementation="com.intellij.psi.search.scope.ProblemsScope$Provider" order="last"/>
<customScopesProvider implementation="com.intellij.packageDependencies.ChangeListsScopesProvider" order="last"/>
<refactoring.elementListenerProvider implementation="com.intellij.packageDependencies.ui.RefactoringScopeElementListenerProvider"/>