@codingame/monaco-vscode-api 5.3.0 → 6.0.1

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -1,7 +1,7 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
-import { Extensions } from '../../../common/views.js';
+import { Extensions, ViewContainerLocation } from '../../../common/views.js';
 import { TUNNEL_VIEW_ID, TUNNEL_VIEW_CONTAINER_ID, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_FORWARD_SETTING } from '../../../services/remote/common/remoteExplorerService.js';
 import { IRemoteExplorerService } from '../../../services/remote/common/remoteExplorerService.service.js';
 import { OnPortForward, mapHasAddressLocalhostOrAllInterfaces, TunnelCloseReason, AutoTunnelSource, forwardedPortsViewEnabled, TunnelSource, makeAddress } from '../../../services/remote/common/tunnelModel.js';
@@ -9,15 +9,17 @@ import { OpenPortInPreviewAction, OpenPortInBrowserAction, openPreviewEnabledCon
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
 import { Registry } from '../../../../platform/registry/common/platform.js';
+import { StatusbarAlignment } from '../../../services/statusbar/browser/statusbar.js';
 import { IStatusbarService } from '../../../services/statusbar/browser/statusbar.service.js';
 import { UrlFinder } from './urlFinder.js';
 import Severity$1 from '../../../../base/common/severity.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
 import { ITerminalService } from '../../terminal/browser/terminal.service.js';
 import { IDebugService } from '../../debug/common/debug.service.js';
 import { IRemoteAgentService } from '../../../services/remote/common/remoteAgentService.service.js';
-import { isWeb } from '../../../../base/common/platform.js';
+import { isWeb, OperatingSystem } from '../../../../base/common/platform.js';
 import { TunnelPrivacyId } from '../../../../platform/tunnel/common/tunnel.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
@@ -33,6 +35,7 @@ import { ILogService } from '../../../../platform/log/common/log.service.js';
 import { IWorkbenchConfigurationService } from '../../../services/configuration/common/configuration.service.js';
 import { Action } from '../../../../base/common/actions.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
+import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 const _moduleId = "vs/workbench/contrib/remote/browser/remoteExplorer";
 const VIEWLET_ID = 'workbench.view.remote';
@@ -76,7 +79,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
             storageId: TUNNEL_VIEW_CONTAINER_ID,
             hideIfEmpty: true,
             order: 5
-        }, 1 );
+        }, ViewContainerLocation.Panel);
     }
     async enableForwardedPortsView() {
         this.contextKeyListener.clear();
@@ -130,7 +133,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     }
     updateStatusBar() {
         if (!this.entryAccessor) {
-            this._register(this.entryAccessor = this.statusbarService.addEntry(this.entry, 'status.forwardedPorts', 0 , 40));
+            this._register(this.entryAccessor = this.statusbarService.addEntry(this.entry, 'status.forwardedPorts', StatusbarAlignment.LEFT, 40));
         }
         else {
             this.entryAccessor.update(this.entry);
@@ -222,8 +225,8 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                 }
             }));
         });
-        if (!this.storageService.getBoolean('processPortForwardingFallback', 1 , true)) {
-            this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, 5 );
+        if (!this.storageService.getBoolean('processPortForwardingFallback', StorageScope.WORKSPACE, true)) {
+            this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, ConfigurationTarget.WORKSPACE);
         }
     }
     getPortAutoFallbackNumber() {
@@ -268,7 +271,7 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                             primary: [
                                 ( (new Action('switchBack', ( localizeWithPath(_moduleId, 9, "Undo")), undefined, true, async () => {
                                 await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS);
-                                await this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, 5 );
+                                await this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, ConfigurationTarget.WORKSPACE);
                                 this.portListener?.dispose();
                                 this.portListener = undefined;
                             }))),
@@ -295,7 +298,7 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
         this.procForwarder = undefined;
         this.outputForwarder?.dispose();
         this.outputForwarder = undefined;
