Fix #36548 - add search.followSymlinks

src/vs/platform/search/common/search.ts

@@ -55,6 +55,7 @@ export interface ICommonQueryOptions {
 	useRipgrep?: boolean;
 	disregardIgnoreFiles?: boolean;
 	disregardExcludeSettings?: boolean;
+	ignoreSymlinks?: boolean;
 }
 
 export interface IQueryOptions extends ICommonQueryOptions {
@@ -173,6 +174,7 @@ export interface ISearchConfiguration extends IFilesConfiguration {
 		exclude: glob.IExpression;
 		useRipgrep: boolean;
 		useIgnoreFilesByDefault: boolean;
+		followSymlinks: boolean;
 	};
 	editor: {
 		wordSeparators: string;

src/vs/workbench/parts/search/browser/search.contribution.ts

@@ -371,6 +371,11 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'description': nls.localize('search.quickOpen.includeSymbols', "Configure to include results from a global symbol search in the file results for Quick Open."),
 			'default': false
+		},
+		'search.followSymlinks': {
+			'type': 'boolean',
+			'description': nls.localize('search.followSymlinks', "Controls whether to follow symlinks while searching."),
+			'default': true
 		}
 	}
 });

src/vs/workbench/parts/search/common/queryBuilder.ts

@@ -60,6 +60,8 @@ export class QueryBuilder {
 			return folderConfig.search.useRipgrep;
 		});
 
+		const ignoreSymlinks = !this.configurationService.getConfiguration<ISearchConfiguration>().search.followSymlinks;
+
 		const query = <ISearchQuery>{
 			type,
 			folderQueries,
@@ -74,7 +76,8 @@ export class QueryBuilder {
 			contentPattern: contentPattern,
 			useRipgrep,
 			disregardIgnoreFiles: options.disregardIgnoreFiles,
-			disregardExcludeSettings: options.disregardExcludeSettings
+			disregardExcludeSettings: options.disregardExcludeSettings,
+			ignoreSymlinks
 		};
 
 		// Filter extraFileResources against global include/exclude patterns - they are already expected to not belong to a workspace

src/vs/workbench/parts/search/common/search.ts

@@ -80,7 +80,8 @@ export interface IWorkbenchSearchConfiguration extends ISearchConfiguration {
 		},
 		exclude: glob.IExpression,
 		useRipgrep: boolean,
-		useIgnoreFilesByDefault: boolean
+		useIgnoreFilesByDefault: boolean,
+		followSymlinks: boolean;
 	};
 }
 

src/vs/workbench/services/search/node/ripgrepFileSearch.ts

@@ -42,7 +42,9 @@ function getRgArgs(config: IRawSearch, folderQuery: IFolderSearch, includePatter
 	}
 
 	// Follow symlinks
-	args.push('--follow');
+	if (!config.ignoreSymlinks) {
+		args.push('--follow');
+	}
 
 	if (config.exists) {
 		args.push('--quiet');

src/vs/workbench/services/search/node/ripgrepTextSearch.ts

@@ -493,7 +493,9 @@ function getRgArgs(config: IRawSearch): IRgGlobResult {
 	}
 
 	// Follow symlinks
-	args.push('--follow');
+	if (!config.ignoreSymlinks) {
+		args.push('--follow');
+	}
 
 	// Set default encoding if only one folder is opened
 	if (config.folderQueries.length === 1 && config.folderQueries[0].fileEncoding && config.folderQueries[0].fileEncoding !== 'utf8') {

src/vs/workbench/services/search/node/search.ts

@@ -19,6 +19,7 @@ export interface IFolderSearch {
 
 export interface IRawSearch {
 	folderQueries: IFolderSearch[];
+	ignoreSymlinks?: boolean;
 	extraFiles?: string[];
 	filePattern?: string;
 	excludePattern?: IExpression;

src/vs/workbench/services/search/node/searchService.ts

@@ -270,7 +270,8 @@ export class DiskSearch implements ISearchResultProvider {
 			sortByScore: query.sortByScore,
 			cacheKey: query.cacheKey,
 			useRipgrep: query.useRipgrep,
-			disregardIgnoreFiles: query.disregardIgnoreFiles
+			disregardIgnoreFiles: query.disregardIgnoreFiles,
+			ignoreSymlinks: query.ignoreSymlinks
 		};
 
 		if (query.folderQueries) {