Skip to content

Commit cbe2644

Browse files
committed
Enable search in EH by default
Fix #118200
1 parent 42ab3cf commit cbe2644

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/vs/workbench/api/browser/mainThreadSearch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export class MainThreadSearch implements MainThreadSearchShape {
2727
this._proxy = extHostContext.getProxy(ExtHostContext.ExtHostSearch);
2828

2929
const searchConfig = _configurationService.getValue<ISearchConfiguration>().search;
30-
if (searchConfig.experimental.forceExtensionHostSearch) {
30+
if (!searchConfig.forceSearchProcess) {
3131
this._proxy.$enableExtensionHostSearch();
3232
}
3333
}

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
2424
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
2525
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
2626
import { IListService, WorkbenchListFocusContextKey, WorkbenchObjectTree } from 'vs/platform/list/browser/listService';
27-
import product from 'vs/platform/product/common/product';
2827
import { Extensions as QuickAccessExtensions, IQuickAccessRegistry } from 'vs/platform/quickinput/common/quickAccess';
2928
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
3029
import { Registry } from 'vs/platform/registry/common/platform';
@@ -1022,10 +1021,10 @@ configurationRegistry.registerConfiguration({
10221021
],
10231022
'description': nls.localize('search.sortOrder', "Controls sorting order of search results.")
10241023
},
1025-
'search.experimental.forceExtensionHostSearch': {
1024+
'search.forceSearchProcess': {
10261025
type: 'boolean',
1027-
default: product.quality !== 'stable',
1028-
description: nls.localize('search.experimental.forceExtensionHostSearch', "When enabled, search always runs in the extension host instead of a separate search process.")
1026+
default: false,
1027+
description: nls.localize('search.forceSearchProcess', "When enabled, search in a local window runs in a separate search process instead of the extension host.")
10291028
}
10301029
}
10311030
});

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,7 @@ export interface ISearchConfigurationProperties {
387387
experimental: {}
388388
};
389389
sortOrder: SearchSortOrder;
390-
experimental: {
391-
forceExtensionHostSearch: boolean;
392-
}
390+
forceSearchProcess: boolean;
393391
}
394392

395393
export interface ISearchConfiguration extends IFilesConfiguration {

0 commit comments

Comments
 (0)