Fix #41156 - add separate setting for search viewlet globalFindClipboard, off by default

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

@@ -177,6 +177,7 @@ export interface ISearchConfigurationProperties {
 	useIgnoreFiles: boolean;
 	followSymlinks: boolean;
 	smartCase: boolean;
+	globalFindClipboard: boolean;
 }
 
 export interface ISearchConfiguration extends IFilesConfiguration {

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

@@ -31,7 +31,7 @@ import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vs/editor/contrib/find/findModel';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
-import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
+import { ISearchConfigurationProperties } from '../../../../platform/search/common/search';
 
 export interface ISearchWidgetOptions {
 	value?: string;
@@ -253,7 +253,7 @@ export class SearchWidget extends Widget {
 		this._register(this.searchInputFocusTracker.onDidFocus(() => {
 			this.searchInputBoxFocused.set(true);
 
-			const useGlobalFindBuffer = this.configurationService.getValue<IEditorOptions>('editor').find.globalFindClipboard;
+			const useGlobalFindBuffer = this.configurationService.getValue<ISearchConfigurationProperties>('search').globalFindClipboard;
 			if (!this.ignoreGlobalFindBufferOnNextFocus && useGlobalFindBuffer) {
 				const globalBufferText = this.clipboardServce.readFindText();
 				if (this.previousGlobalFindBufferValue !== globalBufferText) {

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

@@ -14,6 +14,7 @@ import nls = require('vs/nls');
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Action } from 'vs/base/common/actions';
 import * as objects from 'vs/base/common/objects';
+import * as platform from 'vs/base/common/platform';
 import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/parts/files/common/files';
 import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
 import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
@@ -428,6 +429,12 @@ configurationRegistry.registerConfiguration({
 			'type': 'boolean',
 			'description': nls.localize('search.smartCase', "Searches case-insensitively if the pattern is all lowercase, otherwise, searches case-sensitively"),
 			'default': false
+		},
+		'search.globalFindClipboard': {
+			'type': 'boolean',
+			'default': false,
+			'description': nls.localize('search.globalFindClipboard', "Controls if the Search Viewlet should read or modify the shared find clipboard on macOS"),
+			'included': platform.isMacintosh
 		}
 	}
 });