@codingame/monaco-vscode-scm-service-override 3.2.2 → 4.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,6 +18,6 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@3.2.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
   }
 }

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

@@ -9,16 +9,20 @@ import { Extensions as Extensions$2 } from 'vscode/vscode/vs/platform/configurat
 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 { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
+import '../common/scmService.js';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/views';
 import { SCMViewPaneContainer } from './scmViewPaneContainer.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 './scmViewService.js';
 import { SCMRepositoriesViewPane } from './scmRepositoriesViewPane.js';
 import { Context } from 'vscode/vscode/vs/editor/contrib/suggest/browser/suggest';
 import { WorkspaceTrustContext, MANAGE_TRUST_COMMAND_ID } from 'vscode/vscode/vs/workbench/contrib/workspace/common/workspace';
+import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import '../common/quickDiffService.js';
 import { getActiveElement } from 'vscode/vscode/vs/base/browser/dom';
 
 ModesRegistry.registerLanguage({

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

@@ -4,7 +4,7 @@ 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 'vscode/vscode/vs/base/browser/dom';
+import { append, $, prepend, Dimension, trackFocus, clearNode, asCSSUrl } from 'vscode/vscode/vs/base/browser/dom';
 import { VIEW_PANE_ID, SCMInputChangeReason, ISCMViewService, ISCMService } from 'vscode/vscode/vs/workbench/contrib/scm/common/scm';
 import { ResourceLabels } from 'vscode/vscode/vs/workbench/browser/labels';
 import { CountBadge } from 'vscode/vscode/vs/base/browser/ui/countBadge/countBadge';
@@ -34,7 +34,7 @@ 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 'vscode/vscode/vs/editor/browser/widget/codeEditorWidget';
+import { CodeEditorWidget } from 'vscode/vscode/vs/editor/browser/widget/codeEditor/codeEditorWidget';
 import { getSimpleEditorOptions } from 'vscode/vscode/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions';
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { EditorExtensionsRegistry } from 'vscode/vscode/vs/editor/browser/editorExtensions';
@@ -54,7 +54,7 @@ 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 { DEFAULT_FONT_FAMILY } from 'vscode/vscode/vs/base/browser/fonts';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
 import { RepositoryRenderer, RepositoryActionRunner } from './scmRepositoryRenderer.js';
@@ -81,7 +81,17 @@ import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/commo
 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 { registerColor, transparent } from 'vscode/vscode/vs/platform/theme/common/colorUtils';
+import { foreground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
+import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
+import { listActiveSelectionForeground } from '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 { WorkbenchToolBar, MenuWorkbenchToolBar } 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';
@@ -292,6 +302,7 @@ let InputRenderer = class InputRenderer {
                 this.editorSelections.set(input, selections);
             }
         }));
+        templateData.inputWidgetHeight = InputRenderer_1.DEFAULT_HEIGHT;
         const onDidChangeContentHeight = () => {
             const contentHeight = templateData.inputWidget.getContentHeight();
             this.contentHeights.set(input, contentHeight);