@codingame/monaco-vscode-search-service-override 4.4.0 → 4.5.0-improve-code-splitting.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-search-service-override",
-  "version": "4.4.0",
+  "version": "4.5.0-improve-code-splitting.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,15 +17,18 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.0"
-  },
   "exports": {
     ".": {
       "default": "./index.js"
     },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    },
     "./worker": {
       "default": "./worker.js"
     }
+  },
+  "dependencies": {
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0-improve-code-splitting.1"
   }
 }

package/search.d.ts

@@ -5,8 +5,8 @@ interface SearchServiceOverrideProps {
      * Is an `HTMLFileSystemProvider` is used as only provider for the `file` scheme directly (without overlay)
      * Enable this option to enable searching local filesystem
      */
-    useHtmlFileSystemProvider: boolean;
+    useHtmlFileSystemProvider?: boolean;
 }
-declare function getServiceOverride({ useHtmlFileSystemProvider }: SearchServiceOverrideProps): IEditorOverrideServices;
+declare function getServiceOverride({ useHtmlFileSystemProvider }?: SearchServiceOverrideProps): IEditorOverrideServices;
 
 export { getServiceOverride as default };

package/search.js

@@ -1,15 +1,17 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search.service';
 import { SearchService } from './vscode/src/vs/workbench/services/search/common/searchService.js';
