@codingame/monaco-vscode-api 4.4.0 → 4.5.0-improve-code-splitting.1

package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js

@@ -6,11 +6,12 @@ import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.j
 import { Schemas } from '../../../../base/common/network.js';
 import { filter } from '../../../../base/common/objects.js';
 import { assertType } from '../../../../base/common/types.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { EditorModel } from '../../../common/editor/editorModel.js';
 import { NotebookCellsChangeType, NotebookSetting } from './notebookCommon.js';
-import { SimpleNotebookProviderInfo, INotebookService } from './notebookService.js';
-import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.js';
+import { SimpleNotebookProviderInfo } from './notebookService.js';
+import { INotebookService } from './notebookService.service.js';
+import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 var SimpleNotebookEditorModel_1;
 let SimpleNotebookEditorModel = SimpleNotebookEditorModel_1 = class SimpleNotebookEditorModel extends EditorModel {
     constructor(resource, _hasAssociatedFilePath, viewType, _workingCopyManager, scratchpad, _filesConfigurationService) {

package/vscode/src/vs/workbench/contrib/notebook/common/notebookExecutionService.js

@@ -1,9 +1,7 @@
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 var CellExecutionUpdateType;
 ( (function(CellExecutionUpdateType) {
     CellExecutionUpdateType[CellExecutionUpdateType["Output"] = 1] = "Output";
     CellExecutionUpdateType[CellExecutionUpdateType["OutputItems"] = 2] = "OutputItems";
     CellExecutionUpdateType[CellExecutionUpdateType["ExecutionState"] = 3] = "ExecutionState";
 })(CellExecutionUpdateType || (CellExecutionUpdateType = {})));
-const INotebookExecutionService = ( createDecorator('INotebookExecutionService'));
-export { CellExecutionUpdateType, INotebookExecutionService };
+export { CellExecutionUpdateType };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookExecutionService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const INotebookExecutionService = ( createDecorator('INotebookExecutionService'));
+export { INotebookExecutionService };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookExecutionStateService.js

@@ -1,8 +1,6 @@
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 var NotebookExecutionType;
 ( (function(NotebookExecutionType) {
     NotebookExecutionType[NotebookExecutionType["cell"] = 0] = "cell";
     NotebookExecutionType[NotebookExecutionType["notebook"] = 1] = "notebook";
 })(NotebookExecutionType || (NotebookExecutionType = {})));
-const INotebookExecutionStateService = ( createDecorator('INotebookExecutionStateService'));
-export { INotebookExecutionStateService, NotebookExecutionType };
+export { NotebookExecutionType };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookExecutionStateService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const INotebookExecutionStateService = ( createDecorator('INotebookExecutionStateService'));
+export { INotebookExecutionStateService };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookKernelService.js

@@ -1,5 +1,2 @@
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const variablePageSize = 100;
-const INotebookKernelService = ( createDecorator('INotebookKernelService'));
-const INotebookKernelHistoryService = ( createDecorator('INotebookKernelHistoryService'));
-export { INotebookKernelHistoryService, INotebookKernelService, variablePageSize };
+export { variablePageSize };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookKernelService.service.js

@@ -0,0 +1,4 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const INotebookKernelService = ( createDecorator('INotebookKernelService'));
+const INotebookKernelHistoryService = ( createDecorator('INotebookKernelHistoryService'));
+export { INotebookKernelHistoryService, INotebookKernelService };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookService.js

@@ -1,5 +1,3 @@
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-const INotebookService = ( createDecorator('notebookService'));
 class SimpleNotebookProviderInfo {
     constructor(viewType, serializer, extensionData) {
         this.viewType = viewType;
@@ -7,4 +5,4 @@ class SimpleNotebookProviderInfo {
         this.extensionData = extensionData;
     }
 }
-export { INotebookService, SimpleNotebookProviderInfo };
+export { SimpleNotebookProviderInfo };

package/vscode/src/vs/workbench/contrib/notebook/common/notebookService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const INotebookService = ( createDecorator('notebookService'));
+export { INotebookService };

package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookWorkerService.js

@@ -1,4 +1,2 @@
-import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
 const ID_NOTEBOOK_EDITOR_WORKER_SERVICE = 'notebookEditorWorkerService';
-const INotebookEditorWorkerService = ( createDecorator(ID_NOTEBOOK_EDITOR_WORKER_SERVICE));
-export { ID_NOTEBOOK_EDITOR_WORKER_SERVICE, INotebookEditorWorkerService };
+export { ID_NOTEBOOK_EDITOR_WORKER_SERVICE };

package/vscode/src/vs/workbench/contrib/notebook/common/services/notebookWorkerService.service.js

@@ -0,0 +1,4 @@
+import { createDecorator } from '../../../../../platform/instantiation/common/instantiation.js';
+import { ID_NOTEBOOK_EDITOR_WORKER_SERVICE } from './notebookWorkerService.js';
+const INotebookEditorWorkerService = ( createDecorator(ID_NOTEBOOK_EDITOR_WORKER_SERVICE));
+export { INotebookEditorWorkerService };

package/vscode/src/vs/workbench/contrib/output/common/outputChannelModelService.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IOutputChannelModelService = ( createDecorator('outputChannelModelService'));
+export { IOutputChannelModelService };

package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js

@@ -10,8 +10,8 @@ import { append, $, clearNode, Dimension, addDisposableListener, EventType } fro
 import { alert } from '../../../../base/browser/ui/aria/aria.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
 import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -26,7 +26,7 @@ import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { SearchWidget } from './preferencesWidgets.js';
 import { Promises, timeout } from '../../../../base/common/async.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { defaultInputBoxStyles, defaultKeybindingLabelStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 var DefineKeybindingWidget_1, DefineKeybindingOverlayWidget_1;
 let KeybindingsSearchWidget = class KeybindingsSearchWidget extends SearchWidget {

package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js

@@ -14,11 +14,11 @@ import { URI } from '../../../../base/common/uri.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IContextMenuService, IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { ILabelService } from '../../../../platform/label/common/label.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { ILabelService } from '../../../../platform/label/common/label.service.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -31,9 +31,10 @@ import { badgeBackground, badgeForeground } from '../../../../platform/theme/com
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
-import { isWorkspaceFolder, IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { isWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { settingsScopeDropDownIcon, settingsEditIcon } from './preferencesIcons.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { setupCustomHover } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';

package/vscode/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.js

@@ -6,15 +6,16 @@ import { URI } from '../../../../base/common/uri.js';
 import { knownAcronyms, knownTermMappings, tocData } from './settingsLayout.js';
 import { MODIFIED_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, POLICY_SETTING_TAG, compareTwoNullableNumbers } from '../common/preferences.js';
 import { SettingValueType, SettingMatchType } from '../../../services/preferences/common/preferences.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
-import { APPLICATION_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, REMOTE_MACHINE_SCOPES, LOCAL_MACHINE_SCOPES, IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
+import { APPLICATION_SCOPES, FOLDER_SCOPES, WORKSPACE_SCOPES, REMOTE_MACHINE_SCOPES, LOCAL_MACHINE_SCOPES } from '../../../services/configuration/common/configuration.js';
+import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.service.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { EditPresentationTypes, Extensions } from '../../../../platform/configuration/common/configurationRegistry.js';
 import { ILanguageService } from '../../../../editor/common/languages/language.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
-import { IProductService } from '../../../../platform/product/common/productService.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.service.js';
+import { IProductService } from '../../../../platform/product/common/productService.service.js';
 class SettingsTreeElement extends Disposable {
     constructor(_id) {
         super();

package/vscode/src/vs/workbench/contrib/preferences/common/preferences.d.ts

@@ -1,15 +1,8 @@
-import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { ISettingsEditorModel, ISearchResult } from '../../../services/preferences/common/preferences.js';
 
-declare const IPreferencesSearchService: ServiceIdentifier<IPreferencesSearchService>;
-interface IPreferencesSearchService {
-    readonly _serviceBrand: undefined;
-    getLocalSearchProvider(filter: string): ISearchProvider;
-    getRemoteSearchProvider(filter: string, newExtensionsOnly?: boolean): ISearchProvider | undefined;
-}
 interface ISearchProvider {
     searchModel(preferencesModel: ISettingsEditorModel, token?: CancellationToken): Promise<ISearchResult | null>;
 }
 
-export { IPreferencesSearchService, type ISearchProvider };
+export type { ISearchProvider };

package/vscode/src/vs/workbench/contrib/preferences/common/preferences.js

@@ -1,7 +1,5 @@
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-const IPreferencesSearchService = ( createDecorator('preferencesSearchService'));
 const SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS = 'settings.action.clearSearchResults';
 const SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU = 'settings.action.showContextMenu';
 const SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS = 'settings.action.suggestFilters';
@@ -99,4 +97,4 @@ function compareTwoNullableNumbers(a, b) {
         return 0;
     }
 }
-export { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, ID_SETTING_TAG, IPreferencesSearchService, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, KEYBOARD_LAYOUT_OPEN_PICKER, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, compareTwoNullableNumbers, getExperimentalExtensionToggleData };
+export { CONTEXT_KEYBINDINGS_EDITOR, CONTEXT_KEYBINDINGS_SEARCH_FOCUS, CONTEXT_KEYBINDING_FOCUS, CONTEXT_SETTINGS_EDITOR, CONTEXT_SETTINGS_JSON_EDITOR, CONTEXT_SETTINGS_ROW_FOCUS, CONTEXT_SETTINGS_SEARCH_FOCUS, CONTEXT_TOC_ROW_FOCUS, CONTEXT_WHEN_FOCUS, EXTENSION_SETTING_TAG, FEATURE_SETTING_TAG, GENERAL_TAG_SETTING_TAG, ID_SETTING_TAG, KEYBINDINGS_EDITOR_COMMAND_ACCEPT_WHEN, KEYBINDINGS_EDITOR_COMMAND_ADD, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_HISTORY, KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, KEYBINDINGS_EDITOR_COMMAND_COPY, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND, KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND_TITLE, KEYBINDINGS_EDITOR_COMMAND_DEFINE, KEYBINDINGS_EDITOR_COMMAND_DEFINE_WHEN, KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS, KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS, KEYBINDINGS_EDITOR_COMMAND_REJECT_WHEN, KEYBINDINGS_EDITOR_COMMAND_REMOVE, KEYBINDINGS_EDITOR_COMMAND_RESET, KEYBINDINGS_EDITOR_COMMAND_SEARCH, KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR, KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE, KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_EXTENSION_KEYBINDINGS, KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS, KEYBOARD_LAYOUT_OPEN_PICKER, LANGUAGE_SETTING_TAG, MODIFIED_SETTING_TAG, POLICY_SETTING_TAG, REQUIRE_TRUSTED_WORKSPACE_SETTING_TAG, SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS, SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU, SETTINGS_EDITOR_COMMAND_SUGGEST_FILTERS, WORKSPACE_TRUST_SETTING_TAG, compareTwoNullableNumbers, getExperimentalExtensionToggleData };

package/vscode/src/vs/workbench/contrib/preferences/common/preferences.service.d.ts

@@ -0,0 +1,11 @@
+import { ServiceIdentifier } from '../../../../platform/instantiation/common/instantiation.js';
+import { ISearchProvider } from './preferences.js';
+
+declare const IPreferencesSearchService: ServiceIdentifier<IPreferencesSearchService>;
+interface IPreferencesSearchService {
+    readonly _serviceBrand: undefined;
+    getLocalSearchProvider(filter: string): ISearchProvider;
+    getRemoteSearchProvider(filter: string, newExtensionsOnly?: boolean): ISearchProvider | undefined;
+}
+
+export { IPreferencesSearchService };

package/vscode/src/vs/workbench/contrib/preferences/common/preferences.service.js

@@ -0,0 +1,3 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const IPreferencesSearchService = ( createDecorator('preferencesSearchService'));
+export { IPreferencesSearchService };

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -2,35 +2,38 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Extensions } from '../../../common/views.js';
-import { TUNNEL_VIEW_ID, TUNNEL_VIEW_CONTAINER_ID, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_FORWARD_SETTING, IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.js';
+import { TUNNEL_VIEW_ID, TUNNEL_VIEW_CONTAINER_ID, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_FORWARD_SETTING } from '../../../services/remote/common/remoteExplorerService.js';
+import { IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.service.js';
 import { OnPortForward, mapHasAddressLocalhostOrAllInterfaces, TunnelCloseReason, AutoTunnelSource, forwardedPortsViewEnabled, TunnelSource, makeAddress } from '../../../services/remote/common/tunnelModel.js';
 import { OpenPortInPreviewAction, OpenPortInBrowserAction, openPreviewEnabledContext, ForwardPortAction, TunnelPanel, TunnelPanelDescriptor, TunnelViewModel } from './tunnelView.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.js';
+import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.service.js';
 import { UrlFinder } from './urlFinder.js';
 import Severity$1 from '../../../../base/common/severity.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { ITerminalService } from '../../terminal/browser/terminal.js';
-import { IDebugService } from '../../debug/common/debug.js';
-import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { ITerminalService } from '../../terminal/browser/terminal.service.js';
+import { IDebugService } from '../../debug/common/debug.service.js';
+import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.service.js';
 import { isWeb } from '../../../../base/common/platform.js';
-import { TunnelPrivacyId, ITunnelService } from '../../../../platform/tunnel/common/tunnel.js';
+import { TunnelPrivacyId } from '../../../../platform/tunnel/common/tunnel.js';
+import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { ViewPaneContainer } from '../../../browser/parts/views/viewPaneContainer.js';
-import { NumberBadge, IActivityService } from '../../../services/activity/common/activity.js';
+import { NumberBadge } from '../../../services/activity/common/activity.js';
+import { IActivityService } from '../../../services/activity/common/activity.service.js';
 import { portsViewIcon } from './remoteIcons.js';
 import { Event } from '../../../../base/common/event.js';
-import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.js';
-import { IHostService } from '../../../services/host/browser/host.js';
+import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.service.js';
+import { IHostService } from '../../../services/host/browser/host.service.js';
 import { Extensions as Extensions$1 } from '../../../../platform/configuration/common/configurationRegistry.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.service.js';
 import { Action } from '../../../../base/common/actions.js';
-import { IPreferencesService } from '../../../services/preferences/common/preferences.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
+import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 const VIEWLET_ID = 'workbench.view.remote';
 let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     constructor(contextKeyService, environmentService, remoteExplorerService, tunnelService, activityService, statusbarService) {

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js

@@ -2,39 +2,45 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import './media/tunnelView.css.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { clearNode, append, $, addStandardDisposableListener, EventType, addDisposableListener } from '../../../../base/browser/dom.js';
-import { IViewDescriptorService } from '../../../common/views.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IContextViewService, IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { ContextKeyExpr, RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { IViewsService } from '../../../services/views/common/viewsService.service.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IContextViewService, IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
-import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
 import { Event } from '../../../../base/common/event.js';
 import { DisposableStore, toDisposable, Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { IconLabel } from '../../../../base/browser/ui/iconLabel/iconLabel.js';
 import { ActionRunner } from '../../../../base/common/actions.js';
-import { MenuId, MenuRegistry, IMenuService } from '../../../../platform/actions/common/actions.js';
+import { MenuId, MenuRegistry } from '../../../../platform/actions/common/actions.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { createAndFillInActionBarActions, createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { TUNNEL_VIEW_ID, TunnelType, IRemoteExplorerService, TunnelEditId } from '../../../services/remote/common/remoteExplorerService.js';
-import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
-import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
+import { TUNNEL_VIEW_ID, TunnelType, TunnelEditId } from '../../../services/remote/common/remoteExplorerService.js';
+import { IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.service.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
+import '../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ViewPane } from '../../../browser/parts/views/viewPane.js';
 import { URI } from '../../../../base/common/uri.js';
-import { TunnelProtocol, TunnelPrivacyId, ITunnelService, isLocalhost, isAllInterfaces } from '../../../../platform/tunnel/common/tunnel.js';
+import { TunnelProtocol, TunnelPrivacyId, isLocalhost, isAllInterfaces } from '../../../../platform/tunnel/common/tunnel.js';
+import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { labelPortIcon, forwardPortIcon, stopForwardIcon, copyAddressIcon, openBrowserIcon, openPreviewIcon, privatePortIcon, forwardedPortWithProcessIcon, forwardedPortWithoutProcessIcon, portsViewIcon } from './remoteIcons.js';
-import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.js';
+import { IExternalUriOpenerService } from '../../externalUriOpener/common/externalUriOpenerService.service.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
 import { WorkbenchTable } from '../../../../platform/list/browser/listService.js';
@@ -56,6 +62,7 @@ import { Codicon } from '../../../../base/common/codicons.js';
 import { defaultButtonStyles, defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
 import { makeAddress, forwardedPortsViewEnabled, parseAddress, TunnelCloseReason, mapHasAddressLocalhostOrAllInterfaces, TunnelSource } from '../../../services/remote/common/tunnelModel.js';
 import { getDefaultHoverDelegate } from '../../../../base/browser/ui/hover/hoverDelegateFactory.js';
+import Severity$1 from '../../../../base/common/severity.js';
 var TunnelPanel_1;
 const openPreviewEnabledContext = ( new RawContextKey('openPreviewEnabled', false));
 class TunnelTreeVirtualDelegate {
@@ -524,7 +531,7 @@ let ActionBarRenderer = class ActionBarRenderer extends Disposable {
                     return {
                         content: message.content,
                         formatContent: true,
-                        type: message.severity === Severity.Error ? 3  : 1
+                        type: message.severity === Severity$1.Error ? 3  : 1
                     };
                 }
             },
@@ -1220,16 +1227,16 @@ var ForwardPortAction;
     function validateInput(remoteExplorerService, tunnelService, value, canElevate) {
         const parsed = parseAddress(value);
         if (!parsed) {
-            return { content: invalidPortString, severity: Severity.Error };
+            return { content: invalidPortString, severity: Severity$1.Error };
         }
         else if (parsed.port >= maxPortNumber) {
-            return { content: invalidPortNumberString, severity: Severity.Error };
+            return { content: invalidPortNumberString, severity: Severity$1.Error };
         }
         else if (canElevate && tunnelService.isPortPrivileged(parsed.port)) {
-            return { content: requiresSudoString, severity: Severity.Info };
+            return { content: requiresSudoString, severity: Severity$1.Info };
         }
         else if (mapHasAddressLocalhostOrAllInterfaces(remoteExplorerService.tunnelModel.forwarded, parsed.host, parsed.port)) {
-            return { content: alreadyForwarded, severity: Severity.Error };
+            return { content: alreadyForwarded, severity: Severity$1.Error };
         }
         return null;
     }
@@ -1592,13 +1599,13 @@ var ChangeLocalPortAction;
                 'vs/workbench/contrib/remote/browser/tunnelView',
                 'remote.tunnelsView.portShouldBeNumber',
                 "Local port should be a number."
-            )), severity: Severity.Error };
+            )), severity: Severity$1.Error };
         }
         else if (Number(value) >= maxPortNumber) {
-            return { content: invalidPortNumberString, severity: Severity.Error };
+            return { content: invalidPortNumberString, severity: Severity$1.Error };
         }
         else if (canElevate && tunnelService.isPortPrivileged(Number(value))) {
-            return { content: requiresSudoString, severity: Severity.Info };
+            return { content: requiresSudoString, severity: Severity$1.Info };
         }
         return null;
     }

package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js

@@ -1,10 +1,10 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { Action } from '../../../../base/common/actions.js';
-import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { SelectActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { defaultSelectBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { peekViewTitleBackground } from '../../../../editor/contrib/peekView/browser/peekView.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';

package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js

@@ -7,10 +7,11 @@ import { Event, Emitter } from '../../../../base/common/event.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
 import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ISCMService } from '../common/scm.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { ISCMService } from '../common/scm.service.js';
 import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
-import { IThemeService, themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { themeColorFromId } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -25,34 +26,38 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
 import { registerEditorAction, registerEditorContribution, EditorAction } from '../../../../editor/browser/editorExtensions.js';
 import { getOuterEditor, PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../../../editor/contrib/peekView/browser/peekView.js';
-import { ContextKeyExpr, RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { rot } from '../../../../base/common/numbers.js';
 import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
 import { Action, ActionRunner } from '../../../../base/common/actions.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { basename } from '../../../../base/common/resources.js';
-import { MenuRegistry, MenuId, IMenuService, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { MenuRegistry, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { shouldSynchronizeModel, OverviewRulerLane } from '../../../../editor/common/model.js';
 import { sortedDiff, equals } from '../../../../base/common/arrays.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { createStyleSheet, prepend, $ } from '../../../../base/browser/dom.js';
-import { isTextFileEditorModel, ITextFileService } from '../../../services/textfile/common/textfiles.js';
+import { isTextFileEditorModel } from '../../../services/textfile/common/textfiles.js';
+import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { gotoPreviousLocation, gotoNextLocation } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
-import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { Color } from '../../../../base/common/color.js';
 import { ResourceMap } from '../../../../base/common/map.js';
-import { IEditorService } from '../../../services/editor/common/editorService.js';
-import { IAccessibilitySignalService, AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { IQuickDiffService } from '../common/quickDiff.js';
+import { IEditorService } from '../../../services/editor/common/editorService.service.js';
+import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
+import { IQuickDiffService } from '../common/quickDiff.service.js';
 import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
 var DirtyDiffController_1, DirtyDiffDecorator_1;
 class DiffActionRunner extends ActionRunner {

package/vscode/src/vs/workbench/contrib/scm/common/scm.js

@@ -1,12 +1,9 @@
-import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
 const VIEWLET_ID = 'workbench.view.scm';
 const VIEW_PANE_ID = 'workbench.scm';
 const REPOSITORIES_VIEW_PANE_ID = 'workbench.scm.repositories';
-const ISCMService = ( createDecorator('scm'));
 var SCMInputChangeReason;
 ( (function(SCMInputChangeReason) {
     SCMInputChangeReason[SCMInputChangeReason["HistoryPrevious"] = 0] = "HistoryPrevious";
     SCMInputChangeReason[SCMInputChangeReason["HistoryNext"] = 1] = "HistoryNext";
 })(SCMInputChangeReason || (SCMInputChangeReason = {})));
-const ISCMViewService = ( createDecorator('scmView'));
-export { ISCMService, ISCMViewService, REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, VIEWLET_ID, VIEW_PANE_ID };
+export { REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, VIEWLET_ID, VIEW_PANE_ID };

package/vscode/src/vs/workbench/contrib/scm/common/scm.service.js

@@ -0,0 +1,4 @@
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+const ISCMService = ( createDecorator('scm'));
+const ISCMViewService = ( createDecorator('scmView'));
+export { ISCMService, ISCMViewService };

package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js

@@ -1,16 +1,17 @@
 import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
 import { CancellationToken } from '../../../../../base/common/cancellation.js';
 import { ResourceSet, ResourceMap } from '../../../../../base/common/map.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
-import { ILogService } from '../../../../../platform/log/common/log.js';
-import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.js';
-import { INotebookService } from '../../../notebook/common/notebookService.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
+import { ILogService } from '../../../../../platform/log/common/log.service.js';
+import { IUriIdentityService } from '../../../../../platform/uriIdentity/common/uriIdentity.service.js';
+import { INotebookService } from '../../../notebook/common/notebookService.service.js';
 import { contentMatchesToTextSearchMatches, webviewMatchesToTextSearchMatches } from './searchNotebookHelpers.js';
-import { pathIncludedInQuery, ISearchService } from '../../../../services/search/common/search.js';
+import { pathIncludedInQuery } from '../../../../services/search/common/search.js';
+import { ISearchService } from '../../../../services/search/common/search.service.js';
 import { coalesce } from '../../../../../base/common/arrays.js';
 import { isNumber } from '../../../../../base/common/types.js';
-import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.js';
-import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.js';
+import { IEditorResolverService } from '../../../../services/editor/common/editorResolverService.service.js';
+import { INotebookEditorService } from '../../../notebook/browser/services/notebookEditorService.service.js';
 import { QueryBuilder } from '../../../../services/search/common/queryBuilder.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 let NotebookSearchService = class NotebookSearchService {