Revert "Add preference for disabling file search on specific files"

bundles/org.eclipse.search.core/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java

@@ -38,14 +38,12 @@
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.QualifiedName;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.SubMonitor;
 import org.eclipse.core.runtime.content.IContentType;
 import org.eclipse.core.runtime.content.IContentTypeManager;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobGroup;
-import org.eclipse.core.runtime.preferences.IPreferencesService;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResourceStatus;
@@ -72,7 +70,6 @@ public class TextSearchVisitor {
 
 	public static final boolean TRACING= "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.search/perf")); //$NON-NLS-1$ //$NON-NLS-2$
 	private static final int NUMBER_OF_LOGICAL_THREADS= Runtime.getRuntime().availableProcessors();
-	private static final String EXCLUSION_PREFERENCE_NAME = "search_exclusion_property"; //$NON-NLS-1$
 
 	/**
 	 * Queue of files to be searched. IFile pointing to the same local file are
@@ -188,6 +185,8 @@ protected IStatus run(IProgressMonitor inner) {
 		}
 
 		public IStatus processFile(List<IFile> sameFiles, IProgressMonitor monitor) {
+			// A natural cleanup after the change to use JobGroups is accepted would be to move these
+			// methods to the TextSearchJob class.
 			Matcher matcher= fSearchPattern.pattern().isEmpty() ? null : fSearchPattern.matcher(""); //$NON-NLS-1$
 			IFile file = sameFiles.remove(0);
 			monitor.setTaskName(file.getFullPath().toString());
@@ -261,7 +260,9 @@ public IStatus processFile(List<IFile> sameFiles, IProgressMonitor monitor) {
 				if (fIsLightweightAutoRefresh && IResourceStatus.RESOURCE_NOT_FOUND == e.getStatus().getCode()) {
 					return monitor.isCanceled() ? Status.CANCEL_STATUS : Status.OK_STATUS;
 				}
-				return errorStatusForFile(file, e);
+				Object[] args= { getExceptionMessage(e), file.getFullPath().makeRelative().toString() };
+				String message = MessageFormat.format(SearchCoreMessages.TextSearchVisitor_error, args);
+				return new Status(IStatus.ERROR, SearchCorePlugin.PLUGIN_ID, IStatus.ERROR, message, e);
 			} catch (StackOverflowError e) {
 				fFatalError= true;
 				String message= SearchCoreMessages.TextSearchVisitor_patterntoocomplex0;
@@ -301,8 +302,6 @@ public Map<IFile, IDocument> getDocumentsInEditors() {
 	private volatile boolean fIsLightweightAutoRefresh;
 	private final DirtyFileProvider fDirtyDiscovery;
 
-	private final QualifiedName fExclusionProperty;
-
 	public TextSearchVisitor(TextSearchRequestor collector, Pattern searchPattern, DirtyFileProvider dirtyDiscovery) {
 		fCollector= collector;
 		fDirtyDiscovery = dirtyDiscovery;
@@ -313,10 +312,6 @@ public TextSearchVisitor(TextSearchRequestor collector, Pattern searchPattern, D
 
 		fIsLightweightAutoRefresh= Platform.getPreferencesService().getBoolean(ResourcesPlugin.PI_RESOURCES, ResourcesPlugin.PREF_LIGHTWEIGHT_AUTO_REFRESH, false, null);
 		fileBatches = new ConcurrentLinkedQueue<>();
-
-		IPreferencesService prefs = Platform.getPreferencesService();
-		String exclusionPropertyName = prefs.getString(SearchCorePlugin.PLUGIN_ID, EXCLUSION_PREFERENCE_NAME, "", null); //$NON-NLS-1$
-		fExclusionProperty = exclusionPropertyName.isEmpty() ? null : new QualifiedName(null, exclusionPropertyName);
 	}
 
 	public IStatus search(IFile[] files, IProgressMonitor monitor) {
@@ -350,9 +345,6 @@ public IStatus search(IFile[] files, IProgressMonitor monitor) {
 				Map<String, List<IFile>> remoteFilesByLocation = new LinkedHashMap<>();
 
 				for (IFile file : files) {
-					if (excluded(file)) {
-						continue;
-					}
 					IPath path = file.getLocation();
 					String key = path == null ? file.getLocationURI().toString() : path.toString();
 					Map<String, List<IFile>> filesByLocation = (path != null) ? localFilesByLocation
@@ -521,14 +513,8 @@ private List<TextSearchMatchAccess> locateMatches(IFile file, CharSequence searc
 		return occurences;
 	}
 
-	private static Status errorStatusForFile(IFile file, CoreException e) {
-		Object[] args = { getExceptionMessage(e), file.getFullPath().makeRelative().toString() };
-		String message = MessageFormat.format(SearchCoreMessages.TextSearchVisitor_error, args);
-		Status status = new Status(IStatus.ERROR, SearchCorePlugin.PLUGIN_ID, IStatus.ERROR, message, e);
-		return status;
-	}
 
-	private static String getExceptionMessage(Exception e) {
+	private String getExceptionMessage(Exception e) {
 		String message= e.getLocalizedMessage();
 		if (message == null) {
 			return e.getClass().getName();
@@ -556,22 +542,4 @@ private String getCharSetName(IFile file) {
 		}
 	}
 
-	private boolean excluded(IFile file) {
-		if (fExclusionProperty != null) {
-			try {
-				return file.getSessionProperty(fExclusionProperty) != null;
-			} catch (CoreException e) {
-				/*
-				 * The preference 'search_exclusion_property' indicates we
-				 * should skip files with the respective session property, but
-				 * we ran into an exception while reading the properties of the
-				 * file. Skip the file from the search, since we don't know if
-				 * the property is set or not.
-				 */
-				fStatus.add(errorStatusForFile(file, e));
-				return true;
-			}
-		}
-		return false;
-	}
 }

tests/org.eclipse.search.tests/src/org/eclipse/search/tests/filesearch/AllFileSearchTests.java

@@ -28,7 +28,6 @@
 		SearchResultPageTest.class,
 		SortingTest.class,
 		TextSearchResultTest.class,
-		ExcludedFilesSearchTest.class,
 })
 public class AllFileSearchTests {
 }