@codingame/monaco-vscode-scm-service-override 1.85.6 → 2.0.0-v2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "1.85.6",
+  "version": "2.0.0-v2.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -9,7 +9,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CodinGame/monaco-vscode-api.git"
+    "url": "git@github.com:CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
   "private": false,
@@ -18,7 +18,7 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@1.85.6",
-    "monaco-editor": "0.45.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@2.0.0-v2.1",
+    "vscode-marked": "npm:marked@=3.0.2"
   }
 }

package/scm.js

@@ -4,7 +4,7 @@ import { SCMViewService } from './vscode/src/vs/workbench/contrib/scm/browser/sc
 import { IQuickDiffService } from 'vscode/vscode/vs/workbench/contrib/scm/common/quickDiff';
 import { QuickDiffService } from './vscode/src/vs/workbench/contrib/scm/common/quickDiffService.js';
 import './vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
 
 function getServiceOverride() {
     return {

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

@@ -1,18 +1,18 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { Disposable, MutableDisposable, DisposableStore, combinedDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { basename } from 'vscode/vscode/vs/base/common/resources';
+import { Disposable, MutableDisposable, DisposableStore, combinedDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Event } from 'vscode/vscode/vs/base/common/event';
 import { VIEW_PANE_ID, ISCMService, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { NumberBadge, IActivityService } from 'vscode/vscode/vs/workbench/services/activity/common/activity';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { EditorResourceAccessor } from 'vscode/vscode/vs/workbench/common/editor';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
 
 function getCount(repository) {
     if (typeof repository.provider.count === 'number') {

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { DisposableStore, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { MenuRegistry, MenuId, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { createAndFillInActionBarActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { DisposableStore, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { MenuRegistry, MenuId, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
-import { equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
+import { equals } from 'vscode/vscode/vs/base/common/arrays';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
 
 function actionEquals(a, b) {
     return a.id === b.id;

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

@@ -1,24 +1,24 @@
-import { localizeWithPath, localize2WithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import { DirtyDiffWorkbenchController } from 'vscode/vscode/vs/workbench/contrib/scm/browser/dirtydiffDecorator';
 import { VIEWLET_ID, VIEW_PANE_ID, REPOSITORIES_VIEW_PANE_ID, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
-import { MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
+import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { SCMActiveResourceContextKeyController, SCMStatusController } from './activity.js';
-import { Extensions as Extensions$2 } from 'monaco-editor/esm/vs/platform/configuration/common/configurationRegistry.js';
-import { ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { ICommandService, CommandsRegistry } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { KeybindingsRegistry } from 'monaco-editor/esm/vs/platform/keybinding/common/keybindingsRegistry.js';
+import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
+import { ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { ICommandService, CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
 import { SCMViewPaneContainer } from './scmViewPaneContainer.js';
-import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
-import { ModesRegistry } from 'monaco-editor/esm/vs/editor/common/languages/modesRegistry.js';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
+import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import { ModesRegistry } from 'vscode/vscode/vs/editor/common/languages/modesRegistry';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
 import { SCMViewPane } from './scmViewPane.js';
 import { SCMRepositoriesViewPane } from './scmRepositoriesViewPane.js';
-import { Context } from 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggest.js';
-import { getActiveElement } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { Context } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggest';
+import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 
 ModesRegistry.registerLanguage({
     id: 'scminput',

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

@@ -1,25 +1,25 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { Event } from 'monaco-editor/esm/vs/base/common/event.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { Event } from 'vscode/vscode/vs/base/common/event';
 import { ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { append, $ } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
 import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { WorkbenchList } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { RepositoryRenderer } from './scmRepositoryRenderer.js';
 import { getActionViewItemProvider, collectContextMenuActions } from './util.js';
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
 
 class ListDelegate {
     getHeight() {

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

@@ -1,14 +1,14 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { combinedDisposable, DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { append, $ } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { combinedDisposable, DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { append, $ } from 'vscode/vscode/vs/base/browser/dom';
 import { ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
-import { CountBadge } from 'monaco-editor/esm/vs/base/browser/ui/countBadge/countBadge.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
+import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { isSCMRepository, connectPrimaryMenu, StatusBarAction } from './util.js';
-import { ToolBar } from 'monaco-editor/esm/vs/base/browser/ui/toolbar/toolbar.js';
-import { defaultCountBadgeStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
+import { ToolBar } from 'vscode/vscode/vs/base/browser/ui/toolbar/toolbar';
+import { defaultCountBadgeStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
 
 var RepositoryRenderer_1;
 let RepositoryRenderer = class RepositoryRenderer {

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

@@ -1,89 +1,89 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { Event, Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { basename, dirname } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, DisposableMap, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
+import { Event, Emitter } from 'vscode/vscode/vs/base/common/event';
+import { basename, dirname } from 'vscode/vscode/vs/base/common/resources';
+import { Disposable, DisposableStore, toDisposable, combinedDisposable, MutableDisposable, DisposableMap, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { ViewAction, ViewPane } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPane';
-import { append, $, asCSSUrl, prepend, Dimension, trackFocus, clearNode } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { append, $, asCSSUrl, prepend, Dimension, trackFocus, clearNode } from 'vscode/vscode/vs/base/browser/dom';
 import { VIEW_PANE_ID, SCMInputChangeReason, ISCMViewService, ISCMService, REPOSITORIES_VIEW_PANE_ID } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
-import { CountBadge } from 'monaco-editor/esm/vs/base/browser/ui/countBadge/countBadge.js';
+import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IContextMenuService, IContextViewService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
-import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
-import { MenuId, MenuRegistry, registerAction2, MenuItemAction, Action2, IMenuService } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
-import { Action, Separator, ActionRunner } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { ActionBar } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionbar.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IContextMenuService, IContextViewService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { RawContextKey, ContextKeyExpr, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands';
+import { IKeybindingService } from 'vscode/vscode/vs/platform/keybinding/common/keybinding';
+import { MenuId, MenuRegistry, registerAction2, MenuItemAction, Action2, IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { Action, Separator, ActionRunner } from 'vscode/vscode/vs/base/common/actions';
+import { ActionBar } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionbar';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { connectPrimaryMenuToInlineActionBar, getActionViewItemProvider, isSCMRepository, isSCMResourceGroup, isSCMResourceNode, isSCMHistoryItemChangeNode, isSCMInput, isSCMActionButton, isSCMResource, isSCMHistoryItemGroupTreeElement, isSCMHistoryItemTreeElement, isSCMHistoryItemChangeTreeElement, toDiffEditorArguments, collectContextMenuActions, isSCMViewService, isSCMViewSeparator } from './util.js';
-import { WorkbenchCompressibleAsyncDataTree } from 'monaco-editor/esm/vs/platform/list/browser/listService.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from 'monaco-editor/esm/vs/base/common/async.js';
+import { WorkbenchCompressibleAsyncDataTree } from 'vscode/vscode/vs/platform/list/browser/listService';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { disposableTimeout, ThrottledDelayer, Sequencer, Throttler } from 'vscode/vscode/vs/base/common/async';
 import { ResourceTree } from 'vscode/vscode/vs/base/common/resourceTree';
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { FileKind } from 'monaco-editor/esm/vs/platform/files/common/files.js';
-import { comparePaths, compareFileNames } from 'monaco-editor/esm/vs/base/common/comparers.js';
-import { createMatches } from 'monaco-editor/esm/vs/base/common/filters.js';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { FileKind } from 'vscode/vscode/vs/platform/files/common/files';
+import { comparePaths, compareFileNames } from 'vscode/vscode/vs/base/common/comparers';
+import { createMatches } from 'vscode/vscode/vs/base/common/filters';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { flatten } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { flatten } from 'vscode/vscode/vs/base/common/arrays';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { EditorResourceAccessor, SideBySideEditor } from 'vscode/vscode/vs/workbench/common/editor';
 import { PANEL_BACKGROUND, SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
-import { CodeEditorWidget } from 'monaco-editor/esm/vs/editor/browser/widget/codeEditorWidget.js';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditorWidget';
 import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
-import { IModelService } from 'monaco-editor/esm/vs/editor/common/services/model.js';
-import { EditorExtensionsRegistry } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
+import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
+import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { MenuPreventer } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/menuPreventer';
 import { SelectionClipboardContributionID } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/selectionClipboard';
-import { ContextMenuController } from 'monaco-editor/esm/vs/editor/contrib/contextmenu/browser/contextmenu.js';
-import * as platform from 'monaco-editor/esm/vs/base/common/platform.js';
-import { format, compare } from 'monaco-editor/esm/vs/base/common/strings.js';
-import { SuggestController } from 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggestController.js';
-import { SnippetController2 } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetController2.js';
-import { ServiceCollection } from 'monaco-editor/esm/vs/platform/instantiation/common/serviceCollection.js';
-import { ModesHoverController } from 'monaco-editor/esm/vs/editor/contrib/hover/browser/hover.js';
-import { ColorDetector } from 'monaco-editor/esm/vs/editor/contrib/colorPicker/browser/colorDetector.js';
-import { LinkDetector } from 'monaco-editor/esm/vs/editor/contrib/links/browser/links.js';
-import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
-import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
-import { ILabelService } from 'monaco-editor/esm/vs/platform/label/common/label.js';
+import { ContextMenuController } from 'vscode/vscode/vs/editor/contrib/contextmenu/browser/contextmenu';
+import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
+import { format, compare } from 'vscode/vscode/vs/base/common/strings';
+import { SuggestController } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggestController';
+import { SnippetController2 } from 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
+import { ServiceCollection } from 'vscode/vscode/vs/platform/instantiation/common/serviceCollection';
+import { ModesHoverController } from 'vscode/vscode/vs/editor/contrib/hover/browser/hover';
+import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
+import { LinkDetector } from 'vscode/vscode/vs/editor/contrib/links/browser/links';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
+import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
+import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { DEFAULT_FONT_FAMILY } from 'vscode/vscode/vs/workbench/browser/style';
-import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
-import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
+import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
+import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { RepositoryRenderer } from './scmRepositoryRenderer.js';
-import { ColorScheme } from 'monaco-editor/esm/vs/platform/theme/common/theme.js';
+import { ColorScheme } from 'vscode/vscode/vs/platform/theme/common/theme';
 import { API_OPEN_EDITOR_COMMAND_ID, API_OPEN_DIFF_EDITOR_COMMAND_ID } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorCommands';
-import { createActionViewItem, createAndFillInContextMenuActions, createAndFillInActionBarActions } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { MarkdownRenderer, openLinkFromMarkdown } from 'monaco-editor/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer.js';
-import { ButtonWithDropdown, Button } from 'monaco-editor/esm/vs/base/browser/ui/button/button.js';
-import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
+import { createActionViewItem, createAndFillInContextMenuActions, createAndFillInActionBarActions } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { MarkdownRenderer, openLinkFromMarkdown } from 'vscode/vscode/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
+import { ButtonWithDropdown, Button } from 'vscode/vscode/vs/base/browser/ui/button/button';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
 import { RepositoryContextKeys } from './scmViewService.js';
-import { DragAndDropController } from 'monaco-editor/esm/vs/editor/contrib/dnd/browser/dnd.js';
-import { DropIntoEditorController } from 'monaco-editor/esm/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js';
-import { MessageController } from 'monaco-editor/esm/vs/editor/contrib/message/browser/messageController.js';
-import { defaultCountBadgeStyles, defaultButtonStyles } from 'monaco-editor/esm/vs/platform/theme/browser/defaultStyles.js';
-import { InlineCompletionsController } from 'monaco-editor/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js';
-import { CodeActionController } from 'monaco-editor/esm/vs/editor/contrib/codeAction/browser/codeActionController.js';
-import { ITextModelService } from 'monaco-editor/esm/vs/editor/common/services/resolverService.js';
-import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
+import { DragAndDropController } from 'vscode/vscode/vs/editor/contrib/dnd/browser/dnd';
+import { DropIntoEditorController } from 'vscode/vscode/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController';
+import { MessageController } from 'vscode/vscode/vs/editor/contrib/message/browser/messageController';
+import { defaultCountBadgeStyles, defaultButtonStyles } from 'vscode/vscode/vs/platform/theme/browser/defaultStyles';
+import { InlineCompletionsController } from 'vscode/vscode/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController';
+import { CodeActionController } from 'vscode/vscode/vs/editor/contrib/codeAction/browser/codeActionController';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { fillEditorsDragData } from 'vscode/vscode/vs/workbench/browser/dnd';
-import { CodeDataTransfers } from 'monaco-editor/esm/vs/platform/dnd/browser/dnd.js';
-import { FormatOnType } from 'monaco-editor/esm/vs/editor/contrib/format/browser/formatActions.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
-import { EditOperation } from 'monaco-editor/esm/vs/editor/common/core/editOperation.js';
-import { stripIcons } from 'monaco-editor/esm/vs/base/common/iconLabels.js';
-import { IconLabel } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabel.js';
-import { registerColor, transparent, foreground, listActiveSelectionForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
-import { WorkbenchToolBar } from 'monaco-editor/esm/vs/platform/actions/browser/toolbar.js';
-import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
+import { CodeDataTransfers } from 'vscode/vscode/vs/platform/dnd/browser/dnd';
+import { FormatOnType } from 'vscode/vscode/vs/editor/contrib/format/browser/formatActions';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
+import { EditOperation } from 'vscode/vscode/vs/editor/common/core/editOperation';
+import { stripIcons } from 'vscode/vscode/vs/base/common/iconLabels';
+import { IconLabel } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabel';
+import { registerColor, transparent, foreground, listActiveSelectionForeground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
+import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/toolbar';
+import { CancellationTokenSource } from 'vscode/vscode/vs/base/common/cancellation';
 import { DropdownWithPrimaryActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem';
-import { clamp } from 'monaco-editor/esm/vs/base/common/numbers.js';
+import { clamp } from 'vscode/vscode/vs/base/common/numbers';
 
 var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemRenderer_1, HistoryItemChangeRenderer_1, SCMInputWidget_1;
 registerColor('scm.historyItemAdditionsForeground', {
@@ -1703,7 +1703,7 @@ let SCMInputWidget = class SCMInputWidget {
         updatePlaceholderVisibility();
         const updatePlaceholderText = () => {
             const binding = this.keybindingService.lookupKeybinding('scm.acceptInput');
-            const label = binding ? binding.getLabel() : (platform.isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter');
+            const label = binding ? binding.getLabel() : (isMacintosh ? 'Cmd+Enter' : 'Ctrl+Enter');
             const placeholderText = format(input.placeholder, label);
             this.inputEditor.updateOptions({ ariaLabel: placeholderText });
             this.placeholderTextContainer.textContent = placeholderText;

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

@@ -1,16 +1,16 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import './media/scm.css.js';
-import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
-import { ITelemetryService } from 'monaco-editor/esm/vs/platform/telemetry/common/telemetry.js';
+import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { VIEWLET_ID, ISCMViewService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
-import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
-import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { IContextMenuService } from 'vscode/vscode/vs/platform/contextview/browser/contextView';
+import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
 import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 import { IViewDescriptorService } from 'vscode/vscode/vs/workbench/common/views';
 import { ViewPaneContainer } from 'vscode/vscode/vs/workbench/browser/parts/views/viewPaneContainer';
 

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

@@ -1,18 +1,18 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
+import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
 import { ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
-import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { SCMMenus } from './menus.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { debounce } from 'monaco-editor/esm/vs/base/common/decorators.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
-import { comparePaths, compareFileNames } from 'monaco-editor/esm/vs/base/common/comparers.js';
-import { basename } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { binarySearch } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { IConfigurationService } from 'monaco-editor/esm/vs/platform/configuration/common/configuration.js';
-import { RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { debounce } from 'vscode/vscode/vs/base/common/decorators';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
+import { comparePaths, compareFileNames } from 'vscode/vscode/vs/base/common/comparers';
+import { basename } from 'vscode/vscode/vs/base/common/resources';
+import { binarySearch } from 'vscode/vscode/vs/base/common/arrays';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { RawContextKey, IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
 
 function getProviderStorageKey(provider) {
     return `${provider.contextValue}:${provider.label}${provider.rootUri ? `:${( provider.rootUri.toString())}` : ''}`;

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

@@ -1,10 +1,10 @@
-import * as path from 'monaco-editor/esm/vs/base/common/path.js';
-import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
-import { createAndFillInActionBarActions, createAndFillInContextMenuActions, createActionViewItem } from 'monaco-editor/esm/vs/platform/actions/browser/menuEntryActionViewItem.js';
-import { equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
-import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/actionViewItems.js';
-import { renderLabelWithIcons } from 'monaco-editor/esm/vs/base/browser/ui/iconLabel/iconLabels.js';
-import { reset } from 'monaco-editor/esm/vs/base/browser/dom.js';
+import { basename } from 'vscode/vscode/vs/base/common/path';
+import { Action } from 'vscode/vscode/vs/base/common/actions';
+import { createAndFillInActionBarActions, createAndFillInContextMenuActions, createActionViewItem } from 'vscode/vscode/vs/platform/actions/browser/menuEntryActionViewItem';
+import { equals } from 'vscode/vscode/vs/base/common/arrays';
+import { ActionViewItem } from 'vscode/vscode/vs/base/browser/ui/actionbar/actionViewItems';
+import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { reset } from 'vscode/vscode/vs/base/browser/dom';
 import { ResourceTree } from 'vscode/vscode/vs/base/common/resourceTree';
 
 function isSCMViewService(element) {
@@ -44,12 +44,12 @@ function isSCMViewSeparator(element) {
     return element.type === 'separator';
 }
 function toDiffEditorArguments(uri, originalUri, modifiedUri) {
-    const basename = path.basename(uri.fsPath);
+    const basename$1 = basename(uri.fsPath);
     const originalQuery = JSON.parse(originalUri.query);
     const modifiedQuery = JSON.parse(modifiedUri.query);
     const originalShortRef = originalQuery.ref.substring(0, 8).concat(originalQuery.ref.endsWith('^') ? '^' : '');
     const modifiedShortRef = modifiedQuery.ref.substring(0, 8).concat(modifiedQuery.ref.endsWith('^') ? '^' : '');
-    return [originalUri, modifiedUri, `${basename} (${originalShortRef}) ↔ ${basename} (${modifiedShortRef})`, null];
+    return [originalUri, modifiedUri, `${basename$1} (${originalShortRef}) ↔ ${basename$1} (${modifiedShortRef})`, null];
 }
 const compareActions = (a, b) => a.id === b.id && a.enabled === b.enabled;
 function connectPrimaryMenu(menu, callback, primaryGroup) {

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

@@ -1,9 +1,9 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { isEqualOrParent } from 'monaco-editor/esm/vs/base/common/resources.js';
-import { score } from 'monaco-editor/esm/vs/editor/common/languageSelector.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
-import { IUriIdentityService } from 'monaco-editor/esm/vs/platform/uriIdentity/common/uriIdentity.js';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { isEqualOrParent } from 'vscode/vscode/vs/base/common/resources';
+import { score } from 'vscode/vscode/vs/editor/common/languageSelector';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
+import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity';
 
 function createProviderComparer(uri) {
     return (a, b) => {

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

@@ -1,15 +1,15 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { DisposableStore, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
-import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
+import { DisposableStore, toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
+import { Emitter } from 'vscode/vscode/vs/base/common/event';
 import { SCMInputChangeReason } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
-import { ILogService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
-import { IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
-import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
-import { HistoryNavigator2 } from 'monaco-editor/esm/vs/base/common/history.js';
-import { ResourceMap } from 'monaco-editor/esm/vs/base/common/map.js';
-import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
-import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
-import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
+import { HistoryNavigator2 } from 'vscode/vscode/vs/base/common/history';
+import { ResourceMap } from 'vscode/vscode/vs/base/common/map';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { Iterable } from 'vscode/vscode/vs/base/common/iterator';
+import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace';
 
 class SCMInput {
     get value() {