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

package/vscode/src/vs/workbench/browser/parts/views/treeView.js

@@ -25,35 +25,42 @@ import './media/views.css.js';
 import { VSDataTransfer } from '../../../../base/common/dataTransfer.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { createActionViewItem, createAndFillInContextMenuActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { MenuId, MenuRegistry, registerAction2, Action2, IMenuService } from '../../../../platform/actions/common/actions.js';
-import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService, RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { MenuId, MenuRegistry, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { RawContextKey, ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { FileKind } from '../../../../platform/files/common/files.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 { WorkbenchAsyncDataTree } from '../../../../platform/list/browser/listService.js';
-import { ILogService } from '../../../../platform/log/common/log.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
-import { IProgressService } from '../../../../platform/progress/common/progress.js';
+import { ILogService } from '../../../../platform/log/common/log.service.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
+import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { ColorScheme } from '../../../../platform/theme/common/theme.js';
-import { FolderThemeIcon, FileThemeIcon, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { FolderThemeIcon, FileThemeIcon } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { fillEditorsDragData } from '../../dnd.js';
 import { ResourceLabels } from '../../labels.js';
 import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from '../editor/editorCommands.js';
 import { ViewPane } from './viewPane.js';
 import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from '../../../common/theme.js';
-import { ResolvableTreeItem, TreeItemCollapsibleState, Extensions, IViewDescriptorService } from '../../../common/views.js';
-import { IActivityService, NumberBadge } from '../../../services/activity/common/activity.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { WorkbenchHoverDelegate, IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { ITreeViewsService } from '../../../services/views/browser/treeViewsService.js';
+import { ResolvableTreeItem, TreeItemCollapsibleState, Extensions } from '../../../common/views.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { NumberBadge } from '../../../services/activity/common/activity.js';
+import { IActivityService } from '../../../services/activity/common/activity.service.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
+import { WorkbenchHoverDelegate } from '../../../../platform/hover/browser/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { ITreeViewsService } from '../../../services/views/browser/treeViewsService.service.js';
 import { LocalSelectionTransfer, CodeDataTransfers } from '../../../../platform/dnd/browser/dnd.js';
 import { toExternalVSDataTransfer } from '../../../../editor/browser/dnd.js';
 import { TreeItemCheckbox, CheckboxStateHandler } from './checkbox.js';

package/vscode/src/vs/workbench/browser/parts/views/viewFilter.d.ts

@@ -1,8 +1,8 @@
 import { Event } from '../../../../base/common/event.js';
-import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
 
 interface IFilterWidgetOptions {

package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { Delayer } from '../../../../base/common/async.js';
 import { $, append, addStandardDisposableListener, EventType, trackFocus } from '../../../../base/browser/dom.js';
-import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
+import { IContextViewService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { toDisposable } from '../../../../base/common/lifecycle.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { contrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
@@ -17,9 +17,10 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ContextScopedHistoryInputBox } from '../../../../platform/history/browser/contextScopedHistoryWidget.js';
-import { RawContextKey, IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { Codicon } from '../../../../base/common/codicons.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { showHistoryKeybindingHint } from '../../../../platform/history/browser/historyWidgetKeybindingHint.js';
 import { MenuRegistry, MenuId, SubmenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { MenuWorkbenchToolBar } from '../../../../platform/actions/browser/toolbar.js';

package/vscode/src/vs/workbench/browser/parts/views/viewPane.d.ts

@@ -1,18 +1,19 @@
 import { Event, Emitter } from '../../../../base/common/event.js';
 import { IAction, IActionRunner } from '../../../../base/common/actions.js';
 import { IActionViewItem } from '../../../../base/browser/ui/actionbar/actionbar.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Pane, IPaneStyles, IPaneOptions } from '../../../../base/browser/ui/splitview/paneview.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IView, IViewDescriptorService } from '../../../common/views.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IView } from '../../../common/views.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { IProgressIndicator } from '../../../../platform/progress/common/progress.js';
 import { CompositeMenuActions } from '../../actions.js';
 import { IDropdownMenuActionViewItemOptions } from '../../../../base/browser/ui/dropdown/dropdownActionViewItem.js';

package/vscode/src/vs/workbench/browser/parts/views/viewPane.js

@@ -19,22 +19,23 @@ import { DisposableStore, toDisposable } from '../../../../base/common/lifecycle
 import { Action } from '../../../../base/common/actions.js';
 import { prepareActions } from '../../../../base/browser/ui/actionbar/actionbar.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { Pane } from '../../../../base/browser/ui/splitview/paneview.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { ViewContainerLocationToString, defaultViewIcon, Extensions, IViewDescriptorService } from '../../../common/views.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { ViewContainerLocationToString, defaultViewIcon, Extensions } from '../../../common/views.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { IViewsService } from '../../../services/views/common/viewsService.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { assertIsDefined } from '../../../../base/common/types.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { MenuId, SubmenuItemAction, Action2 } from '../../../../platform/actions/common/actions.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
 import { parseLinkedText } from '../../../../base/common/linkedText.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { Button } from '../../../../base/browser/ui/button/button.js';
 import { Link } from '../../../../platform/opener/browser/link.js';
 import { ProgressBar } from '../../../../base/browser/ui/progressbar/progressbar.js';

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.d.ts

@@ -6,19 +6,20 @@ import { IAction } from '../../../../base/common/actions.js';
 import { Event } from '../../../../base/common/event.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { CompositeMenuActions } from '../../actions.js';
 import { ViewPane } from './viewPane.js';
 import { IViewletViewOptions } from './viewsViewlet.js';
 import { Component } from '../../../common/component.js';
-import { IViewPaneContainer, IViewDescriptorService, ViewContainer, IViewContainerModel, IView, IViewDescriptor, IAddedViewDescriptorRef } from '../../../common/views.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IViewPaneContainer, ViewContainer, IViewContainerModel, IView, IViewDescriptor, IAddedViewDescriptorRef } from '../../../common/views.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 import { IBaseActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 
 interface IViewPaneContainerOptions extends IPaneViewOptions {

package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js

@@ -11,13 +11,14 @@ import { assertIsDefined } from '../../../../base/common/types.js';
 import './media/paneviewlet.css.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { createActionViewItem } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { MenuRegistry, MenuId, registerAction2, IMenuService, Action2 } from '../../../../platform/actions/common/actions.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { MenuRegistry, MenuId, registerAction2, Action2 } from '../../../../platform/actions/common/actions.js';
+import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { asCssVariable } from '../../../../platform/theme/common/colorUtils.js';
 import { activeContrastBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -29,17 +30,19 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { Themable, IThemeService } from '../../../../platform/theme/common/themeService.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { Themable } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { CompositeMenuActions } from '../../actions.js';
 import { CompositeDragAndDropObserver, toggleDropEffect } from '../../dnd.js';
 import { Component } from '../../../common/component.js';
 import { PANEL_SECTION_DRAG_AND_DROP_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, PANEL_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, PANEL_SECTION_HEADER_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, PANEL_SECTION_HEADER_BORDER, SIDE_BAR_SECTION_HEADER_BORDER, PANEL_SECTION_BORDER } from '../../../common/theme.js';
-import { ViewContainerLocationToString, IViewDescriptorService, ViewVisibilityState } from '../../../common/views.js';
-import { IViewsService } from '../../../services/views/common/viewsService.js';
+import { ViewContainerLocationToString, ViewVisibilityState } from '../../../common/views.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { IViewsService } from '../../../services/views/common/viewsService.service.js';
 import { FocusedViewContext } from '../../../common/contextkeys.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 const ViewsSubMenu = ( new MenuId('Views'));
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
     submenu: ViewsSubMenu,

package/vscode/src/vs/workbench/browser/parts/views/viewsViewlet.js

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { IExtensionService } from '../../../services/extensions/common/extensions.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
-import { IViewDescriptorService } from '../../../common/views.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
+import { IViewDescriptorService } from '../../../common/views.service.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
+import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
 import { ViewPaneContainer } from './viewPaneContainer.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IWorkbenchLayoutService } from '../../../services/layout/browser/layoutService.service.js';
 let FilterViewPaneContainer = class FilterViewPaneContainer extends ViewPaneContainer {
     constructor(viewletId, onDidChangeFilterValue, configurationService, layoutService, telemetryService, storageService, instantiationService, themeService, contextMenuService, extensionService, contextService, viewDescriptorService) {
         super(viewletId, { mergeViewWithContainerWhenSingleView: false }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);

package/vscode/src/vs/workbench/browser/quickaccess.js

@@ -1,12 +1,12 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath } from '../../nls.js';
 import { ContextKeyExpr, RawContextKey } from '../../platform/contextkey/common/contextkey.js';
-import { IKeybindingService } from '../../platform/keybinding/common/keybinding.js';
-import { IQuickInputService } from '../../platform/quickinput/common/quickInput.js';
+import { IKeybindingService } from '../../platform/keybinding/common/keybinding.service.js';
+import { IQuickInputService } from '../../platform/quickinput/common/quickInput.service.js';
 import { Disposable } from '../../base/common/lifecycle.js';
 import { getIEditor } from '../../editor/browser/editorBrowser.js';
-import { IEditorGroupsService } from '../services/editor/common/editorGroupsService.js';
-import { IEditorService } from '../services/editor/common/editorService.js';
+import { IEditorGroupsService } from '../services/editor/common/editorGroupsService.service.js';
+import { IEditorService } from '../services/editor/common/editorService.service.js';
 const inQuickPickContextKeyValue = 'inQuickOpen';
 const InQuickPickContextKey = ( new RawContextKey(inQuickPickContextKeyValue, false, ( localizeWithPath(
     'vs/workbench/browser/quickaccess',

package/vscode/src/vs/workbench/common/component.d.ts

@@ -1,6 +1,8 @@
 import { MementoObject } from './memento.js';
-import { Themable, IThemeService } from '../../platform/theme/common/themeService.js';
-import { IStorageService, StorageScope, StorageTarget, IStorageValueChangeEvent } from '../../platform/storage/common/storage.js';
+import { Themable } from '../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../platform/theme/common/themeService.service.js';
+import { StorageScope, StorageTarget, IStorageValueChangeEvent } from '../../platform/storage/common/storage.js';
+import { IStorageService } from '../../platform/storage/common/storage.service.js';
 import { DisposableStore } from '../../base/common/lifecycle.js';
 import { Event } from '../../base/common/event.js';
 

package/vscode/src/vs/workbench/common/configuration.js

@@ -2,11 +2,11 @@ import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js'
 import { localizeWithPath } from '../../nls.js';
 import { Extensions as Extensions$1 } from '../../platform/configuration/common/configurationRegistry.js';
 import { Registry } from '../../platform/registry/common/platform.js';
-import { IWorkspaceContextService } from '../../platform/workspace/common/workspace.js';
-import { IConfigurationService } from '../../platform/configuration/common/configuration.js';
+import { IWorkspaceContextService } from '../../platform/workspace/common/workspace.service.js';
+import { IConfigurationService } from '../../platform/configuration/common/configuration.service.js';
 import { Disposable } from '../../base/common/lifecycle.js';
 import { Emitter } from '../../base/common/event.js';
-import { IRemoteAgentService } from '../services/remote/common/remoteAgentService.js';
+import { IRemoteAgentService } from '../services/remote/common/remoteAgentService.service.js';
 import { isWindows } from '../../base/common/platform.js';
 import { equals } from '../../base/common/objects.js';
 import { DeferredPromise } from '../../base/common/async.js';

package/vscode/src/vs/workbench/common/contextkeys.js

@@ -1,10 +1,11 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
 import { DisposableStore } from '../../base/common/lifecycle.js';
 import { localizeWithPath } from '../../nls.js';
-import { RawContextKey, IContextKeyService } from '../../platform/contextkey/common/contextkey.js';
+import { RawContextKey } from '../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../platform/contextkey/common/contextkey.service.js';
 import { isEqual, basename, dirname, extname } from '../../base/common/resources.js';
 import { ILanguageService } from '../../editor/common/languages/language.js';
-import { IFileService } from '../../platform/files/common/files.js';
+import { IFileService } from '../../platform/files/common/files.service.js';
 import { IModelService } from '../../editor/common/services/model.js';
 import { Schemas } from '../../base/common/network.js';
 import { DEFAULT_EDITOR_ASSOCIATION } from './editor.js';

package/vscode/src/vs/workbench/common/contributions.js

@@ -1,13 +1,13 @@
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
-import { ILifecycleService } from '../services/lifecycle/common/lifecycle.js';
+import { ILifecycleService } from '../services/lifecycle/common/lifecycle.service.js';
 import { Registry } from '../../platform/registry/common/platform.js';
 import { DeferredPromise, runWhenGlobalIdle } from '../../base/common/async.js';
 import { mark } from '../../base/common/performance.js';
-import { ILogService } from '../../platform/log/common/log.js';
-import { IEnvironmentService } from '../../platform/environment/common/environment.js';
+import { ILogService } from '../../platform/log/common/log.service.js';
+import { IEnvironmentService } from '../../platform/environment/common/environment.service.js';
 import { getOrSet } from '../../base/common/map.js';
 import { Disposable } from '../../base/common/lifecycle.js';
-import { IEditorPaneService } from '../services/editor/common/editorPaneService.js';
+import { IEditorPaneService } from '../services/editor/common/editorPaneService.service.js';
 var Extensions;
 ( (function(Extensions) {
     Extensions.Workbench = 'workbench.contributions.kind';

package/vscode/src/vs/workbench/common/editor/binaryEditorModel.js

@@ -1,6 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { EditorModel } from './editorModel.js';
-import { IFileService } from '../../../platform/files/common/files.js';
+import { IFileService } from '../../../platform/files/common/files.service.js';
 import { Mimes } from '../../../base/common/mime.js';
 let BinaryEditorModel = class BinaryEditorModel extends EditorModel {
     constructor(resource, name, fileService) {

package/vscode/src/vs/workbench/common/editor/diffEditorInput.js

@@ -5,7 +5,7 @@ import { BINARY_DIFF_EDITOR_ID, TEXT_DIFF_EDITOR_ID, isResourceDiffEditorInput }
 import { BaseTextEditorModel } from './textEditorModel.js';
 import { DiffEditorModel } from './diffEditorModel.js';
 import { TextDiffEditorModel } from './textDiffEditorModel.js';
-import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IEditorService } from '../../services/editor/common/editorService.service.js';
 import { shorten } from '../../../base/common/labels.js';
 import { isResolvedEditorModel } from '../../../platform/editor/common/editor.js';
 var DiffEditorInput_1;

package/vscode/src/vs/workbench/common/editor/editorGroupModel.js

@@ -4,7 +4,7 @@ import { EditorCloseContext, SideBySideEditor, EditorExtensions } from '../edito
 import { EditorInput } from './editorInput.js';
 import { SideBySideEditorInput } from './sideBySideEditorInput.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
-import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
 import { Disposable, dispose, DisposableStore } from '../../../base/common/lifecycle.js';
 import { Registry } from '../../../platform/registry/common/platform.js';
 import { coalesce } from '../../../base/common/arrays.js';

package/vscode/src/vs/workbench/common/editor/resourceEditorInput.d.ts

@@ -1,12 +1,13 @@
 import { EditorInputWithPreferredResource, EditorInputCapabilities, Verbosity, IFileLimitedEditorInputOptions } from '../editor.js';
 import { EditorInput } from './editorInput.js';
 import { URI } from '../../../base/common/uri.js';
-import { IFileService, IFileReadLimits } from '../../../platform/files/common/files.js';
-import { ILabelService } from '../../../platform/label/common/label.js';
-import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IFileReadLimits } from '../../../platform/files/common/files.js';
+import { IFileService } from '../../../platform/files/common/files.service.js';
+import { ILabelService } from '../../../platform/label/common/label.service.js';
+import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { IMarkdownString } from '../../../base/common/htmlContent.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
-import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.service.js';
 
 /**
  * The base class for all editor inputs that open resources.

package/vscode/src/vs/workbench/common/editor/resourceEditorInput.js

@@ -1,12 +1,13 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { EditorInput } from './editorInput.js';
-import { getLargeFileConfirmationLimit, ByteSize, IFileService } from '../../../platform/files/common/files.js';
-import { ILabelService } from '../../../platform/label/common/label.js';
+import { getLargeFileConfirmationLimit, ByteSize } from '../../../platform/files/common/files.js';
+import { IFileService } from '../../../platform/files/common/files.service.js';
+import { ILabelService } from '../../../platform/label/common/label.service.js';
 import { isEqual, dirname } from '../../../base/common/resources.js';
-import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { isConfigured } from '../../../platform/configuration/common/configuration.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
-import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.service.js';
 let AbstractResourceEditorInput = class AbstractResourceEditorInput extends EditorInput {
     get capabilities() {
         let capabilities = 32 ;

package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js

@@ -4,7 +4,7 @@ import { localizeWithPath } from '../../../nls.js';
 import { Registry } from '../../../platform/registry/common/platform.js';
 import { isResourceDiffEditorInput, isResourceMultiDiffEditorInput, isResourceSideBySideEditorInput, isResourceMergeEditorInput, isEditorInput, findViewStateForEditor, isResourceEditorInput, isDiffEditorInput, EditorExtensions } from '../editor.js';
 import { EditorInput } from './editorInput.js';
-import { IEditorService } from '../../services/editor/common/editorService.js';
+import { IEditorService } from '../../services/editor/common/editorService.service.js';
 var SideBySideEditorInput_1;
 let SideBySideEditorInput = class SideBySideEditorInput extends EditorInput {
     static { SideBySideEditorInput_1 = this; }

package/vscode/src/vs/workbench/common/editor/textEditorModel.js

@@ -4,9 +4,10 @@ import { ILanguageService } from '../../../editor/common/languages/language.js';
 import { IModelService } from '../../../editor/common/services/model.js';
 import { MutableDisposable } from '../../../base/common/lifecycle.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../editor/common/languages/modesRegistry.js';
-import { LanguageDetectionLanguageEventSource, ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { LanguageDetectionLanguageEventSource } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
+import { ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.service.js';
 import { ThrottledDelayer } from '../../../base/common/async.js';
-import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.service.js';
 import { localizeWithPath } from '../../../nls.js';
 var BaseTextEditorModel_1;
 let BaseTextEditorModel = class BaseTextEditorModel extends EditorModel {

package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.d.ts

@@ -1,14 +1,15 @@
 import { GroupIdentifier, IUntypedEditorInput, IRevertOptions } from '../editor.js';
 import { URI } from '../../../base/common/uri.js';
 import { AbstractResourceEditorInput } from './resourceEditorInput.js';
-import { ITextFileService, ITextFileSaveOptions } from '../../services/textfile/common/textfiles.js';
-import { IEditorService } from '../../services/editor/common/editorService.js';
-import { IFileService } from '../../../platform/files/common/files.js';
-import { ILabelService } from '../../../platform/label/common/label.js';
+import { ITextFileSaveOptions } from '../../services/textfile/common/textfiles.js';
+import { ITextFileService } from '../../services/textfile/common/textfiles.service.js';
+import { IEditorService } from '../../services/editor/common/editorService.service.js';
+import { IFileService } from '../../../platform/files/common/files.service.js';
+import { ILabelService } from '../../../platform/label/common/label.service.js';
 import '../../../editor/editor.api.js';
-import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
-import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.service.js';
 
 /**
  * The base class for all editor inputs that open in text editors.

package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.js

@@ -1,18 +1,18 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { DEFAULT_EDITOR_ASSOCIATION, isResourceEditorInput } from '../editor.js';
 import { AbstractResourceEditorInput } from './resourceEditorInput.js';
-import { ITextFileService } from '../../services/textfile/common/textfiles.js';
-import { IEditorService } from '../../services/editor/common/editorService.js';
-import { IFileService } from '../../../platform/files/common/files.js';
-import { ILabelService } from '../../../platform/label/common/label.js';
+import { ITextFileService } from '../../services/textfile/common/textfiles.service.js';
+import { IEditorService } from '../../services/editor/common/editorService.service.js';
+import { IFileService } from '../../../platform/files/common/files.service.js';
+import { ILabelService } from '../../../platform/label/common/label.service.js';
 import { Schemas } from '../../../base/common/network.js';
 import { isEqual } from '../../../base/common/resources.js';
 import { ITextModelService } from '../../../editor/common/services/resolverService.js';
 import { TextResourceEditorModel } from './textResourceEditorModel.js';
 import { createTextBufferFactory } from '../../../editor/common/model/textModel.js';
-import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.js';
+import { IFilesConfigurationService } from '../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { ITextResourceConfigurationService } from '../../../editor/common/services/textResourceConfiguration.js';
-import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.js';
+import { ICustomEditorLabelService } from '../../services/editor/common/customEditorLabelService.service.js';
 var TextResourceEditorInput_1;
 let AbstractTextResourceEditorInput = class AbstractTextResourceEditorInput extends AbstractResourceEditorInput {
     constructor(resource, preferredResource, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService) {

package/vscode/src/vs/workbench/common/editor/textResourceEditorModel.js

@@ -2,8 +2,8 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { BaseTextEditorModel } from './textEditorModel.js';
 import { ILanguageService } from '../../../editor/common/languages/language.js';
 import { IModelService } from '../../../editor/common/services/model.js';
-import { ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.js';
-import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
+import { ILanguageDetectionService } from '../../services/languageDetection/common/languageDetectionWorkerService.service.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.service.js';
 let TextResourceEditorModel = class TextResourceEditorModel extends BaseTextEditorModel {
     constructor(resource, languageService, modelService, languageDetectionService, accessibilityService) {
         super(modelService, languageService, languageDetectionService, accessibilityService, resource);

package/vscode/src/vs/workbench/common/editor.d.ts

@@ -6,7 +6,7 @@ import { IDiffEditor } from '../../editor/common/editorCommon.js';
 import { IEditorOptions, IBaseTextResourceEditorInput, IBaseUntypedEditorInput, IResourceEditorInput, ITextResourceEditorInput } from '../../platform/editor/common/editor.js';
 import { EditorInput } from './editor/editorInput.js';
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
-import { IContextKeyService } from '../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../platform/contextkey/common/contextkey.service.js';
 import { IEncodingSupport, ILanguageSupport } from '../services/textfile/common/textfiles.js';
 import { IEditorGroup } from '../services/editor/common/editorGroupsService.js';
 import { IComposite, ICompositeControl } from './composite.js';

package/vscode/src/vs/workbench/common/notifications.js

@@ -1,4 +1,4 @@
-import { NotificationsFilter, NoOpNotification, NotificationPriority, Severity, isNotificationSource } from '../../platform/notification/common/notification.js';
+import { NotificationsFilter, NoOpNotification, NotificationPriority, isNotificationSource } from '../../platform/notification/common/notification.js';
 import { toErrorMessage, isErrorWithActions } from '../../base/common/errorMessage.js';
 import { Emitter, Event } from '../../base/common/event.js';
 import { Disposable, toDisposable } from '../../base/common/lifecycle.js';
@@ -7,6 +7,7 @@ import { Action } from '../../base/common/actions.js';
 import { equals } from '../../base/common/arrays.js';
 import { parseLinkedText } from '../../base/common/linkedText.js';
 import { mapsStrictEqualIgnoreOrder } from '../../base/common/map.js';
+import Severity$1 from '../../base/common/severity.js';
 class NotificationHandle extends Disposable {
     constructor(item, onClose) {
         super();
@@ -205,7 +206,7 @@ class NotificationViewItem extends Disposable {
             severity = notification.severity;
         }
         else {
-            severity = Severity.Info;
+            severity = Severity$1.Info;
         }
         const message = NotificationViewItem.parseNotificationMessage(notification.message);
         if (!message) {
@@ -219,7 +220,7 @@ class NotificationViewItem extends Disposable {
             actions = { primary: notification.message.actions };
         }
         let priority = notification.priority ?? NotificationPriority.DEFAULT;
-        if (priority === NotificationPriority.DEFAULT && severity !== Severity.Error) {
+        if (priority === NotificationPriority.DEFAULT && severity !== Severity$1.Error) {
             if (filter.global === NotificationsFilter.ERROR) {
                 priority = NotificationPriority.SILENT;
             }
@@ -311,7 +312,7 @@ class NotificationViewItem extends Disposable {
             return true;
         }
         const hasActions = this.hasActions;
-        if ((hasActions && this._severity === Severity.Error) ||
+        if ((hasActions && this._severity === Severity$1.Error) ||
             (!hasActions && this._expanded) ||
             (this._progress && !this._progress.state.done)
         ) {