Bug 576837 - Disable search if selection does not contain resource
File Search in git Repositories view is always empty
Change-Id: I305ea17dba63c6b4c78385b13588ec8a8232e4ae
Signed-off-by: Joerg Kubitz <jkubitz-eclipse@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.text/+/186963
Tested-by: Platform Bot <platform-bot@eclipse.org>
Reviewed-by: Mickael Istria <mistria@redhat.com>
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
index f07113f..e87aa34 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/ui/ScopePart.java
@@ -434,7 +434,9 @@
private boolean canSearchInSelection() {
ISelection selection= fSearchDialog.getSelection();
- return (selection instanceof IStructuredSelection) && !selection.isEmpty() || fActiveEditorCanProvideScopeSelection && fSearchDialog.getActiveEditorInput() != null;
+ return (selection instanceof IStructuredSelection) && !selection.isEmpty()
+ && !selectedResourcesFromContainer(fSearchDialog).isEmpty()
+ || fActiveEditorCanProvideScopeSelection && fSearchDialog.getActiveEditorInput() != null;
}