-        if (environment?.os !== 3 ) {
+        if (environment?.os !== OperatingSystem.Linux) {
             if (this.configurationService.inspect(PORT_AUTO_SOURCE_SETTING).default?.value !== PORT_AUTO_SOURCE_SETTING_OUTPUT) {
                 ( (Registry.as(Extensions$1.Configuration)))
                     .registerDefaultConfigurations([{ overrides: { 'remote.autoForwardPortsSource': PORT_AUTO_SOURCE_SETTING_OUTPUT } }]);

package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js

@@ -8,6 +8,7 @@ import { IKeybindingService } from '../../../../platform/keybinding/common/keybi
 import { IContextViewService, IContextMenuService } from '../../../../platform/contextview/browser/contextView.service.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.service.js';
@@ -27,8 +28,9 @@ import { IRemoteExplorerService } from '../../../services/remote/common/remoteEx
 import { IClipboardService } from '../../../../platform/clipboard/common/clipboardService.service.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
-import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
+import { MessageType, InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { ViewPane } from '../../../browser/parts/views/viewPane.js';
@@ -36,7 +38,7 @@ import { URI } from '../../../../base/common/uri.js';
 import { TunnelProtocol, TunnelPrivacyId, isLocalhost, isAllInterfaces } from '../../../../platform/tunnel/common/tunnel.js';
 import { ITunnelService } from '../../../../platform/tunnel/common/tunnel.service.js';
 import { SyncDescriptor } from '../../../../platform/instantiation/common/descriptors.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { ActionViewItem } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { labelPortIcon, forwardPortIcon, stopForwardIcon, copyAddressIcon, openBrowserIcon, openPreviewIcon, privatePortIcon, forwardedPortWithProcessIcon, forwardedPortWithoutProcessIcon, portsViewIcon } from './remoteIcons.js';
@@ -471,7 +473,7 @@ let ActionBarRenderer = class ActionBarRenderer extends Disposable {
                     return {
                         content: message.content,
                         formatContent: true,
-                        type: message.severity === Severity$1.Error ? 3  : 1
+                        type: message.severity === Severity$1.Error ? MessageType.ERROR : MessageType.INFO
                     };
                 }
             },
@@ -496,23 +498,23 @@ let ActionBarRenderer = class ActionBarRenderer extends Disposable {
         const toDispose = [
             inputBox,
             addStandardDisposableListener(inputBox.inputElement, EventType.KEY_DOWN, async (e) => {
-                if (e.equals(3 )) {
+                if (e.equals(KeyCode.Enter)) {
                     e.stopPropagation();
-                    if (inputBox.validate() !== 3 ) {
+                    if (inputBox.validate() !== MessageType.ERROR) {
                         return done(true, true);
                     }
                     else {
                         return done(false, true);
                     }
                 }
-                else if (e.equals(9 )) {
+                else if (e.equals(KeyCode.Escape)) {
                     e.preventDefault();
                     e.stopPropagation();
                     return done(false, true);
                 }
             }),
             addDisposableListener(inputBox.inputElement, EventType.BLUR, () => {
-                return done(inputBox.validate() !== 3 , true);
+                return done(inputBox.validate() !== MessageType.ERROR, true);
             })
         ];
         return toDisposable(() => {
@@ -770,7 +772,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
                 updateActions();
                 this.registerPrivacyActions();
                 this.createTable();
-                this.table.layout(this.height, this.width);
+                this.table?.layout(this.height, this.width);
             }
         }));
     }
@@ -843,7 +845,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
         this.tableDisposables.add(this.table.onDidChangeSelection(e => this.onSelectionChanged(e)));
         this.tableDisposables.add(this.table.onDidFocus(() => this.tunnelViewFocusContext.set(true)));
         this.tableDisposables.add(this.table.onDidBlur(() => this.tunnelViewFocusContext.set(false)));
-        const rerender = () => this.table.splice(0, Number.POSITIVE_INFINITY, this.viewModel.all);
+        const rerender = () => this.table?.splice(0, Number.POSITIVE_INFINITY, this.viewModel.all);
         rerender();
         let lastPortCount = this.portCount;
         this.tableDisposables.add(Event.debounce(this.viewModel.onForwardedPortsChanged, (_last, e) => e, 50)(() => {
@@ -855,7 +857,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
             rerender();
         }));
         this.tableDisposables.add(this.table.onMouseClick(e => {
-            if (this.hasOpenLinkModifier(e.browserEvent)) {
+            if (this.hasOpenLinkModifier(e.browserEvent) && this.table) {
                 const selection = this.table.getSelectedElements();
                 if ((selection.length === 0) ||
                     ((selection.length === 1) && (selection[0] === e.element))) {
@@ -881,12 +883,12 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
             if (this.isEditing) {
                 widgetContainer.classList.add('highlight');
                 if (!e) {
-                    this.table.reveal(this.table.indexOf(this.viewModel.input));
+                    this.table?.reveal(this.table.indexOf(this.viewModel.input));
                 }
             }
             else {
                 if (e && (e.tunnel.tunnelType !== TunnelType.Add)) {
-                    this.table.setFocus(this.lastFocus);
+                    this.table?.setFocus(this.lastFocus);
                 }
                 this.focus();
             }
@@ -902,7 +904,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
     }
     focus() {
         super.focus();
-        this.table.domFocus();
+        this.table?.domFocus();
     }
     onFocusChanged(event) {
         if (event.indexes.length > 0 && event.elements.length > 0) {
@@ -960,7 +962,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
         event.browserEvent.stopPropagation();
         const node = event.element;
         if (node) {
-            this.table.setFocus([this.table.indexOf(node)]);
+            this.table?.setFocus([this.table.indexOf(node)]);
             this.tunnelTypeContext.set(node.tunnelType);
             this.tunnelCloseableContext.set(!!node.closeable);
             this.tunnelPrivacyContext.set(node.privacy.id);
@@ -977,7 +979,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
         this.contextMenuService.showContextMenu({
             menuId: MenuId.TunnelContext,
             menuActionOptions: { shouldForwardArgs: true },
-            contextKeyService: this.table.contextKeyService,
+            contextKeyService: this.table?.contextKeyService,
             getAnchor: () => event.anchor,
             getActionViewItem: (action) => {
                 const keybinding = this.keybindingService.lookupKeybinding(action.id);
@@ -990,7 +992,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
             },
             onHide: (wasCancelled) => {
                 if (wasCancelled) {
-                    this.table.domFocus();
+                    this.table?.domFocus();
                 }
             },
             getActionsContext: () => node?.strip(),
@@ -1006,7 +1008,7 @@ let TunnelPanel = class TunnelPanel extends ViewPane {
         this.height = height;
         this.width = width;
         super.layoutBody(height, width);
-        this.table.layout(height, width);
+        this.table?.layout(height, width);
     }
 };
 TunnelPanel = TunnelPanel_1 = ( (__decorate([
@@ -1516,7 +1518,7 @@ var SetTunnelProtocolAction;
             const attributes = {
                 protocol
             };
-            return remoteExplorerService.tunnelModel.configPortsAttributes.addAttributes(arg.remotePort, attributes, 4 );
+            return remoteExplorerService.tunnelModel.configPortsAttributes.addAttributes(arg.remotePort, attributes, ConfigurationTarget.USER_REMOTE);
         }
     }
     function handlerHttp() {
@@ -1541,11 +1543,11 @@ const isForwardedOrDetectedExpr = ( (ContextKeyExpr.or(
 const isNotMultiSelectionExpr = ( (TunnelViewMultiSelectionContextKey.isEqualTo(undefined)));
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: LabelTunnelAction.ID,
-    weight: 200  + tunnelViewCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + tunnelViewCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(TunnelViewFocusContextKey, isForwardedExpr, isNotMultiSelectionExpr))),
-    primary: 60 ,
+    primary: KeyCode.F2,
     mac: {
-        primary: 3
+        primary: KeyCode.Enter
     },
     handler: LabelTunnelAction.handler()
 });
@@ -1553,12 +1555,12 @@ CommandsRegistry.registerCommand(ForwardPortAction.INLINE_ID, ForwardPortAction.
 CommandsRegistry.registerCommand(ForwardPortAction.COMMANDPALETTE_ID, ForwardPortAction.commandPaletteHandler());
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: ClosePortAction.INLINE_ID,
-    weight: 200  + tunnelViewCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + tunnelViewCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(TunnelCloseableContextKey, TunnelViewFocusContextKey))),
-    primary: 20 ,
+    primary: KeyCode.Delete,
     mac: {
-        primary: 2048  | 1 ,
-        secondary: [20 ]
+        primary: KeyMod$1.CtrlCmd | KeyCode.Backspace,
+        secondary: [KeyCode.Delete]
     },
     handler: ClosePortAction.inlineHandler()
 });
@@ -1568,13 +1570,13 @@ CommandsRegistry.registerCommand(OpenPortInPreviewAction.ID, OpenPortInPreviewAc
 CommandsRegistry.registerCommand(OpenPortInBrowserCommandPaletteAction.ID, OpenPortInBrowserCommandPaletteAction.handler());
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: CopyAddressAction.INLINE_ID,
-    weight: 200  + tunnelViewCommandsWeightBonus,
+    weight: KeybindingWeight.WorkbenchContrib + tunnelViewCommandsWeightBonus,
     when: ( (ContextKeyExpr.and(
         TunnelViewFocusContextKey,
         isForwardedOrDetectedExpr,
         isNotMultiSelectionExpr
     ))),
-    primary: 2048  | 33 ,
+    primary: KeyMod$1.CtrlCmd | KeyCode.KeyC,
     handler: CopyAddressAction.inlineHandler()
 });
 CommandsRegistry.registerCommand(CopyAddressAction.COMMANDPALETTE_ID, CopyAddressAction.commandPaletteHandler());

package/vscode/src/vs/workbench/contrib/remote/browser/urlFinder.js

@@ -1,7 +1,7 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { removeAnsiEscapeCodes } from '../../../../base/common/strings.js';
 class UrlFinder extends Disposable {
-    static { this.terminalCodesRegex = /(?:\u001B|\u009B)[\[\]()#;?]*(?:(?:(?:[a-zA-Z0-9]*(?:;[a-zA-Z0-9]*)*)?\u0007)|(?:(?:\d{1,4}(?:;\d{0,4})*)?[0-9A-PR-TZcf-ntqry=><~]))/g; }
     static { this.localUrlRegex = /\b\w{0,20}(?::\/\/)?(?:localhost|127\.0\.0\.1|0\.0\.0\.0|:\d{2,5})[\w\-\.\~:\/\?\#[\]\@!\$&\(\)\*\+\,\;\=]*/gim; }
     static { this.extractPortRegex = /(localhost|127\.0\.0\.1|0\.0\.0\.0):(\d{1,5})/; }
     static { this.localPythonServerRegex = /HTTP\son\s(127\.0\.0\.1|0\.0\.0\.0)\sport\s(\d+)/; }
@@ -70,7 +70,7 @@ class UrlFinder extends Disposable {
         }
     }
     processData(data) {
-        data = data.replace(UrlFinder.terminalCodesRegex, '');
+        data = removeAnsiEscapeCodes(data);
         const urlMatches = data.match(UrlFinder.localUrlRegex) || [];
         if (urlMatches && urlMatches.length > 0) {
             urlMatches.forEach((match) => {

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

@@ -23,33 +23,37 @@ import '../../../../platform/theme/common/colors/minimapColors.js';
 import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
-import { isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
-import { registerEditorAction, registerEditorContribution, EditorAction } from '../../../../editor/browser/editorExtensions.js';
+import { MouseTargetType, isCodeEditor } from '../../../../editor/browser/editorBrowser.js';
+import { registerEditorAction, registerEditorContribution, EditorAction, EditorContributionInstantiation } from '../../../../editor/browser/editorExtensions.js';
 import { getOuterEditor, PeekViewWidget, peekViewBorder, peekViewTitleBackground, peekViewTitleForeground, peekViewTitleInfoForeground } from '../../../../editor/contrib/peekView/browser/peekView.js';
 import { ContextKeyExpr, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
 import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { Position } from '../../../../editor/common/core/position.js';
 import { rot } from '../../../../base/common/numbers.js';
-import { KeybindingsRegistry } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
+import { KeybindingsRegistry, KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { EmbeddedDiffEditorWidget } from '../../../../editor/browser/widget/diffEditor/embeddedDiffEditorWidget.js';
+import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
 import { Action, ActionRunner } from '../../../../base/common/actions.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.service.js';
 import { basename } from '../../../../base/common/resources.js';
 import { MenuRegistry, MenuId, MenuItemAction } from '../../../../platform/actions/common/actions.js';
 import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
 import { createAndFillInActionBarActions } from '../../../../platform/actions/browser/menuEntryActionViewItem.js';
-import { shouldSynchronizeModel, OverviewRulerLane } from '../../../../editor/common/model.js';
+import { ScrollType } from '../../../../editor/common/editorCommon.js';
+import { shouldSynchronizeModel, OverviewRulerLane, MinimapPosition } from '../../../../editor/common/model.js';
 import { sortedDiff, equals } from '../../../../base/common/arrays.js';
 import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
 import { createStyleSheet, prepend, $ } from '../../../../base/browser/dom.js';
-import { isTextFileEditorModel } from '../../../services/textfile/common/textfiles.js';
+import { isTextFileEditorModel, EncodingMode } from '../../../services/textfile/common/textfiles.js';
 import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
 import { gotoPreviousLocation, gotoNextLocation } from '../../../../platform/theme/common/iconRegistry.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { ThemeIcon } from '../../../../base/common/themables.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { TextCompareEditorActiveContext } from '../../../common/contextkeys.js';
+import { ProgressLocation } from '../../../../platform/progress/common/progress.js';
 import { IProgressService } from '../../../../platform/progress/common/progress.service.js';
 import { Color } from '../../../../base/common/color.js';
 import { ResourceMap } from '../../../../base/common/map.js';
@@ -59,9 +63,6 @@ import { IAccessibilitySignalService } from '../../../../platform/accessibilityS
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
 import { IQuickDiffService } from '../common/quickDiff.service.js';
 import { SwitchQuickDiffViewItem, SwitchQuickDiffBaseAction } from './dirtyDiffSwitcher.js';
-import { TextDiffEditor } from '../../../browser/parts/editor/textDiffEditor.js';
-import { TextFileEditor } from '../../files/browser/editors/textFileEditor.js';
-import { SideBySideEditor } from '../../../browser/parts/editor/sideBySideEditor.js';
 var DirtyDiffController_1, DirtyDiffDecorator_1;
 const _moduleId = "vs/workbench/contrib/scm/browser/dirtydiffDecorator";
 class DiffActionRunner extends ActionRunner {
@@ -205,7 +206,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         this.diffEditor.setModel(diffEditorModel);
         this.dropdown?.setSelection(labeledChange.label);
         const position = ( (new Position(getModifiedEndLineNumber(change), 1)));
-        const lineHeight = this.editor.getOption(67 );
+        const lineHeight = this.editor.getOption(EditorOption.lineHeight);
         const editorHeight = this.editor.getLayoutInfo().height;
         const editorHeightInLines = Math.floor(editorHeight / lineHeight);
         const height = Math.min(getChangeHeight(change) +  8, Math.floor(editorHeightInLines / 3));
@@ -399,7 +400,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
             start = change.modifiedStartLineNumber;
             end = change.modifiedEndLineNumber;
         }
-        this.diffEditor.revealLinesInCenter(start, end, 1 );
+        this.diffEditor.revealLinesInCenter(start, end, ScrollType.Immediate);
     }
     _applyTheme(theme) {
         const borderColor = theme.getColor(peekViewBorder) || Color.transparent;
@@ -412,7 +413,7 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
         });
     }
     revealRange(range) {
-        this.editor.revealLineInCenterIfOutsideViewport(range.endLineNumber, 0 );
+        this.editor.revealLineInCenterIfOutsideViewport(range.endLineNumber, ScrollType.Smooth);
     }
     hasFocus() {
         return this.diffEditor.hasTextFocus();
@@ -435,7 +436,7 @@ class ShowPreviousChangeAction extends EditorAction {
             label: ( localizeWithPath(_moduleId, 5, "Show Previous Change")),
             alias: 'Show Previous Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024  | 512  | 61 , weight: 100  }
+            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
         this.outerEditor = outerEditor;
     }
@@ -462,7 +463,7 @@ class ShowNextChangeAction extends EditorAction {
             label: ( localizeWithPath(_moduleId, 6, "Show Next Change")),
             alias: 'Show Next Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512  | 61 , weight: 100  }
+            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Alt | KeyCode.F3, weight: KeybindingWeight.EditorContrib }
         });
         this.outerEditor = outerEditor;
     }
@@ -505,7 +506,7 @@ class GotoPreviousChangeAction extends EditorAction {
             label: ( localizeWithPath(_moduleId, 9, "Go to Previous Change")),
             alias: 'Go to Previous Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024  | 512  | 63 , weight: 100  }
+            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Shift | KeyMod$1.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
     }
     async run(accessor) {
@@ -539,7 +540,7 @@ class GotoNextChangeAction extends EditorAction {
             label: ( localizeWithPath(_moduleId, 10, "Go to Next Change")),
             alias: 'Go to Next Change',
             precondition: ( (TextCompareEditorActiveContext.toNegated())),
-            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512  | 63 , weight: 100  }
+            kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: KeyMod$1.Alt | KeyCode.F5, weight: KeybindingWeight.EditorContrib }
         });
     }
     async run(accessor) {
@@ -591,9 +592,9 @@ async function playAccessibilitySymbolForChange(change, accessibilitySignalServi
 registerEditorAction(GotoNextChangeAction);
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'closeDirtyDiff',
-    weight: 100  + 50,
-    primary: 9 ,
-    secondary: [1024  | 9 ],
+    weight: KeybindingWeight.EditorContrib + 50,
+    primary: KeyCode.Escape,
+    secondary: [KeyMod$1.Shift | KeyCode.Escape],
     when: ( (ContextKeyExpr.and(isDirtyDiffVisible))),
     handler: (accessor) => {
         const outerEditor = getOuterEditorFromDiffEditor(accessor);
@@ -773,7 +774,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         if (!e.event.leftButton) {
             return;
         }
-        if (e.target.type !== 4 ) {
+        if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
             return;
         }
         if (!e.target.element) {
@@ -800,7 +801,7 @@ let DirtyDiffController = class DirtyDiffController extends Disposable {
         if (!range || range.startLineNumber !== lineNumber) {
             return;
         }
-        if (e.target.type !== 4 ) {
+        if (e.target.type !== MouseTargetType.GUTTER_LINE_DECORATIONS) {
             return;
         }
         if (!this.modelRegistry) {
@@ -924,7 +925,7 @@ let DirtyDiffDecorator = DirtyDiffDecorator_1 = class DirtyDiffDecorator extends
         if (options.minimap.active) {
             decorationOptions.minimap = {
                 color: themeColorFromId(options.minimap.color),
-                position: 2
+                position: MinimapPosition.Gutter
             };
         }
         return ModelDecorationOptions.createDynamic(decorationOptions);
@@ -1145,7 +1146,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
         this._onDidChange.fire({ changes, diff });
     }
     diff() {
-        return this.progressService.withProgress({ location: 3 , delay: 250 }, async () => {
+        return this.progressService.withProgress({ location: ProgressLocation.Scm, delay: 250 }, async () => {
             const originalURIs = await this.getQuickDiffsPromise();
             if (this._disposed || this._model.isDisposed() || (originalURIs.length === 0)) {
                 return Promise.resolve({ changes: [], mapChanges: ( (new Map())) });
@@ -1214,7 +1215,7 @@ let DirtyDiffModel = class DirtyDiffModel extends Disposable {
                     if (isTextFileEditorModel(ref.object)) {
                         const encoding = this._model.getEncoding();
                         if (encoding) {
-                            ref.object.setEncoding(encoding, 1 );
+                            ref.object.setEncoding(encoding, EncodingMode.Decode);
                         }
                     }
                     this.originalModelDisposables.add(ref);
@@ -1401,27 +1402,8 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         this.items.clear();
         this.enabled = false;
     }
-    getVisibleEditorControls() {
-        const controls = [];
-        const addControl = (control) => {
-            if (control) {
-                controls.push(control);
-            }
-        };
-        for (const editorPane of this.editorService.visibleEditorPanes) {
-            if (editorPane instanceof TextDiffEditor || editorPane instanceof TextFileEditor) {
-                addControl(editorPane.getControl());
-            }
-            else if (editorPane instanceof SideBySideEditor) {
-                addControl(editorPane.getPrimaryEditorPane()?.getControl());
-                addControl(editorPane.getSecondaryEditorPane()?.getControl());
-            }
-        }
-        return controls;
-    }
     onEditorsChanged() {
-        const visibleControls = this.getVisibleEditorControls();
-        for (const editor of visibleControls) {
+        for (const editor of this.editorService.visibleTextEditorControls) {
             if (isCodeEditor(editor)) {
                 const textModel = editor.getModel();
                 const controller = DirtyDiffController.get(editor);
@@ -1448,7 +1430,7 @@ let DirtyDiffWorkbenchController = class DirtyDiffWorkbenchController extends Di
         }
         for (const [uri, item] of this.items) {
             for (const editorId of ( (item.keys()))) {
-                if (!this.getVisibleEditorControls().find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( (uri.toString())) && editor.getId() === editorId)) {
+                if (!this.editorService.visibleTextEditorControls.find(editor => isCodeEditor(editor) && editor.getModel()?.uri.toString() === ( (uri.toString())) && editor.getId() === editorId)) {
                     if (( (item.has(editorId)))) {
                         const dirtyDiffItem = item.get(editorId);
                         dirtyDiffItem?.dispose();
@@ -1475,5 +1457,5 @@ DirtyDiffWorkbenchController = ( (__decorate([
     ( (__param(2, IConfigurationService))),
     ( (__param(3, ITextFileService)))
 ], DirtyDiffWorkbenchController)));
-registerEditorContribution(DirtyDiffController.ID, DirtyDiffController, 1 );
+registerEditorContribution(DirtyDiffController.ID, DirtyDiffController, EditorContributionInstantiation.AfterFirstRender);
 export { DirtyDiffController, DirtyDiffModel, DirtyDiffWorkbenchController, GotoNextChangeAction, GotoPreviousChangeAction, ShowNextChangeAction, ShowPreviousChangeAction, getOriginalResource, isDirtyDiffVisible };

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

@@ -1,9 +1,21 @@
 const VIEWLET_ID = 'workbench.view.scm';
 const VIEW_PANE_ID = 'workbench.scm';
 const REPOSITORIES_VIEW_PANE_ID = 'workbench.scm.repositories';
+var InputValidationType;
+( (function(InputValidationType) {
+    InputValidationType[InputValidationType["Error"] = 0] = "Error";
+    InputValidationType[InputValidationType["Warning"] = 1] = "Warning";
+    InputValidationType[InputValidationType["Information"] = 2] = "Information";
+})(InputValidationType || (InputValidationType = {})));
 var SCMInputChangeReason;
 ( (function(SCMInputChangeReason) {
     SCMInputChangeReason[SCMInputChangeReason["HistoryPrevious"] = 0] = "HistoryPrevious";
     SCMInputChangeReason[SCMInputChangeReason["HistoryNext"] = 1] = "HistoryNext";
 })(SCMInputChangeReason || (SCMInputChangeReason = {})));
-export { REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, VIEWLET_ID, VIEW_PANE_ID };
+var ISCMRepositorySortKey;
+( (function(ISCMRepositorySortKey) {
+    ISCMRepositorySortKey["DiscoveryTime"] = "discoveryTime";
+    ISCMRepositorySortKey["Name"] = "name";
+    ISCMRepositorySortKey["Path"] = "path";
+})(ISCMRepositorySortKey || (ISCMRepositorySortKey = {})));
+export { ISCMRepositorySortKey, InputValidationType, REPOSITORIES_VIEW_PANE_ID, SCMInputChangeReason, VIEWLET_ID, VIEW_PANE_ID };