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

package/vscode/src/vs/editor/browser/controller/textAreaHandler.js

@@ -20,7 +20,7 @@ import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../base/browser/ui/mouse
 import { TokenizationRegistry } from '../../common/languages.js';
 import { Color } from '../../../base/common/color.js';
 import { IME } from '../../../base/common/ime.js';
-import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
+import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.service.js';
 import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
 class VisibleTextAreaData {
     constructor(_context, modelLineNumber, distanceToModelLineStart, widthOfHiddenLineTextBefore, distanceToModelLineEnd) {

package/vscode/src/vs/editor/browser/controller/textAreaInput.js

@@ -11,8 +11,8 @@ import { Mimes } from '../../../base/common/mime.js';
 import { isHighSurrogate } from '../../../base/common/strings.js';
 import { TextAreaState } from './textAreaState.js';
 import { Selection } from '../../common/core/selection.js';
-import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
-import { ILogService } from '../../../platform/log/common/log.js';
+import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.service.js';
+import { ILogService } from '../../../platform/log/common/log.service.js';
 var TextAreaSyntethicEvents;
 ( (function(TextAreaSyntethicEvents) {
     TextAreaSyntethicEvents.Tap = '-monaco-textarea-synthetic-tap';

package/vscode/src/vs/editor/browser/editorExtensions.d.ts

@@ -3,9 +3,9 @@ import { IEditorContribution } from '../common/editorCommon.js';
 import '../editor.api.js';
 import { IDisposable } from '../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../base/common/themables.js';
-import { BrandedService, ServicesAccessor as ServicesAccessor$1 } from '../../platform/instantiation/common/instantiation.js';
 import { ContextKeyExpression } from '../../platform/contextkey/common/contextkey.js';
 import { ICommandMetadata } from '../../platform/commands/common/commands.js';
+import { BrandedService, ServicesAccessor as ServicesAccessor$1 } from '../../platform/instantiation/common/instantiation.js';
 import { MenuId } from '../../platform/actions/common/actions.js';
 import { IKeybindings } from '../../platform/keybinding/common/keybindingsRegistry.js';
 

package/vscode/src/vs/editor/browser/editorExtensions.js

@@ -6,13 +6,14 @@ import { IModelService } from '../common/services/model.js';
 import { ITextModelService } from '../common/services/resolverService.js';
 import { Action2, MenuId, MenuRegistry } from '../../platform/actions/common/actions.js';
 import { CommandsRegistry } from '../../platform/commands/common/commands.js';
-import { IContextKeyService, ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
+import { ContextKeyExpr } from '../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../platform/instantiation/common/instantiation.js';
 import { KeybindingsRegistry } from '../../platform/keybinding/common/keybindingsRegistry.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 { assertType } from '../../base/common/types.js';
-import { ILogService } from '../../platform/log/common/log.js';
+import { ILogService } from '../../platform/log/common/log.service.js';
 import { getActiveElement } from '../../base/browser/dom.js';
 class Command {
     constructor(opts) {

package/vscode/src/vs/editor/browser/services/abstractCodeEditorService.js

@@ -7,7 +7,7 @@ import { format } from '../../../base/common/strings.js';
 import { URI } from '../../../base/common/uri.js';
 import { isThemeColor } from '../../common/editorCommon.js';
 import { OverviewRulerLane } from '../../common/model.js';
-import { IThemeService } from '../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.service.js';
 let AbstractCodeEditorService = class AbstractCodeEditorService extends Disposable {
     constructor(_themeService) {
         super();

package/vscode/src/vs/editor/browser/services/editorWorkerService.js

@@ -9,7 +9,7 @@ import { EditorSimpleWorker } from '../../common/services/editorSimpleWorker.js'
 import { IModelService } from '../../common/services/model.js';
 import { ITextResourceConfigurationService } from '../../common/services/textResourceConfiguration.js';
 import { isNonEmptyArray } from '../../../base/common/arrays.js';
-import { ILogService } from '../../../platform/log/common/log.js';
+import { ILogService } from '../../../platform/log/common/log.service.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { canceled, onUnexpectedError } from '../../../base/common/errors.js';
 import { ILanguageFeaturesService } from '../../common/services/languageFeatures.js';

package/vscode/src/vs/editor/browser/services/hoverService/hoverService.d.ts

@@ -1,10 +1,11 @@
-import { IHoverService, IHoverOptions } from '../../../../platform/hover/browser/hover.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverOptions } from '../../../../platform/hover/browser/hover.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
 import { IHoverWidget } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
 
 declare class HoverService extends Disposable implements IHoverService {

package/vscode/src/vs/editor/browser/services/hoverService/hoverService.js

@@ -12,16 +12,16 @@ 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 { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.service.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { HoverWidget } from './hoverWidget.js';
 import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { getActiveElement, isAncestorOfActiveElement, getWindow, addDisposableListener, isAncestor, EventType } from '../../../../base/browser/dom.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.service.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { ContextViewHandler } from '../../../../platform/contextview/browser/contextViewService.js';
 let HoverService = class HoverService extends Disposable {

package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js

@@ -3,18 +3,18 @@ import './hover.css.js';
 import { DisposableStore } from '../../../../base/common/lifecycle.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { getWindow, addDisposableListener, prepend, append, $ as $$1, getDomNodeZoomLevel } from '../../../../base/browser/dom.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { EDITOR_FONT_DEFAULTS } from '../../../common/config/editorOptions.js';
 import { HoverWidget as HoverWidget$1, getHoverAccessibleViewHint } from '../../../../base/browser/ui/hover/hoverWidget.js';
 import { Widget } from '../../../../base/browser/ui/widget.js';
-import { IOpenerService } from '../../../../platform/opener/common/opener.js';
+import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { openLinkFromMarkdown, MarkdownRenderer } from '../../widget/markdownRenderer/browser/markdownRenderer.js';
 import { isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { status } from '../../../../base/browser/ui/aria/aria.js';
 const $ = $$1;
 let HoverWidget = class HoverWidget extends Widget {

package/vscode/src/vs/editor/browser/services/openerService.js

@@ -9,7 +9,7 @@ import { matchesSomeScheme, Schemas, matchesScheme } from '../../../base/common/
 import { normalizePath } from '../../../base/common/resources.js';
 import { URI } from '../../../base/common/uri.js';
 import { ICodeEditorService } from './codeEditorService.js';
-import { ICommandService } from '../../../platform/commands/common/commands.js';
+import { ICommandService } from '../../../platform/commands/common/commands.service.js';
 import { EditorOpenSource } from '../../../platform/editor/common/editor.js';
 import { extractSelection } from '../../../platform/opener/common/opener.js';
 let CommandOpener = class CommandOpener {

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -32,12 +32,13 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { MonospaceLineBreaksComputerFactory } from '../../../common/viewModel/monospaceLineBreaksComputer.js';
 import { ViewModel } from '../../../common/viewModel/viewModelImpl.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { Severity, INotificationService } from '../../../../platform/notification/common/notification.js';
+import '../../../../platform/notification/common/notification.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -49,7 +50,9 @@ 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 { registerThemingParticipant, IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
+import Severity$1 from '../../../../base/common/severity.js';
 var CodeEditorWidget_1;
 let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     static { CodeEditorWidget_1 = this; }
@@ -1254,7 +1257,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                             "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes or increase the editor multi cursor limit setting.",
                             multiCursorLimit
                         ));
-                        this._notificationService.prompt(Severity.Warning, message, [
+                        this._notificationService.prompt(Severity$1.Warning, message, [
                             {
                                 label: 'Find and Replace',
                                 run: () => {

package/vscode/src/vs/editor/browser/widget/codeEditor/embeddedCodeEditorWidget.js

@@ -4,12 +4,12 @@ import { ICodeEditorService } from '../../services/codeEditorService.js';
 import { CodeEditorWidget } from './codeEditorWidget.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IThemeService } from '../../../../platform/theme/common/themeService.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 let EmbeddedCodeEditorWidget = class EmbeddedCodeEditorWidget extends CodeEditorWidget {
     constructor(domElement, options, codeEditorWidgetOptions, parentEditor, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService) {
         super(domElement, { ...parentEditor.getRawOptions(), overflowWidgetsDomNode: parentEditor.getOverflowWidgetsDomNode() }, codeEditorWidgetOptions, instantiationService, codeEditorService, commandService, contextKeyService, themeService, notificationService, accessibilityService, languageConfigurationService, languageFeaturesService);

package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js

@@ -6,7 +6,7 @@ import { DiffEditorWidget } from './diffEditorWidget.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { localize2WithPath } from '../../../../nls.js';
 import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 import './registrations.contribution.js';
 class ToggleCollapseUnchangedRegions extends Action2 {

package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js

@@ -26,7 +26,8 @@ import { LineTokens } from '../../../../common/tokens/lineTokens.js';
 import { renderViewLine2, RenderLineInput } from '../../../../common/viewLayout/viewLineRenderer.js';
 import { ViewLineRenderingData } from '../../../../common/viewModel.js';
 import { localizeWithPath } from '../../../../../nls.js';
-import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { AccessibilitySignal } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import './accessibleDiffViewer.css.js';

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js

@@ -10,7 +10,7 @@ import { EditorOptions } from '../../../../common/config/editorOptions.js';
 import { Position } from '../../../../common/core/position.js';
 import { localizeWithPath } from '../../../../../nls.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
-import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.service.js';
 let DiffEditorEditors = class DiffEditorEditors extends Disposable {
     get onDidContentSizeChange() { return this._onDidContentSizeChange.event; }
     constructor(originalEditorElement, modifiedEditorElement, _options, _argCodeEditorWidgetOptions, _createInnerEditor, _instantiationService, _keybindingService) {

package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js

@@ -20,8 +20,8 @@ import { animatedObservable, joinCombine } from '../../utils.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { Position } from '../../../../../common/core/position.js';
 import { InlineDecoration } from '../../../../../common/viewModel.js';
-import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.js';
-import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.js';
+import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.service.js';
+import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
 let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
     constructor(_targetWindow, _editors, _diffModel, _options, _diffEditorWidget, _canIgnoreViewZoneUpdateEvent, _origViewZonesToIgnore, _modViewZonesToIgnore, _clipboardService, _contextMenuService) {
         super();

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.js

@@ -6,7 +6,7 @@ import { observableFromEvent } from '../../../../base/common/observableInternal/
 import '../../../../base/common/cancellation.js';
 import { diffEditorDefaultOptions } from '../../../common/config/diffEditor.js';
 import { boolean, clampedFloat, clampedInt, stringSet } from '../../../common/config/editorOptions.js';
-import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 let DiffEditorOptions = class DiffEditorOptions {
     get editorOptions() { return this._options; }
     constructor(options, _accessibilityService) {

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js

@@ -27,11 +27,12 @@ import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
 import { EditorType } from '../../../common/editorCommon.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { AccessibilitySignal, IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { AccessibilitySignal } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
+import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
-import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { DiffEditorEditors } from './components/diffEditorEditors.js';
 import { DelegatingEditor } from './delegatingEditorImpl.js';
 import { DiffEditorOptions } from './diffEditorOptions.js';

package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js

@@ -6,7 +6,7 @@ import { StopWatch } from '../../../../base/common/stopwatch.js';
 import { LineRange } from '../../../common/core/lineRange.js';
 import { DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
 import { IEditorWorkerService } from '../../../common/services/editorWorker.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 var WorkerBasedDocumentDiffProvider_1;
 const IDiffProviderFactoryService = ( createDecorator('diffProviderFactoryService'));
 let WorkerBasedDiffProviderFactoryService = class WorkerBasedDiffProviderFactoryService {

package/vscode/src/vs/editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js

@@ -2,10 +2,10 @@ import { __decorate, __param } from '../../../../../../../external/tslib/tslib.e
 import { mixin } from '../../../../base/common/objects.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
 import { DiffEditorWidget } from './diffEditorWidget.js';
-import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IAccessibilitySignalService } from '../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 let EmbeddedDiffEditorWidget = class EmbeddedDiffEditorWidget extends DiffEditorWidget {
     constructor(domElement, options, codeEditorWidgetOptions, parentEditor, contextKeyService, instantiationService, codeEditorService, accessibilitySignalService, editorProgressService) {
         super(domElement, parentEditor.getRawOptions(), codeEditorWidgetOptions, contextKeyService, instantiationService, codeEditorService, accessibilitySignalService, editorProgressService);

package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js

@@ -16,8 +16,9 @@ import { TextEdit, SingleTextEdit } from '../../../../common/core/textEdit.js';
 import { DetailedLineRangeMapping } from '../../../../common/diff/rangeMapping.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { MenuWorkbenchToolBar } from '../../../../../platform/actions/browser/toolbar.js';
-import { MenuId, IMenuService } from '../../../../../platform/actions/common/actions.js';
-import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.js';
+import { MenuId } from '../../../../../platform/actions/common/actions.js';
+import { IMenuService } from '../../../../../platform/actions/common/actions.service.js';
+import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
 import { WorkbenchHoverDelegate } from '../../../../../platform/hover/browser/hover.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 const emptyArr = [];

package/vscode/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.js

@@ -21,7 +21,7 @@ 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 { IThemeService } from '../../../../../platform/theme/common/themeService.js';
+import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
 var OverviewRulerFeature_1;
 let OverviewRulerFeature = class OverviewRulerFeature extends Disposable {
     static { OverviewRulerFeature_1 = this; }

package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.js

@@ -9,7 +9,7 @@ import { applyFontInfo } from '../../../config/domFontInfo.js';
 import { ILanguageService } from '../../../../common/languages/language.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../../../../common/languages/modesRegistry.js';
 import { tokenizeToString } from '../../../../common/languages/textToHtmlTokenizer.js';
-import { IOpenerService } from '../../../../../platform/opener/common/opener.js';
+import { IOpenerService } from '../../../../../platform/opener/common/opener.service.js';
 var MarkdownRenderer_1;
 let MarkdownRenderer = class MarkdownRenderer {
     static { MarkdownRenderer_1 = this; }

package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js

@@ -14,7 +14,7 @@ import { ObservableElementSizeObserver } from '../diffEditor/utils.js';
 import { OffsetRange } from '../../../common/core/offsetRange.js';
 import { Selection } from '../../../common/core/selection.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
 import { DiffEditorItemTemplate, TemplateData } from './diffEditorItemTemplate.js';

package/vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js

@@ -11,7 +11,7 @@ import { IndentRulesSupport } from './supports/indentRules.js';
 import { OnEnterSupport } from './supports/onEnter.js';
 import { RichEditBrackets } from './supports/richEditBrackets.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
 import { ILanguageService } from './language.js';
 import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
 import { PLAINTEXT_LANGUAGE_ID } from './modesRegistry.js';

package/vscode/src/vs/editor/common/model/textModel.js

@@ -28,7 +28,7 @@ import { PieceTreeTextBufferBuilder } from './pieceTreeTextBuffer/pieceTreeTextB
 import { TextModelSearch, SearchParams } from './textModelSearch.js';
 import { TokenizationTextModelPart } from './tokenizationTextModelPart.js';
 import { InternalModelContentChangeEvent, ModelRawContentChangedEvent, ModelRawFlush, ModelRawEOLChanged, LineInjectedText, ModelRawLineChanged, ModelRawLinesDeleted, ModelRawLinesInserted, ModelInjectedTextChangedEvent } from '../textModelEvents.js';
-import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.service.js';
 var TextModel_1;
 function createTextBufferFactory(text) {
     const builder = ( new PieceTreeTextBufferBuilder());

package/vscode/src/vs/editor/common/services/languageFeatureDebounce.js

@@ -2,10 +2,10 @@ import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.
 import { doHash } from '../../../base/common/hash.js';
 import { LRUCache } from '../../../base/common/map.js';
 import { clamp, SlidingWindowAverage, MovingAverage } from '../../../base/common/numbers.js';
-import { IEnvironmentService } from '../../../platform/environment/common/environment.js';
+import { IEnvironmentService } from '../../../platform/environment/common/environment.service.js';
 import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { ILogService } from '../../../platform/log/common/log.js';
+import { ILogService } from '../../../platform/log/common/log.service.js';
 import { matchesScheme } from '../../../base/common/network.js';
 const ILanguageFeatureDebounceService = ( createDecorator('ILanguageFeatureDebounceService'));
 var IdentityHash;

package/vscode/src/vs/editor/common/services/markerDecorationsService.js

@@ -1,5 +1,6 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { IMarkerService, MarkerSeverity } from '../../../platform/markers/common/markers.js';
+import { MarkerSeverity } from '../../../platform/markers/common/markers.js';
+import { IMarkerService } from '../../../platform/markers/common/markers.service.js';
 import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
 import { OverviewRulerLane } from '../model.js';
 import { themeColorFromId } from '../../../platform/theme/common/themeService.js';

package/vscode/src/vs/editor/common/services/modelService.js

@@ -9,8 +9,8 @@ import { EDITOR_MODEL_DEFAULTS } from '../core/textModelDefaults.js';
 import { PLAINTEXT_LANGUAGE_ID } from '../languages/modesRegistry.js';
 import { ILanguageService } from '../languages/language.js';
 import { ITextResourcePropertiesService } from './textResourceConfiguration.js';
-import { IConfigurationService } from '../../../platform/configuration/common/configuration.js';
-import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.js';
+import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
+import { IUndoRedoService } from '../../../platform/undoRedo/common/undoRedo.service.js';
 import { StringSHA1 } from '../../../base/common/hash.js';
 import { isEditStackElement } from '../model/editStack.js';
 import { Schemas } from '../../../base/common/network.js';

package/vscode/src/vs/editor/common/services/semanticTokensProviderStyling.js

@@ -1,7 +1,8 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { TokenMetadata } from '../encodedTokenAttributes.js';
-import { IThemeService } from '../../../platform/theme/common/themeService.js';
-import { LogLevel, ILogService } from '../../../platform/log/common/log.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.service.js';
+import { LogLevel } from '../../../platform/log/common/log.js';
+import { ILogService } from '../../../platform/log/common/log.service.js';
 import { SparseMultilineTokens } from '../tokens/sparseMultilineTokens.js';
 import { ILanguageService } from '../languages/language.js';
 let SemanticTokensProviderStyling = class SemanticTokensProviderStyling {

package/vscode/src/vs/editor/common/services/semanticTokensStylingService.js

@@ -1,8 +1,8 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { Disposable } from '../../../base/common/lifecycle.js';
 import { ILanguageService } from '../languages/language.js';
-import { IThemeService } from '../../../platform/theme/common/themeService.js';
-import { ILogService } from '../../../platform/log/common/log.js';
+import { IThemeService } from '../../../platform/theme/common/themeService.service.js';
+import { ILogService } from '../../../platform/log/common/log.service.js';
 import { SemanticTokensProviderStyling } from './semanticTokensProviderStyling.js';
 import { ISemanticTokensStylingService } from './semanticTokensStyling.js';
 import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';

package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js

@@ -7,7 +7,8 @@ import { registerEditorContribution, registerEditorAction, EditorAction } from '
 import { Selection } from '../../../common/core/selection.js';
 import { EditorContextKeys } from '../../../common/editorContextKeys.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';
 var SelectionAnchorController_1;
 const SelectionAnchorSet = ( new RawContextKey('selectionAnchorSet', false));
 let SelectionAnchorController = class SelectionAnchorController {

package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js

@@ -8,7 +8,7 @@ import { EditorContextKeys } from '../../../common/editorContextKeys.js';
 import { CopyPasteController } from '../../dropOrPasteInto/browser/copyPasteController.js';
 import { localize2WithPath, localizeWithPath } from '../../../../nls.js';
 import { MenuRegistry, MenuId } from '../../../../platform/actions/common/actions.js';
-import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.js';
+import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
 const CLIPBOARD_CONTEXT_MENU_GROUP = '9_cutcopypaste';
 const supportsCut = (isNative || document.queryCommandSupported('cut'));

package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js

@@ -10,10 +10,11 @@ import { ILanguageFeaturesService } from '../../../common/services/languageFeatu
 import { IModelService } from '../../../common/services/model.js';
 import { TextModelCancellationTokenSource } from '../../editorState/browser/editorState.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { CommandsRegistry, ICommandService } from '../../../../platform/commands/common/commands.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
+import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { Progress } from '../../../../platform/progress/common/progress.js';
-import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.js';
+import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { mayIncludeActionsOfKind, CodeActionKind, filtersAction, CodeActionItem, CodeActionTriggerSource } from '../common/types.js';
 import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 const codeActionCommandId = 'editor.action.codeAction';

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js

@@ -14,12 +14,12 @@ import { LightBulbWidget } from './lightBulbWidget.js';
 import { MessageController } from '../../message/browser/messageController.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { IActionWidgetService } from '../../../../platform/actionWidget/browser/actionWidget.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
-import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
+import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IMarkerService } from '../../../../platform/markers/common/markers.js';
-import { IEditorProgressService } from '../../../../platform/progress/common/progress.js';
+import { IMarkerService } from '../../../../platform/markers/common/markers.service.js';
+import { IEditorProgressService } from '../../../../platform/progress/common/progress.service.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';

package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.js

@@ -3,7 +3,7 @@ import { HierarchicalKind } from '../../../../base/common/hierarchicalKind.js';
 import { Lazy } from '../../../../base/common/lazy.js';
 import { refactorCommandId, codeActionCommandId, sourceActionCommandId, organizeImportsCommandId, fixAllCommandId } from './codeAction.js';
 import { CodeActionCommandArgs, CodeActionKind } from '../common/types.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 var CodeActionKeybindingResolver_1;
 let CodeActionKeybindingResolver = class CodeActionKeybindingResolver {
     static { CodeActionKeybindingResolver_1 = this; }

package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js

@@ -9,8 +9,8 @@ import './lightBulbWidget.css.js';
 import { computeIndentLevel } from '../../../common/model/utils.js';
 import { autoFixCommandId, quickFixCommandId } from './codeAction.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 var LightBulbWidget_1;
 var LightBulbState;
 ( (function(LightBulbState) {

package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js

@@ -5,7 +5,8 @@ import { Range } from '../../../common/core/range.js';
 import { CodeLensModel } from './codelens.js';
 import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
 import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
-import { WillSaveStateReason, IStorageService } from '../../../../platform/storage/common/storage.js';
+import { WillSaveStateReason } from '../../../../platform/storage/common/storage.js';
+import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { mainWindow } from '../../../../base/browser/window.js';
 import { runWhenWindowIdle } from '../../../../base/browser/dom.js';
 const ICodeLensCache = ( createDecorator('ICodeLensCache'));

package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js

@@ -10,9 +10,9 @@ import { getCodeLensModel } from './codelens.js';
 import { ICodeLensCache } from './codeLensCache.js';
 import { CodeLensWidget, CodeLensHelper } from './codelensWidget.js';
 import { localizeWithPath } from '../../../../nls.js';
-import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { INotificationService } from '../../../../platform/notification/common/notification.js';
-import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.js';
+import { ICommandService } from '../../../../platform/commands/common/commands.service.js';
+import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
+import { IQuickInputService } from '../../../../platform/quickinput/common/quickInput.service.js';
 import { ILanguageFeatureDebounceService } from '../../../common/services/languageFeatureDebounce.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 let CodeLensContribution = class CodeLensContribution {

package/vscode/src/vs/editor/contrib/colorPicker/browser/color.js

@@ -6,7 +6,7 @@ import { IModelService } from '../../../common/services/model.js';
 import { CommandsRegistry } from '../../../../platform/commands/common/commands.js';
 import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
 import { DefaultDocumentColorProvider } from './defaultDocumentColorProvider.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 async function getColors(colorProviderRegistry, model, token, isDefaultColorDecoratorsEnabled = true) {
     return _findColorData(( new ColorDataCollector()), colorProviderRegistry, model, token, isDefaultColorDecoratorsEnabled);
 }