@codingame/monaco-vscode-view-common-service-override 12.0.0 → 13.0.0

package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpener.contribution.js

@@ -1,10 +1,10 @@
 
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { externalUriOpenersConfigurationNode } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/extensions';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { externalUriOpenersConfigurationNode } from '@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common/vscode/vs/workbench/contrib/externalUriOpener/common/configuration';
 import '@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common/vscode/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService';
-import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 
 ( Registry.as(Extensions.Configuration))
     .registerConfiguration(externalUriOpenersConfigurationNode);

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

@@ -1,6 +1,6 @@
 
-import { registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
-import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { LanguageStatusContribution, ResetAction } from './languageStatus.js';
 
 registerWorkbenchContribution2(LanguageStatusContribution.Id, LanguageStatusContribution, WorkbenchPhase.AfterRestored);

package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.d.ts

@@ -1,8 +1,8 @@
-import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
-import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
-import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
-import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
-import { IEditorGroupsService } from "vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 export declare class LanguageStatusContribution extends Disposable implements IWorkbenchContribution {
     private readonly editorGroupService;
     static readonly Id = "status.languageStatus";

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

@@ -1,35 +1,35 @@
 
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import './media/languageStatus.css.js';
-import { getWindow, isHTMLElement, addDisposableListener, append } from 'vscode/vscode/vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
-import { Disposable, DisposableStore, dispose, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import Severity from 'vscode/vscode/vs/base/common/severity';
-import { getCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { localize, localize2 } from 'vscode/vscode/vs/nls';
-import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ILanguageStatusService } from 'vscode/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
-import { ShowTooltipCommand, StatusbarAlignment } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
-import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
-import { parseLinkedText } from 'vscode/vscode/vs/base/common/linkedText';
-import { Link } from 'vscode/vscode/vs/platform/opener/browser/link';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { MarkdownString } from 'vscode/vscode/vs/base/common/htmlContent';
-import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
-import { Action } from 'vscode/vscode/vs/base/common/actions';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { equals } from 'vscode/vscode/vs/base/common/arrays';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
-import { IEditorGroupsService } from 'vscode/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
-import { nativeHoverDelegate } from 'vscode/vscode/vs/platform/hover/browser/hover';
-import { IHoverService } from 'vscode/vscode/vs/platform/hover/browser/hover.service';
-import { Event } from 'vscode/vscode/vs/base/common/event';
-import { joinStrings } from 'vscode/vscode/vs/base/common/strings';
+import { getWindow, isHTMLElement, addDisposableListener, append } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { Disposable, DisposableStore, dispose, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ILanguageStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
+import { ShowTooltipCommand, StatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
+import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
+import { parseLinkedText } from '@codingame/monaco-vscode-api/vscode/vs/base/common/linkedText';
+import { Link } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/browser/link';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { ActionBar } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
+import { equals } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
+import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
+import { nativeHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover';
+import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { joinStrings } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 
 var LanguageStatus_1;
 class LanguageStatusViewModel {

package/vscode/src/vs/workbench/contrib/languageStatus/browser/media/languageStatus.css.js

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
+import n from '@codingame/monaco-vscode-api/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = "@keyframes wiggle{0%{transform:rotate(0) scale(1)}15%,45%{transform:rotate(.04turn) scale(1.1)}30%,60%{transform:rotate(-.04turn) scale(1.2)}to{transform:rotate(0) scale(1)}}.monaco-workbench .statusbar DIV#status\\.languageStatus A>SPAN.codicon.wiggle{animation-duration:.8s;animation-iteration-count:1;animation-name:wiggle}@keyframes flash{0%{background-color:initial}50%{background-color:var(--vscode-statusBarItem-prominentBackground)}to{background-color:initial}}.monaco-workbench .statusbar DIV#status\\.languageStatus.flash A{animation-duration:.8s;animation-iteration-count:1;animation-name:flash}.monaco-workbench .hover-language-status{display:flex}.monaco-workbench .hover-language-status:not(:last-child){border-bottom:1px solid var(--vscode-notifications-border)}.monaco-workbench .hover-language-status>.severity{display:none;flex:1;margin:auto;padding-right:8px}.monaco-workbench .hover-language-status>.severity.sev3{color:var(--vscode-notificationsErrorIcon-foreground)}.monaco-workbench .hover-language-status>.severity.sev2{color:var(--vscode-notificationsInfoIcon-foreground)}.monaco-workbench .hover-language-status>.severity.show{display:inherit}.monaco-workbench .hover-language-status>.element{display:flex;flex-grow:100;justify-content:space-between;vertical-align:middle}.monaco-workbench .hover-language-status>.element>.left>.detail:not(:empty):before{content:\"\\2013\";opacity:.6;padding:0 4px}.monaco-workbench .hover-language-status>.element>.left>.label:empty{display:none}.monaco-workbench .hover-language-status>.element .left{margin:auto 0}.monaco-workbench .hover-language-status>.element .right{display:flex;margin:auto 0}.monaco-workbench .hover-language-status>.element .right:not(:empty){padding-left:16px}.monaco-workbench .hover-language-status>.element .right .monaco-link{margin:auto 0;text-decoration:var(--text-link-decoration);white-space:nowrap}.monaco-workbench .hover-language-status>.element .right .monaco-action-bar:not(:first-child){padding-left:8px}";
 n(css,{});

package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.d.ts

@@ -1,8 +1,8 @@
-import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
-import { IEditorService } from "vscode/vscode/vs/workbench/services/editor/common/editorService.service";
-import { ILanguageStatusService } from "vscode/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service";
-import { IWorkbenchContribution } from "vscode/vscode/vs/workbench/common/contributions";
-import { Event } from "vscode/vscode/vs/base/common/event";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
+import { ILanguageStatusService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service";
+import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
+import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event";
 export declare class LimitIndicatorContribution extends Disposable implements IWorkbenchContribution {
     constructor(editorService: IEditorService, languageStatusService: ILanguageStatusService);
 }

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

@@ -1,16 +1,16 @@
 
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import Severity from 'vscode/vscode/vs/base/common/severity';
-import { getCodeEditor } from 'vscode/vscode/vs/editor/browser/editorBrowser';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
-import { ILanguageStatusService } from 'vscode/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
-import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { localize } from 'vscode/vscode/vs/nls';
-import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/browser/folding';
-import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { ILanguageStatusService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/languageStatus/common/languageStatusService.service';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { FoldingController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/folding/browser/folding';
+import { ColorDetector } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
 
 const openSettingsCommand = 'workbench.action.openSettings';
 const configureSettingsLabel = ( localize(6945, "Configure"));

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.d.ts

@@ -1,6 +1,6 @@
-import { Action2, IAction2Options } from "vscode/vscode/vs/platform/actions/common/actions";
-import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
-import { IEditorIdentifier } from "vscode/vscode/vs/workbench/common/editor";
+import { Action2, IAction2Options } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IEditorIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { MergeEditorInput } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput";
 import { IMergeEditorInputModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel";
 import { MergeEditorViewModel } from "../view/viewModel.js";

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js

@@ -1,18 +1,18 @@
 
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { basename } from 'vscode/vscode/vs/base/common/resources';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localize2, localize } from 'vscode/vscode/vs/nls';
-import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
-import { StorageScope } from 'vscode/vscode/vs/platform/storage/common/storage';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
+import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
+import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { MergeEditorInputData } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxMergeEditorLayout, ctxIsMergeEditor, ctxMergeEditorShowNonConflictingChanges, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, StorageCloseWithConflicts } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 class MergeEditorAction extends Action2 {
     constructor(desc) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.d.ts

@@ -1,6 +1,6 @@
-import { URI } from "vscode/vscode/vs/base/common/uri";
-import { Action2 } from "vscode/vscode/vs/platform/actions/common/actions";
-import { ServicesAccessor } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { Action2 } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { ServicesAccessor } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare class MergeEditorCopyContentsToJSON extends Action2 {
     constructor();
     run(accessor: ServicesAccessor): void;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -1,18 +1,18 @@
 
-import { VSBuffer } from 'vscode/vscode/vs/base/common/buffer';
-import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
-import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import { localize2, localize } from 'vscode/vscode/vs/nls';
-import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService.service';
-import { IFileDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
-import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { IQuickInputService } from 'vscode/vscode/vs/platform/quickinput/common/quickInput.service';
+import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language';
+import { localize2, localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
+import { IFileDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
+import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 const MERGE_EDITOR_CATEGORY = ( localize2(7168, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {

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

@@ -1,17 +1,17 @@
 
-import { localize } from 'vscode/vscode/vs/nls';
-import { registerAction2 } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerAction2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configurationRegistry';
+import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
+import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { EditorPaneDescriptor } from '@codingame/monaco-vscode-9e888134-1a6f-58d9-b0e6-0fc047448366-common/vscode/vs/workbench/browser/editor';
-import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } from 'vscode/vscode/vs/workbench/common/contributions';
-import { EditorExtensions } from 'vscode/vscode/vs/workbench/common/editor';
+import { Extensions as Extensions$1, registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
+import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { OpenResultResource, SetMixedLayout, SetColumnLayout, OpenMergeEditor, OpenBaseFile, ShowNonConflictingChanges, ShowHideBase, ShowHideTopBase, ShowHideCenterBase, GoToNextUnhandledConflict, GoToPreviousUnhandledConflict, ToggleActiveConflictInput1, ToggleActiveConflictInput2, CompareInput1WithBaseCommand, CompareInput2WithBaseCommand, AcceptAllInput1, AcceptAllInput2, ResetToBaseAndAutoMergeCommand, AcceptMerge, ResetCloseWithConflictsChoice } from './commands/commands.js';
 import { MergeEditorCopyContentsToJSON, MergeEditorSaveContentsToFolder, MergeEditorLoadContentsFromFolder } from './commands/devCommands.js';
 import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from './view/mergeEditor.js';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
+import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(7177, "Merge Editor"))), [

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.d.ts

@@ -1,6 +1,6 @@
-import { URI } from "vscode/vscode/vs/base/common/uri";
-import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
-import { IEditorSerializer } from "vscode/vscode/vs/workbench/common/editor";
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IEditorSerializer } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { MergeEditorInput } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput";
 export declare class MergeEditorSerializer implements IEditorSerializer {
     canSerialize(): boolean;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorSerializer.js

@@ -1,6 +1,6 @@
 
-import { onUnexpectedError } from 'vscode/vscode/vs/base/common/errors';
-import { parse } from 'vscode/vscode/vs/base/common/marshalling';
+import { onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { MergeEditorInput, MergeEditorInputData } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
 
 class MergeEditorSerializer {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js

@@ -1,16 +1,16 @@
 
-import { localize } from 'vscode/vscode/vs/nls';
-import { registerColor, transparent } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
-import 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
-import { mergeCurrentHeaderBackground, mergeIncomingHeaderBackground } from 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
-import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { registerColor, transparent } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colorUtils';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/baseColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/chartsColors';
+import { mergeCurrentHeaderBackground, mergeIncomingHeaderBackground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/editorColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/inputColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/listColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/menuColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/minimapColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 
 registerColor('mergeEditor.change.background', '#9bb95533', ( localize(7212, 'The background color for changes.')));
 registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(7213, 'The background color for word changes.')));

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.d.ts

@@ -1,6 +1,6 @@
-import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
-import { IReader } from "vscode/vscode/vs/base/common/observable";
-import { CodeEditorWidget } from "vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget";
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IReader } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { CodeEditorWidget } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget";
 import { LineRange } from "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange";
 export declare class EditorGutter<T extends IGutterItemInfo = IGutterItemInfo> extends Disposable {
     private readonly _editor;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editorGutter.js

@@ -1,13 +1,13 @@
 
-import { h, reset } from 'vscode/vscode/vs/base/browser/dom';
-import { Disposable, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { transaction } from 'vscode/vscode/vs/base/common/observableInternal/base';
-import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/event';
-import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import 'vscode/vscode/vs/base/common/observableInternal/derived';
-import 'vscode/vscode/vs/base/common/cancellation';
-import { observableFromEvent, observableSignalFromEvent, observableSignal } from 'vscode/vscode/vs/base/common/observableInternal/utils';
+import { h, reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { transaction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { observableFromEvent, observableSignalFromEvent, observableSignal } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
 import { LineRange } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 
 class EditorGutter extends Disposable {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.d.ts

@@ -1,6 +1,6 @@
-import { IObservable } from "vscode/vscode/vs/base/common/observable";
-import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
-import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { MergeEditorViewModel } from "../viewModel.js";
 import { CodeEditorView } from "./codeEditorView.js";
 export declare class BaseCodeEditorView extends CodeEditorView {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js

@@ -1,20 +1,20 @@
 
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
-import { reset, h } from 'vscode/vscode/vs/base/browser/dom';
-import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
-import { BugIndicatingError } from 'vscode/vscode/vs/base/common/errors';
-import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/base/common/event';
-import 'vscode/vscode/vs/base/common/lifecycle';
-import { autorunWithStore, autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
-import 'vscode/vscode/vs/base/common/cancellation';
-import 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { MinimapPosition, OverviewRulerLane } from 'vscode/vscode/vs/editor/common/model';
-import { localize } from 'vscode/vscode/vs/nls';
-import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { reset, h } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { renderLabelWithIcons } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { MinimapPosition, OverviewRulerLane } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
+import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
+import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { applyObservableDecorations } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.d.ts

@@ -1,14 +1,14 @@
 import { IView } from "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid";
-import { Disposable, IDisposable } from "vscode/vscode/vs/base/common/lifecycle";
-import { IObservable } from "vscode/vscode/vs/base/common/observable";
-import { IEditorContributionDescription } from "vscode/vscode/vs/editor/browser/editorExtensions";
-import { CodeEditorWidget } from "vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget";
-import { IEditorOptions } from "vscode/vscode/vs/editor/common/config/editorOptions";
-import { Range } from "vscode/vscode/vs/editor/common/core/range";
-import { Selection } from "vscode/vscode/vs/editor/common/core/selection";
-import { MenuId } from "vscode/vscode/vs/platform/actions/common/actions";
-import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
-import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IEditorContributionDescription } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions";
+import { CodeEditorWidget } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget";
+import { IEditorOptions } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/config/editorOptions";
+import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
+import { Selection } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection";
+import { MenuId } from "@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { MergeEditorViewModel } from "../viewModel.js";
 export declare abstract class CodeEditorView extends Disposable {
     private readonly instantiationService;
@@ -33,7 +33,7 @@ export declare abstract class CodeEditorView extends Disposable {
     readonly editor: CodeEditorWidget;
     updateOptions(newOptions: Readonly<IEditorOptions>): void;
     readonly isFocused: IObservable<boolean, unknown>;
-    readonly cursorPosition: IObservable<import("vscode/vscode/vs/editor/common/core/position").Position | null, unknown>;
+    readonly cursorPosition: IObservable<import("@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position").Position | null, unknown>;
     readonly selection: IObservable<Selection[] | null, unknown>;
     readonly cursorLineNumber: IObservable<number | undefined, unknown>;
     constructor(instantiationService: IInstantiationService, viewModel: IObservable<undefined | MergeEditorViewModel>, configurationService: IConfigurationService);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/codeEditorView.js

@@ -1,23 +1,23 @@
 
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
-import { h } from 'vscode/vscode/vs/base/browser/dom';
-import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import 'vscode/vscode/vs/base/common/arrays';
-import { autorun } from 'vscode/vscode/vs/base/common/observableInternal/autorun';
-import { derived } from 'vscode/vscode/vs/base/common/observableInternal/derived';
-import 'vscode/vscode/vs/base/common/cancellation';
-import { observableFromEvent } from 'vscode/vscode/vs/base/common/observableInternal/utils';
-import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
-import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
-import { Selection } from 'vscode/vscode/vs/editor/common/core/selection';
-import { CodeLensContribution } from 'vscode/vscode/vs/editor/contrib/codelens/browser/codelensController';
-import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/browser/folding';
-import { MenuWorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
-import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from 'vscode/vscode/vs/workbench/browser/parts/editor/editor';
+import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { h } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
+import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/derived';
+import '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
+import { observableFromEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils';
+import { EditorExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorExtensions';
+import { CodeEditorWidget } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
+import { Selection } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/selection';
+import { CodeLensContribution } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/codelens/browser/codelensController';
+import { FoldingController } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/folding/browser/folding';
+import { MenuWorkbenchToolBar } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/browser/toolbar';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { DEFAULT_EDITOR_MIN_DIMENSIONS, DEFAULT_EDITOR_MAX_DIMENSIONS } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/editor';
 import { setStyle } from '@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
-import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
+import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 
 class CodeEditorView extends Disposable {
     updateOptions(newOptions) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.d.ts

@@ -1,9 +1,9 @@
-import { IAction } from "vscode/vscode/vs/base/common/actions";
-import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
-import { IObservable, ITransaction } from "vscode/vscode/vs/base/common/observable";
-import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
-import { IContextMenuService } from "vscode/vscode/vs/platform/contextview/browser/contextView.service";
-import { IInstantiationService } from "vscode/vscode/vs/platform/instantiation/common/instantiation";
+import { IAction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/actions";
+import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
+import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
+import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { InputState, ModifiedBaseRange } from "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
 import { MergeEditorViewModel } from "../viewModel.js";
 import { IGutterItemInfo, IGutterItemView } from "../editorGutter.js";