-import { ISearchViewModelWorkbenchService, SearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { ISearchHistoryService, SearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
-import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
+import { SearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel.service';
+import { SearchHistoryService } from './vscode/src/vs/workbench/contrib/search/common/searchHistoryService.js';
+import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService.service';
+import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { ReplaceService } from './vscode/src/vs/workbench/contrib/search/browser/replaceService.js';
 import { RemoteSearchService } from './vscode/src/vs/workbench/services/search/browser/searchService.js';
 import './vscode/src/vs/workbench/contrib/search/browser/search.contribution.js';
 import './vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js';
 
-function getServiceOverride({ useHtmlFileSystemProvider }) {
+function getServiceOverride({ useHtmlFileSystemProvider = false } = {}) {
     return {
         [( ISearchService.toString())]: useHtmlFileSystemProvider ? new SyncDescriptor(RemoteSearchService, [], true) : new SyncDescriptor(SearchService, [], true),
         [( ISearchViewModelWorkbenchService.toString())]: new SyncDescriptor(SearchViewModelWorkbenchService, [], true),

package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js

@@ -1,36 +1,38 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './media/anythingQuickAccess.css.js';
-import { QuickPickItemScorerAccessor, QuickInputHideReason, quickPickItemScorerAccessor, IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { QuickPickItemScorerAccessor, QuickInputHideReason, quickPickItemScorerAccessor } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { prepareQuery, compareItemsByFuzzyScore, scoreItemFuzzy } from 'vscode/vscode/vs/base/common/fuzzyScorer';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { extractRangeFromFilter, getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
-import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { ISearchService } from 'vscode/vscode/vs/workbench/services/search/common/search.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { untildify } from 'vscode/vscode/vs/base/common/labels';
-import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
+import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { toLocalResource, basenameOrAuthority, dirname } from 'vscode/vscode/vs/base/common/resources';
-import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { Disposable, DisposableStore, MutableDisposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { getIconClasses } from 'vscode/vscode/vs/editor/common/services/getIconClasses';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { isEditorInput, EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
-import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
 import { top } from 'vscode/vscode/vs/base/common/arrays';
 import { FileQueryCacheState } from '../common/cacheState.js';
-import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
+import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { IFilesConfigurationService } from 'vscode/vscode/vs/workbench/services/filesConfiguration/common/filesConfigurationService.service';
 import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
 import { DefaultQuickAccessFilterValue, Extensions } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
@@ -40,14 +42,14 @@ import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resol
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
 import { Lazy } from 'vscode/vscode/vs/base/common/lazy';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { ASK_QUICK_QUESTION_ACTION_ID } from 'vscode/vscode/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions';
-import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IQuickChatService } from 'vscode/vscode/vs/workbench/contrib/chat/browser/chat.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 
 var AnythingQuickAccessProvider_1;
 function isEditorSymbolQuickPickItem(pick) {

package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.js

@@ -7,9 +7,9 @@ import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { ContextScopedHistoryInputBox } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
 import { showHistoryKeybindingHint } from 'vscode/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 

package/vscode/src/vs/workbench/contrib/search/browser/quickTextSearch/textSearchQuickAccess.js

@@ -5,24 +5,25 @@ import { ResourceSet } from 'vscode/vscode/vs/base/common/map';
 import { basenameOrAuthority, dirname } from 'vscode/vscode/vs/base/common/resources';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
 import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platform/quickinput/browser/pickerQuickAccess';
 import { DefaultQuickAccessFilterValue } from 'vscode/vscode/vs/platform/quickinput/common/quickAccess';
 import { QuickInputHideReason } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { searchDetailsIcon, searchOpenInFileIcon, searchActivityBarIcon } from '../searchIcons.js';
 import { SearchModel, SearchModelLocation, searchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { getEditorSelectionFromMatch } from '../searchView.js';
 import { getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { Event } from 'vscode/vscode/vs/base/common/event';
 import { PickerEditorState } from 'vscode/vscode/vs/workbench/browser/quickaccess';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { Sequencer } from 'vscode/vscode/vs/base/common/async';
 
 const TEXT_SEARCH_QUICK_ACCESS_PREFIX = '%';

package/vscode/src/vs/workbench/contrib/search/browser/replaceService.js

@@ -2,24 +2,25 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { ISearchViewModelWorkbenchService, Match, MatchInNotebook, FileMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { Match, MatchInNotebook, FileMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel.service';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { createTextBufferFactoryFromSnapshot } from 'vscode/vscode/vs/editor/common/model/textModel';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 import { ResourceTextEdit, IBulkEditService } from 'vscode/vscode/vs/editor/browser/services/bulkEditService';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { dirname } from 'vscode/vscode/vs/base/common/resources';
 import { Promises } from 'vscode/vscode/vs/base/common/async';
 import { SaveSourceRegistry } from 'vscode/vscode/vs/workbench/common/editor';
 import { CellUri } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
-import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService';
+import { INotebookEditorModelResolverService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorModelResolverService.service';
 
 var ReplaceService_1;
 const REPLACE_PREVIEW = 'replacePreview';

package/vscode/src/vs/workbench/contrib/search/browser/search.contribution.js

@@ -18,7 +18,7 @@ import { searchViewIcon } from './searchIcons.js';
 import { SearchView } from './searchView.js';
 import { registerContributions as registerContributions$1 } from './searchWidget.js';
 import { SymbolsQuickAccessProvider } from './symbolsQuickAccess.js';
-import 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
+import '../common/searchHistoryService.js';
 import 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { VIEWLET_ID, VIEW_ID, SEARCH_EXCLUDE_CONFIG } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsCopy.js

@@ -1,7 +1,7 @@
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { FileMatch, FolderMatchWithResource, Match, FolderMatch, searchMatchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsNav.js

@@ -1,13 +1,14 @@
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { InSearchEditor } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { SearchEditorInput } from '../../searchEditor/browser/searchEditorInput.js';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { ToggleCaseSensitiveKeybinding, ToggleWholeWordKeybinding, ToggleRegexKeybinding, TogglePreserveCaseKeybinding } from 'vscode/vscode/vs/editor/contrib/find/browser/findModel';

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsRemoveReplace.js

@@ -1,13 +1,13 @@
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { searchRemoveIcon, searchReplaceIcon } from './searchIcons.js';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
-import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
-import { arrayContainsElementOrParent, SearchResult, Match, MatchInNotebook, FileMatch, FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
+import { SearchResult, arrayContainsElementOrParent, Match, MatchInNotebook, FileMatch, FolderMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { category, getSearchView, getElementsToOperateOn, shouldRefocus } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsSymbol.js

@@ -1,6 +1,6 @@
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 
 registerAction2(class ShowAllSymbolsAction extends Action2 {
     static { this.ID = 'workbench.action.showAllSymbols'; }

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTextQuickAccess.js

@@ -1,10 +1,10 @@
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { category } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput';
+import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
 import { TEXT_SEARCH_QUICK_ACCESS_PREFIX } from './quickTextSearch/textSearchQuickAccess.js';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { getSelectionTextFromEditor } from './searchView.js';
 
 registerAction2(class TextSearchQuickAccessAction extends Action2 {

package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTopBar.js

@@ -1,9 +1,9 @@
 import { localize2WithPath } from 'vscode/vscode/vs/nls';
 import { WorkbenchListFocusContextKey } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { searchStopIcon, searchRefreshIcon, searchCollapseAllIcon, searchExpandAllIcon, searchClearIcon, searchShowAsList, searchShowAsTree } from './searchIcons.js';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
-import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
+import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService.service';
 import { FolderMatchWorkspaceRoot, Match, FolderMatch, FolderMatchNoRoot, SearchResult, FileMatch } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';

package/vscode/src/vs/workbench/contrib/search/browser/searchResultsView.js

@@ -4,16 +4,16 @@ import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBad
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { dirname } from 'vscode/vscode/vs/base/common/path';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { FolderMatchWorkspaceRoot, FolderMatchNoRoot, MatchInNotebook, FolderMatch, FileMatch, Match } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { FolderMatch, FileMatch, Match, FolderMatchWorkspaceRoot, FolderMatchNoRoot, MatchInNotebook } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
 import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';

package/vscode/src/vs/workbench/contrib/search/browser/searchView.js

@@ -20,33 +20,34 @@ import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
 import { CommonFindController } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
 import { MultiCursorSelectionController } from 'vscode/vscode/vs/editor/contrib/multicursor/browser/multicursor';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
+import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextViewService, IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextViewService, IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { WorkbenchCompressibleObjectTree, getSelectionKeyboardEvent } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
-import { withSelection, IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { withSelection } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { defaultInputBoxStyles, defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { OpenFileFolderAction, OpenFolderAction } from 'vscode/vscode/vs/workbench/browser/actions/workspaceActions';
 import { ResourceListDnDHandler } from 'vscode/vscode/vs/workbench/browser/dnd';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
-import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
+import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views.service';
 import { NotebookEditor } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/notebookEditor';
 import { IncludePatternInputWidget, ExcludePatternInputWidget } from './patternInputWidget.js';
 import { appendKeyBindingLabel } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
@@ -55,23 +56,26 @@ import { renderSearchMessage } from './searchMessage.js';
 import { SearchAccessibilityProvider, SearchDelegate, FolderMatchRenderer, FileMatchRenderer, MatchRenderer } from './searchResultsView.js';
 import { SearchWidget } from './searchWidget.js';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
-import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace';
+import { IReplaceService } from 'vscode/vscode/vs/workbench/contrib/search/browser/replace.service';
 import { SearchStateKey, SearchUIState, getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
-import { SearchHistoryService, ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService';
-import { SearchModelLocation, searchMatchComparer, FileMatch, SearchResult, FolderMatch, Match, FolderMatchWithResource, MatchInNotebook, ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { SearchHistoryService } from '../common/searchHistoryService.js';
+import { ISearchHistoryService } from 'vscode/vscode/vs/workbench/contrib/search/common/searchHistoryService.service';
+import { SearchModelLocation, searchMatchComparer, FileMatch, SearchResult, FolderMatch, Match, FolderMatchWithResource, MatchInNotebook } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
+import { ISearchViewModelWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel.service';
 import { createEditorFromSearchResult } from '../../searchEditor/browser/searchEditorActions.js';
-import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences';
+import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IPreferencesService } from 'vscode/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { QueryBuilder } from 'vscode/vscode/vs/workbench/services/search/common/queryBuilder';
 import 'vscode/vscode/vs/workbench/services/search/common/search';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { AccessibilitySignal, IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { INotebookService } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookService.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { AccessibilitySignal } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+import { IAccessibilitySignalService } from 'vscode/vscode/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service';
 import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
 import { TextSearchCompleteMessageType } from 'vscode/vscode/vs/workbench/services/search/common/searchExtTypes';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var SearchView_1;
 const $ = $$1;

package/vscode/src/vs/workbench/contrib/search/browser/searchWidget.js

@@ -9,27 +9,28 @@ import { Delayer } from 'vscode/vscode/vs/base/common/async';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { CONTEXT_FIND_WIDGET_NOT_VISIBLE } from 'vscode/vscode/vs/editor/contrib/find/browser/findModel';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextViewService, IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
-import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextViewService, IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding.service';
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { ContextScopedReplaceInput } from 'vscode/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
 import { appendKeyBindingLabel, isSearchViewFocused, getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
-import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility';
+import { IAccessibilityService } from 'vscode/vscode/vs/platform/accessibility/common/accessibility.service';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { Toggle } from 'vscode/vscode/vs/base/browser/ui/toggle/toggle';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { searchReplaceAllIcon, searchHideReplaceIcon, searchShowContextIcon, searchShowReplaceIcon } from './searchIcons.js';
 import { ToggleSearchEditorContextLinesCommandId } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { showHistoryKeybindingHint } from 'vscode/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
 import { defaultToggleStyles, defaultInputBoxStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 import { NotebookFindFilters } from 'vscode/vscode/vs/workbench/contrib/notebook/browser/contrib/find/findFilters';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { NotebookEditorInput } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { SearchFindInput } from './searchFindInput.js';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';

package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js

@@ -4,12 +4,13 @@ import { PickerQuickAccessProvider, TriggerAction } from 'vscode/vscode/vs/platf
 import { ThrottledDelayer } from 'vscode/vscode/vs/base/common/async';
 import { getWorkspaceSymbols } from 'vscode/vscode/vs/workbench/contrib/search/common/search';
 import { SymbolKinds } from 'vscode/vscode/vs/editor/common/languages';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { SIDE_GROUP, ACTIVE_GROUP, IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { ICodeEditorService } from 'vscode/vscode/vs/editor/browser/services/codeEditorService';
 import { getSelectionSearchString } from 'vscode/vscode/vs/editor/contrib/find/browser/findController';
 import { prepareQuery, pieceToQuery, scoreFuzzy2 } from 'vscode/vscode/vs/base/common/fuzzyScorer';

package/vscode/src/vs/workbench/contrib/search/common/searchHistoryService.js

@@ -0,0 +1,44 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { isEmptyObject } from 'vscode/vscode/vs/base/common/types';
+
+var SearchHistoryService_1;
+let SearchHistoryService = class SearchHistoryService {
+    static { SearchHistoryService_1 = this; }
+    static { this.SEARCH_HISTORY_KEY = 'workbench.search.history'; }
+    constructor(storageService) {
+        this.storageService = storageService;
+        this._onDidClearHistory = ( new Emitter());
+        this.onDidClearHistory = this._onDidClearHistory.event;
+    }
+    clearHistory() {
+        this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
+        this._onDidClearHistory.fire();
+    }
+    load() {
+        let result;
+        const raw = this.storageService.get(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
+        if (raw) {
+            try {
+                result = JSON.parse(raw);
+            }
+            catch (e) {
+            }
+        }
+        return result || {};
+    }
+    save(history) {
+        if (isEmptyObject(history)) {
+            this.storageService.remove(SearchHistoryService_1.SEARCH_HISTORY_KEY, 1 );
+        }
+        else {
+            this.storageService.store(SearchHistoryService_1.SEARCH_HISTORY_KEY, JSON.stringify(history), 1 , 0 );
+        }
+    }
+};
+SearchHistoryService = SearchHistoryService_1 = ( __decorate([
+    ( __param(0, IStorageService))
+], SearchHistoryService));
+
+export { SearchHistoryService };

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.contribution.js

@@ -5,7 +5,8 @@ import { ToggleCaseSensitiveKeybinding, ToggleWholeWordKeybinding, ToggleRegexKe
 import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { registerAction2, Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IContextKeyService, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
@@ -13,7 +14,7 @@ import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor'
 import { registerWorkbenchContribution2 } from 'vscode/vscode/vs/workbench/common/contributions';
 import { EditorExtensions, DEFAULT_EDITOR_ASSOCIATION } from 'vscode/vscode/vs/workbench/common/editor';
 import { ActiveEditorContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { searchRefreshIcon, searchNewEditorIcon } from '../../search/browser/searchIcons.js';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
@@ -21,10 +22,11 @@ import { InSearchEditor, OpenNewEditorCommandId, OpenEditorCommandId, SearchEdit
 import { SearchEditor } from './searchEditor.js';
 import { openNewSearchEditor, createEditorFromSearchResult, toggleSearchEditorCaseSensitiveCommand, toggleSearchEditorWholeWordCommand, toggleSearchEditorRegexCommand, toggleSearchEditorContextLinesCommand, modifySearchEditorContextLinesCommand, selectAllSearchEditorMatchesCommand, openSearchEditor } from './searchEditorActions.js';
 import { SearchEditorInput, SEARCH_EDITOR_EXT, getOrMakeSearchEditorInput } from './searchEditorInput.js';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { VIEW_ID } from 'vscode/vscode/vs/workbench/services/search/common/search';
-import { RegisteredEditorPriority, IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
-import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService';
+import { RegisteredEditorPriority } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService';
+import { IEditorResolverService } from 'vscode/vscode/vs/workbench/services/editor/common/editorResolverService.service';
+import { IWorkingCopyEditorService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyEditorService.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditor.js

@@ -13,16 +13,17 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ITextResourceConfigurationService } from 'vscode/vscode/vs/editor/common/services/textResourceConfiguration';
 import { ReferencesController } from 'vscode/vscode/vs/editor/contrib/gotoSymbol/browser/peek/referencesController';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
-import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { LongRunningOperation, IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { LongRunningOperation } from 'vscode/vscode/vs/platform/progress/common/progress';
+import { IEditorProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { registerColor } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
 import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
@@ -34,9 +35,9 @@ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
-import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { AbstractTextCodeEditor } from 'vscode/vscode/vs/workbench/browser/parts/editor/textCodeEditor';
 import { IncludePatternInputWidget, ExcludePatternInputWidget } from '../../search/browser/patternInputWidget.js';
 import { SearchWidget } from '../../search/browser/searchWidget.js';
@@ -45,17 +46,17 @@ import { getOutOfWorkspaceEditorResources } from 'vscode/vscode/vs/workbench/con
 import { SearchModel } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
 import { SearchEditorID, InSearchEditor, SearchEditorInputTypeId } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { serializeSearchResultForEditor } from './searchEditorSerialization.js';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { searchDetailsIcon } from '../../search/browser/searchIcons.js';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { renderSearchMessage } from '../../search/browser/searchMessage.js';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { UnusualLineTerminatorsDetector } from 'vscode/vscode/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators';
 import { getInputBoxStyle, defaultToggleStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { SearchContext } from 'vscode/vscode/vs/workbench/contrib/search/common/constants';
 import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
 import { getDefaultHoverDelegate } from 'vscode/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorActions.js

@@ -1,19 +1,20 @@
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import './media/searchEditor.css.js';
 import { isDiffEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
-import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
+import { IViewsService } from 'vscode/vscode/vs/workbench/services/views/common/viewsService.service';
 import { getSearchView } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchActionsBase';
 import { SearchEditorInput, getOrMakeSearchEditorInput } from './searchEditorInput.js';
 import { serializeSearchResultForEditor } from './searchEditorSerialization.js';
-import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService';
-import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history';
+import { IConfigurationResolverService } from 'vscode/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
+import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { SIDE_GROUP, ACTIVE_GROUP } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IHistoryService } from 'vscode/vscode/vs/workbench/services/history/common/history.service';
 
 const toggleSearchEditorCaseSensitiveCommand = (accessor) => {
     const editorService = accessor.get(IEditorService);

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.js

@@ -6,24 +6,23 @@ import { isEqual, extname, joinPath } from 'vscode/vscode/vs/base/common/resourc
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import '../../../../../../../override/vs/platform/dialogs/common/dialogs.js';
+import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
 import { Memento } from 'vscode/vscode/vs/workbench/common/memento';
 import { SearchEditorInputTypeId, SearchEditorScheme, SearchEditorWorkingCopyTypeId, SearchEditorFindMatchClass } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';
 import { SearchEditorModel, searchEditorModelFactory } from './searchEditorModel.js';
 import { serializeSearchConfiguration, parseSavedSearchEditor, defaultSearchConfig } from './searchEditorSerialization.js';
-import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
-import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IPathService } from 'vscode/vscode/vs/workbench/services/path/common/pathService.service';
+import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
+import { IWorkingCopyService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { bufferToReadable, VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
-import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
 
 var SearchEditorInput_1;
 const SEARCH_EDITOR_EXT = '.code-search';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorModel.js

@@ -2,7 +2,7 @@ import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { parseSavedSearchEditor, parseSerializedSearchEditor } from './searchEditorSerialization.js';
-import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup';
+import { IWorkingCopyBackupService } from 'vscode/vscode/vs/workbench/services/workingCopy/common/workingCopyBackup.service';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { createTextBufferFactoryFromStream } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { SearchEditorWorkingCopyTypeId } from 'vscode/vscode/vs/workbench/contrib/searchEditor/browser/constants';

package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.js

@@ -3,7 +3,7 @@ import './media/searchEditor.css.js';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { searchMatchComparer } from 'vscode/vscode/vs/workbench/contrib/search/browser/searchModel';
-import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles';
+import { ITextFileService } from 'vscode/vscode/vs/workbench/services/textfile/common/textfiles.service';
 
 const lineDelimiter = '\n';
 const translateRangeLines = (n) => (range) => ( new Range(

package/vscode/src/vs/workbench/services/search/browser/searchService.js

@@ -1,14 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import 'vscode/vscode/vs/workbench/services/search/common/search';
 import { SearchService } from '../common/searchService.js';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { SimpleWorkerClient, logOnceWebWorkerWarning } from 'vscode/vscode/vs/base/common/worker/simpleWorker';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 import { DefaultWorkerFactory } from 'vscode/vscode/vs/base/browser/defaultWorkerFactory';

package/vscode/src/vs/workbench/services/search/common/searchService.js

@@ -3,19 +3,19 @@ import { coalesce, flatten, uniqueFilter } from 'vscode/vscode/vs/base/common/ar
 import { raceCancellationError, DeferredPromise } from 'vscode/vscode/vs/base/common/async';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { ResourceMap, ResourceSet } from 'vscode/vscode/vs/base/common/map';
+import { ResourceSet, ResourceMap } from 'vscode/vscode/vs/base/common/map';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { StopWatch } from 'vscode/vscode/vs/base/common/stopwatch';
 import { isNumber } from 'vscode/vscode/vs/base/common/types';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
-import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, FileMatch, pathIncludedInQuery, isFileMatch, isProgressMessage } from 'vscode/vscode/vs/workbench/services/search/common/search';
+import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { isFileMatch, isProgressMessage, deserializeSearchError, SearchErrorCode, SEARCH_RESULT_LANGUAGE_ID, FileMatch, pathIncludedInQuery } from 'vscode/vscode/vs/workbench/services/search/common/search';
 import { editorMatchesToTextSearchResults, getTextSearchMatchWithModelContext } from 'vscode/vscode/vs/workbench/services/search/common/searchHelpers';
 
 let SearchService = class SearchService extends Disposable {

package/override/vs/platform/dialogs/common/dialogs.js

@@ -1,10 +0,0 @@
-export { AbstractDialogHandler, IDialogService, IFileDialogService, getFileNamesMessage } from 'vscode/vscode/vs/platform/dialogs/common/dialogs';
-
-var ConfirmResult;
-( (function(ConfirmResult) {
-    ConfirmResult[ConfirmResult["SAVE"] = 0] = "SAVE";
-    ConfirmResult[ConfirmResult["DONT_SAVE"] = 1] = "DONT_SAVE";
-    ConfirmResult[ConfirmResult["CANCEL"] = 2] = "CANCEL";
-})(ConfirmResult || (ConfirmResult = {})));
-
-export { ConfirmResult };