@codingame/monaco-vscode-api 5.3.0 → 6.0.1

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

@@ -1,5 +1,6 @@
 import { getActiveElement } from '../../../../base/browser/dom.js';
 import { Codicon } from '../../../../base/common/codicons.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../base/common/keyCodes.js';
 import { EditorAction2 } from '../../editorExtensions.js';
 import { ICodeEditorService } from '../../services/codeEditorService.js';
 import { DiffEditorWidget } from './diffEditorWidget.js';
@@ -8,6 +9,7 @@ import { localize2WithPath } from '../../../../nls.js';
 import { Action2, MenuId } from '../../../../platform/actions/common/actions.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
 import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextkey.js';
+import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import './registrations.contribution.js';
 const _moduleId = "vs/editor/browser/widget/diffEditor/commands";
 class ToggleCollapseUnchangedRegions extends Action2 {
@@ -96,7 +98,7 @@ class ExitCompareMove extends EditorAction2 {
             category: diffEditorCategory,
             keybinding: {
                 weight: 10000,
-                primary: 9 ,
+                primary: KeyCode.Escape,
             }
         });
     }
@@ -170,8 +172,8 @@ class AccessibleDiffViewerNext extends Action2 {
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
-                primary: 65 ,
-                weight: 100
+                primary: KeyCode.F7,
+                weight: KeybindingWeight.EditorContrib
             },
             f1: true,
         });
@@ -190,8 +192,8 @@ class AccessibleDiffViewerPrev extends Action2 {
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
-                primary: 1024  | 65 ,
-                weight: 100
+                primary: KeyMod$1.Shift | KeyCode.F7,
+                weight: KeybindingWeight.EditorContrib
             },
             f1: true,
         });

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

@@ -6,6 +6,7 @@ import { DomScrollableElement } from '../../../../../base/browser/ui/scrollbar/s
 import { Action } from '../../../../../base/common/actions.js';
 import { groupAdjacentBy, forEachAdjacent } from '../../../../../base/common/arrays.js';
 import { Codicon } from '../../../../../base/common/codicons.js';
+import { KeyCode, KeyMod as KeyMod$1 } from '../../../../../base/common/keyCodes.js';
 import { Disposable, toDisposable } from '../../../../../base/common/lifecycle.js';
 import { transaction, observableValue, subtransaction } from '../../../../../base/common/observableInternal/base.js';
 import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
@@ -15,7 +16,7 @@ import '../../../../../base/common/cancellation.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { applyFontInfo } from '../../../config/domFontInfo.js';
 import { applyStyle } from '../utils.js';
-import { EditorFontLigatures } from '../../../../common/config/editorOptions.js';
+import { EditorOption, EditorFontLigatures } from '../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../common/core/lineRange.js';
 import { OffsetRange } from '../../../../common/core/offsetRange.js';
 import { Position } from '../../../../common/core/position.js';
@@ -323,27 +324,27 @@ let View = class View extends Disposable {
             this._render(store);
         }));
         this._register(addStandardDisposableListener(this.domNode, 'keydown', (e) => {
-            if (e.equals(18 )
-                || e.equals(2048  | 18 )
-                || e.equals(512  | 18 )) {
+            if (e.equals(KeyCode.DownArrow)
+                || e.equals(KeyMod$1.CtrlCmd | KeyCode.DownArrow)
+                || e.equals(KeyMod$1.Alt | KeyCode.DownArrow)) {
                 e.preventDefault();
                 this._model.goToNextLine();
             }
-            if (e.equals(16 )
-                || e.equals(2048  | 16 )
-                || e.equals(512  | 16 )) {
+            if (e.equals(KeyCode.UpArrow)
+                || e.equals(KeyMod$1.CtrlCmd | KeyCode.UpArrow)
+                || e.equals(KeyMod$1.Alt | KeyCode.UpArrow)) {
                 e.preventDefault();
                 this._model.goToPreviousLine();
             }
-            if (e.equals(9 )
-                || e.equals(2048  | 9 )
-                || e.equals(512  | 9 )
-                || e.equals(1024  | 9 )) {
+            if (e.equals(KeyCode.Escape)
+                || e.equals(KeyMod$1.CtrlCmd | KeyCode.Escape)
+                || e.equals(KeyMod$1.Alt | KeyCode.Escape)
+                || e.equals(KeyMod$1.Shift | KeyCode.Escape)) {
                 e.preventDefault();
                 this._model.close();
             }
-            if (e.equals(10 )
-                || e.equals(3 )) {
+            if (e.equals(KeyCode.Space)
+                || e.equals(KeyCode.Enter)) {
                 e.preventDefault();
                 this._model.revealCurrentElementInEditor();
             }
@@ -356,7 +357,7 @@ let View = class View extends Disposable {
         container.className = 'diff-review-table';
         container.setAttribute('role', 'list');
         container.setAttribute('aria-label', ( localizeWithPath(_moduleId, 4, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
-        applyFontInfo(container, modifiedOptions.get(50 ));
+        applyFontInfo(container, modifiedOptions.get(EditorOption.fontInfo));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
         const modifiedModel = this._models.getModifiedModel();
@@ -365,7 +366,7 @@ let View = class View extends Disposable {
         }
         const originalModelOpts = originalModel.getOptions();
         const modifiedModelOpts = modifiedModel.getOptions();
-        const lineHeight = modifiedOptions.get(67 );
+        const lineHeight = modifiedOptions.get(EditorOption.lineHeight);
         const group = this._model.currentGroup.get();
         for (const viewItem of group?.lines || []) {
             if (!group) {
@@ -420,9 +421,9 @@ let View = class View extends Disposable {
         this._scrollbar.scanDomNode();
     }
     _createRow(item, lineHeight, width, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts) {
-        const originalLayoutInfo = originalOptions.get(145 );
+        const originalLayoutInfo = originalOptions.get(EditorOption.layoutInfo);
         const originalLineNumbersWidth = originalLayoutInfo.glyphMarginWidth + originalLayoutInfo.lineNumbersWidth;
-        const modifiedLayoutInfo = modifiedOptions.get(145 );
+        const modifiedLayoutInfo = modifiedOptions.get(EditorOption.layoutInfo);
         const modifiedLineNumbersWidth = 10 + modifiedLayoutInfo.glyphMarginWidth + modifiedLayoutInfo.lineNumbersWidth;
         let rowClassName = 'diff-review-row';
         let lineNumbersExtraClassName = '';
@@ -551,12 +552,12 @@ let View = class View extends Disposable {
     }
     _getLineHtml(model, options, tabSize, lineNumber, languageIdCodec) {
         const lineContent = model.getLineContent(lineNumber);
-        const fontInfo = options.get(50 );
+        const fontInfo = options.get(EditorOption.fontInfo);
         const lineTokens = LineTokens.createEmpty(lineContent, languageIdCodec);
         const isBasicASCII = ViewLineRenderingData.isBasicASCII(lineContent, model.mightContainNonBasicASCII());
         const containsRTL = ViewLineRenderingData.containsRTL(lineContent, isBasicASCII, model.mightContainRTL());
         const r = renderViewLine2(( (new RenderLineInput(
-            (fontInfo.isMonospace && !options.get(33 )),
+            (fontInfo.isMonospace && !options.get(EditorOption.disableMonospaceOptimizations)),
             fontInfo.canUseHalfwidthRightwardsArrow,
             lineContent,
             false,
@@ -570,10 +571,10 @@ let View = class View extends Disposable {
             fontInfo.spaceWidth,
             fontInfo.middotWidth,
             fontInfo.wsmiddotWidth,
-            options.get(117 ),
-            options.get(99 ),
-            options.get(94 ),
-            options.get(51 ) !== EditorFontLigatures.OFF,
+            options.get(EditorOption.stopRenderingLineAfter),
+            options.get(EditorOption.renderWhitespace),
+            options.get(EditorOption.renderControlCharacters),
+            options.get(EditorOption.fontLigatures) !== EditorFontLigatures.OFF,
             null
         ))));
         return r.html;

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

@@ -1,68 +1,80 @@
-import { Sash } from '../../../../../base/browser/ui/sash/sash.js';
+import { Sash, Orientation, SashState } from '../../../../../base/browser/ui/sash/sash.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import { derivedWithSetter } from '../../../../../base/common/observableInternal/derived.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
 import '../../../../../base/common/observableInternal/utils.js';
 import '../../../../../base/common/cancellation.js';
 import '../../../../../base/common/arrays.js';
-class DiffEditorSash extends Disposable {
-    constructor(_options, _domNode, _dimensions, _sashes) {
-        super();
+class SashLayout {
+    resetSash() {
+        this._sashRatio.set(undefined, undefined);
+    }
+    constructor(_options, dimensions) {
         this._options = _options;
-        this._domNode = _domNode;
-        this._dimensions = _dimensions;
-        this._sashes = _sashes;
-        this._sashRatio = observableValue(this, undefined);
-        this.sashLeft = derived(this, reader => {
+        this.dimensions = dimensions;
+        this.sashLeft = derivedWithSetter(this, reader => {
             const ratio = this._sashRatio.read(reader) ?? this._options.splitViewDefaultRatio.read(reader);
             return this._computeSashLeft(ratio, reader);
+        }, (value, tx) => {
+            const contentWidth = this.dimensions.width.get();
+            this._sashRatio.set(value / contentWidth, tx);
         });
+        this._sashRatio = observableValue(this, undefined);
+    }
+    _computeSashLeft(desiredRatio, reader) {
+        const contentWidth = this.dimensions.width.read(reader);
+        const midPoint = Math.floor(this._options.splitViewDefaultRatio.read(reader) * contentWidth);
+        const sashLeft = this._options.enableSplitViewResizing.read(reader) ? Math.floor(desiredRatio * contentWidth) : midPoint;
+        const MINIMUM_EDITOR_WIDTH = 100;
+        if (contentWidth <= MINIMUM_EDITOR_WIDTH * 2) {
+            return midPoint;
+        }
+        if (sashLeft < MINIMUM_EDITOR_WIDTH) {
+            return MINIMUM_EDITOR_WIDTH;
+        }
+        if (sashLeft > contentWidth - MINIMUM_EDITOR_WIDTH) {
+            return contentWidth - MINIMUM_EDITOR_WIDTH;
+        }
+        return sashLeft;
+    }
+}
+class DiffEditorSash extends Disposable {
+    constructor(_domNode, _dimensions, _enabled, _boundarySashes, sashLeft, _resetSash) {
+        super();
+        this._domNode = _domNode;
+        this._dimensions = _dimensions;
+        this._enabled = _enabled;
+        this._boundarySashes = _boundarySashes;
+        this.sashLeft = sashLeft;
+        this._resetSash = _resetSash;
         this._sash = this._register(( new Sash(this._domNode, {
             getVerticalSashTop: (_sash) => 0,
             getVerticalSashLeft: (_sash) => this.sashLeft.get(),
             getVerticalSashHeight: (_sash) => this._dimensions.height.get(),
-        }, { orientation: 0  })));
+        }, { orientation: Orientation.VERTICAL })));
         this._startSashPosition = undefined;
         this._register(this._sash.onDidStart(() => {
             this._startSashPosition = this.sashLeft.get();
         }));
         this._register(this._sash.onDidChange((e) => {
-            const contentWidth = this._dimensions.width.get();
-            const sashPosition = this._computeSashLeft((this._startSashPosition + (e.currentX - e.startX)) / contentWidth, undefined);
-            this._sashRatio.set(sashPosition / contentWidth, undefined);
+            this.sashLeft.set(this._startSashPosition + (e.currentX - e.startX), undefined);
         }));
         this._register(this._sash.onDidEnd(() => this._sash.layout()));
-        this._register(this._sash.onDidReset(() => this._sashRatio.set(undefined, undefined)));
+        this._register(this._sash.onDidReset(() => this._resetSash()));
         this._register(autorun(reader => {
-            const sashes = this._sashes.read(reader);
+            const sashes = this._boundarySashes.read(reader);
             if (sashes) {
                 this._sash.orthogonalEndSash = sashes.bottom;
             }
         }));
         this._register(autorun(reader => {
-            const enabled = this._options.enableSplitViewResizing.read(reader);
-            this._sash.state = enabled ? 3  : 0 ;
+            const enabled = this._enabled.read(reader);
+            this._sash.state = enabled ? SashState.Enabled : SashState.Disabled;
             this.sashLeft.read(reader);
             this._dimensions.height.read(reader);
             this._sash.layout();
         }));
     }
-    _computeSashLeft(desiredRatio, reader) {
-        const contentWidth = this._dimensions.width.read(reader);
-        const midPoint = Math.floor(this._options.splitViewDefaultRatio.read(reader) * contentWidth);
-        const sashLeft = this._options.enableSplitViewResizing.read(reader) ? Math.floor(desiredRatio * contentWidth) : midPoint;
-        const MINIMUM_EDITOR_WIDTH = 100;
-        if (contentWidth <= MINIMUM_EDITOR_WIDTH * 2) {
-            return midPoint;
-        }
-        if (sashLeft < MINIMUM_EDITOR_WIDTH) {
-            return MINIMUM_EDITOR_WIDTH;
-        }
-        if (sashLeft > contentWidth - MINIMUM_EDITOR_WIDTH) {
-            return contentWidth - MINIMUM_EDITOR_WIDTH;
-        }
-        return sashLeft;
-    }
 }
-export { DiffEditorSash };
+export { DiffEditorSash, SashLayout };

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

@@ -17,9 +17,12 @@ import { DiffMapping } from '../../diffEditorViewModel.js';
 import { InlineDiffDeletedCodeMargin } from './inlineDiffDeletedCodeMargin.js';
 import { RenderOptions, LineSource, renderLines } from './renderLines.js';
 import { animatedObservable, joinCombine } from '../../utils.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
 import { LineRange } from '../../../../../common/core/lineRange.js';
 import { Position } from '../../../../../common/core/position.js';
-import { InlineDecoration } from '../../../../../common/viewModel.js';
+import { ScrollType } from '../../../../../common/editorCommon.js';
+import { BackgroundTokenizationState } from '../../../../../common/tokenizationTextModelPart.js';
+import { InlineDecoration, InlineDecorationType } from '../../../../../common/viewModel.js';
 import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
 let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
@@ -52,17 +55,17 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             updateImmediately.schedule();
         } }));
         this._register(this._editors.original.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(146 ) || args.hasChanged(67 )) {
+            if (args.hasChanged(EditorOption.wrappingInfo) || args.hasChanged(EditorOption.lineHeight)) {
                 updateImmediately.schedule();
             }
         }));
         this._register(this._editors.modified.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(146 ) || args.hasChanged(67 )) {
+            if (args.hasChanged(EditorOption.wrappingInfo) || args.hasChanged(EditorOption.lineHeight)) {
                 updateImmediately.schedule();
             }
         }));
         const originalModelTokenizationCompleted = ( ( this._diffModel.map(
-            m => m ? observableFromEvent(m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === 2 ) : undefined
+            m => m ? observableFromEvent(m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === BackgroundTokenizationState.Completed) : undefined
         )).map((m, reader) => m?.read(reader)));
         const alignments = derived((reader) => {
             const diffModel = this._diffModel.read(reader);
@@ -132,7 +135,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             }
             const lineBreakData = deletedCodeLineBreaksComputer?.finalize() ?? [];
             let lineBreakDataIdx = 0;
-            const modLineHeight = this._editors.modified.getOption(67 );
+            const modLineHeight = this._editors.modified.getOption(EditorOption.lineHeight);
             const syncedMovedText = this._diffModel.read(reader)?.movedTextToCompare.read(reader);
             const mightContainNonBasicASCII = this._editors.original.getModel()?.mightContainNonBasicASCII() ?? false;
             const mightContainRTL = this._editors.original.getModel()?.mightContainRTL() ?? false;
@@ -158,7 +161,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                             decorations.push(( new InlineDecoration(
                                 i.originalRange.delta(-(a.diff.original.startLineNumber - 1)),
                                 diffDeleteDecoration.className,
-                                0
+                                InlineDecorationType.Regular
                             )));
                         }
                         const result = renderLines(source, renderOptions, decorations, deletedCodeDomNode);
@@ -311,7 +314,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                 - (this._originalScrollOffsetAnimated.get() - this._modifiedScrollOffsetAnimated.read(reader))
                 - (this._originalTopPadding.get() - this._modifiedTopPadding.read(reader));
             if (newScrollTopModified !== this._editors.modified.getScrollTop()) {
-                this._editors.modified.setScrollTop(newScrollTopModified, 1 );
+                this._editors.modified.setScrollTop(newScrollTopModified, ScrollType.Immediate);
             }
         }));
         this._register(autorun(reader => {
@@ -319,7 +322,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                 - (this._modifiedScrollOffsetAnimated.get() - this._originalScrollOffsetAnimated.read(reader))
                 - (this._modifiedTopPadding.get() - this._originalTopPadding.read(reader));
             if (newScrollTopOriginal !== this._editors.original.getScrollTop()) {
-                this._editors.original.setScrollTop(newScrollTopOriginal, 1 );
+                this._editors.original.setScrollTop(newScrollTopOriginal, ScrollType.Immediate);
             }
         }));
         this._register(autorun(reader => {
@@ -360,8 +363,8 @@ DiffEditorViewZones = ( __decorate([
 function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEditorAlignmentViewZones, modifiedEditorAlignmentViewZones, innerHunkAlignment) {
     const originalLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(originalEditor, originalEditorAlignmentViewZones)));
     const modifiedLineHeightOverrides = ( new ArrayQueue(getAdditionalLineHeights(modifiedEditor, modifiedEditorAlignmentViewZones)));
-    const origLineHeight = originalEditor.getOption(67 );
-    const modLineHeight = modifiedEditor.getOption(67 );
+    const origLineHeight = originalEditor.getOption(EditorOption.lineHeight);
+    const modLineHeight = modifiedEditor.getOption(EditorOption.lineHeight);
     const result = [];
     let lastOriginalLineNumber = 0;
     let lastModifiedLineNumber = 0;
@@ -466,9 +469,9 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
 function getAdditionalLineHeights(editor, viewZonesToIgnore) {
     const viewZoneHeights = [];
     const wrappingZoneHeights = [];
-    const hasWrapping = editor.getOption(146 ).wrappingColumn !== -1;
+    const hasWrapping = editor.getOption(EditorOption.wrappingInfo).wrappingColumn !== -1;
     const coordinatesConverter = editor._getViewModel().coordinatesConverter;
-    const editorLineHeight = editor.getOption(67 );
+    const editorLineHeight = editor.getOption(EditorOption.lineHeight);
     if (hasWrapping) {
         for (let i = 1; i <= editor.getModel().getLineCount(); i++) {
             const lineCount = coordinatesConverter.getModelLineViewLineCount(i);

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

@@ -4,6 +4,9 @@ import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable } from '../../../../../../base/common/lifecycle.js';
 import { isIOS } from '../../../../../../base/common/platform.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
+import { MouseTargetType } from '../../../../editorBrowser.js';
+import { EditorOption } from '../../../../../common/config/editorOptions.js';
+import { EndOfLineSequence } from '../../../../../common/model.js';
 import { localizeWithPath } from '../../../../../../nls.js';
 const _moduleId = "vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin";
 class InlineDiffDeletedCodeMargin extends Disposable {
@@ -32,14 +35,14 @@ class InlineDiffDeletedCodeMargin extends Disposable {
         this._diffActions = document.createElement('div');
         this._diffActions.className = ThemeIcon.asClassName(Codicon.lightBulb) + ' lightbulb-glyph';
         this._diffActions.style.position = 'absolute';
-        const lineHeight = this._modifiedEditor.getOption(67 );
+        const lineHeight = this._modifiedEditor.getOption(EditorOption.lineHeight);
         this._diffActions.style.right = '0px';
         this._diffActions.style.visibility = 'hidden';
         this._diffActions.style.height = `${lineHeight}px`;
         this._diffActions.style.lineHeight = `${lineHeight}px`;
         this._marginDomNode.appendChild(this._diffActions);
         let currentLineNumberOffset = 0;
-        const useShadowDOM = _modifiedEditor.getOption(127 ) && !isIOS;
+        const useShadowDOM = _modifiedEditor.getOption(EditorOption.useShadowDOM) && !isIOS;
         const showContextMenu = (x, y) => {
             this._contextMenuService.showContextMenu({
                 domForShadowRoot: useShadowDOM ? _modifiedEditor.getDomNode() ?? undefined : undefined,
@@ -74,12 +77,12 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                             let lineContent = this._originalTextModel.getLineContent(_diff.original.startLineNumber + currentLineNumberOffset);
                             if (lineContent === '') {
                                 const eof = this._originalTextModel.getEndOfLineSequence();
-                                lineContent = eof === 0  ? '\n' : '\r\n';
+                                lineContent = eof === EndOfLineSequence.LF ? '\n' : '\r\n';
                             }
                             await this._clipboardService.writeText(lineContent);
                         }))));
                     }
-                    const readOnly = _modifiedEditor.getOption(91 );
+                    const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
                     if (!readOnly) {
                         actions.push(( (new Action('diff.inline.revertChange', ( localizeWithPath(_moduleId, 6, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
@@ -100,7 +103,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
             showContextMenu(e.posx, top + height + pad);
         }));
         this._register(_modifiedEditor.onMouseMove((e) => {
-            if (((e.target.type === 8  || e.target.type === 5) ) && e.target.detail.viewZoneId === this._getViewZoneId()) {
+            if ((e.target.type === MouseTargetType.CONTENT_VIEW_ZONE || e.target.type === MouseTargetType.GUTTER_VIEW_ZONE) && e.target.detail.viewZoneId === this._getViewZoneId()) {
                 currentLineNumberOffset = this._updateLightBulbPosition(this._marginDomNode, e.event.browserEvent.y, lineHeight);
                 this.visibility = true;
             }
@@ -112,7 +115,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
             if (!e.event.leftButton) {
                 return;
             }
-            if (e.target.type === 8  || e.target.type === 5 ) {
+            if (e.target.type === MouseTargetType.CONTENT_VIEW_ZONE || e.target.type === MouseTargetType.GUTTER_VIEW_ZONE) {
                 const viewZoneId = e.target.detail.viewZoneId;
                 if (viewZoneId === this._getViewZoneId()) {
                     e.event.preventDefault();

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

@@ -1,6 +1,6 @@
 import { createTrustedTypesPolicy } from '../../../../../../base/browser/trustedTypes.js';
 import { applyFontInfo } from '../../../../config/domFontInfo.js';
-import { EditorFontLigatures } from '../../../../../common/config/editorOptions.js';
+import { EditorOption, EditorFontLigatures } from '../../../../../common/config/editorOptions.js';
 import { StringBuilder } from '../../../../../common/core/stringBuilder.js';
 import { LineDecoration } from '../../../../../common/viewLayout/lineDecorations.js';
 import { renderViewLine, RenderLineInput } from '../../../../../common/viewLayout/viewLineRenderer.js';
@@ -56,20 +56,20 @@ class LineSource {
 class RenderOptions {
     static fromEditor(editor) {
         const modifiedEditorOptions = editor.getOptions();
-        const fontInfo = modifiedEditorOptions.get(50 );
-        const layoutInfo = modifiedEditorOptions.get(145 );
+        const fontInfo = modifiedEditorOptions.get(EditorOption.fontInfo);
+        const layoutInfo = modifiedEditorOptions.get(EditorOption.layoutInfo);
         return ( new RenderOptions(
             editor.getModel()?.getOptions().tabSize || 0,
             fontInfo,
-            modifiedEditorOptions.get(33 ),
+            modifiedEditorOptions.get(EditorOption.disableMonospaceOptimizations),
             fontInfo.typicalHalfwidthCharacterWidth,
-            modifiedEditorOptions.get(104 ),
-            modifiedEditorOptions.get(67 ),
+            modifiedEditorOptions.get(EditorOption.scrollBeyondLastColumn),
+            modifiedEditorOptions.get(EditorOption.lineHeight),
             layoutInfo.decorationsWidth,
-            modifiedEditorOptions.get(117 ),
-            modifiedEditorOptions.get(99 ),
-            modifiedEditorOptions.get(94 ),
-            modifiedEditorOptions.get(51 )
+            modifiedEditorOptions.get(EditorOption.stopRenderingLineAfter),
+            modifiedEditorOptions.get(EditorOption.renderWhitespace),
+            modifiedEditorOptions.get(EditorOption.renderControlCharacters),
+            modifiedEditorOptions.get(EditorOption.fontLigatures)
         ));
     }
     constructor(tabSize, fontInfo, disableMonospaceOptimizations, typicalHalfwidthCharacterWidth, scrollBeyondLastColumn, lineHeight, lineDecorationsWidth, stopRenderingLineAfter, renderWhitespace, renderControlCharacters, fontLigatures) {

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

@@ -1,5 +1,6 @@
 import { Emitter } from '../../../../base/common/event.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
+import { ScrollType } from '../../../common/editorCommon.js';
 class DelegatingEditor extends Disposable {
     constructor() {
         super(...arguments);
@@ -21,28 +22,28 @@ class DelegatingEditor extends Disposable {
     setPosition(position, source = 'api') {
         this._targetEditor.setPosition(position, source);
     }
-    revealLine(lineNumber, scrollType = 0 ) {
+    revealLine(lineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLine(lineNumber, scrollType);
     }
-    revealLineInCenter(lineNumber, scrollType = 0 ) {
+    revealLineInCenter(lineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLineInCenter(lineNumber, scrollType);
     }
-    revealLineInCenterIfOutsideViewport(lineNumber, scrollType = 0 ) {
+    revealLineInCenterIfOutsideViewport(lineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLineInCenterIfOutsideViewport(lineNumber, scrollType);
     }
-    revealLineNearTop(lineNumber, scrollType = 0 ) {
+    revealLineNearTop(lineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLineNearTop(lineNumber, scrollType);
     }
-    revealPosition(position, scrollType = 0 ) {
+    revealPosition(position, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealPosition(position, scrollType);
     }
-    revealPositionInCenter(position, scrollType = 0 ) {
+    revealPositionInCenter(position, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealPositionInCenter(position, scrollType);
     }
-    revealPositionInCenterIfOutsideViewport(position, scrollType = 0 ) {
+    revealPositionInCenterIfOutsideViewport(position, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealPositionInCenterIfOutsideViewport(position, scrollType);
     }
-    revealPositionNearTop(position, scrollType = 0 ) {
+    revealPositionNearTop(position, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealPositionNearTop(position, scrollType);
     }
     getSelection() {
@@ -57,34 +58,34 @@ class DelegatingEditor extends Disposable {
     setSelections(ranges, source = 'api') {
         this._targetEditor.setSelections(ranges, source);
     }
-    revealLines(startLineNumber, endLineNumber, scrollType = 0 ) {
+    revealLines(startLineNumber, endLineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLines(startLineNumber, endLineNumber, scrollType);
     }
-    revealLinesInCenter(startLineNumber, endLineNumber, scrollType = 0 ) {
+    revealLinesInCenter(startLineNumber, endLineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLinesInCenter(startLineNumber, endLineNumber, scrollType);
     }
-    revealLinesInCenterIfOutsideViewport(startLineNumber, endLineNumber, scrollType = 0 ) {
+    revealLinesInCenterIfOutsideViewport(startLineNumber, endLineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLinesInCenterIfOutsideViewport(startLineNumber, endLineNumber, scrollType);
     }
-    revealLinesNearTop(startLineNumber, endLineNumber, scrollType = 0 ) {
+    revealLinesNearTop(startLineNumber, endLineNumber, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealLinesNearTop(startLineNumber, endLineNumber, scrollType);
     }
-    revealRange(range, scrollType = 0 , revealVerticalInCenter = false, revealHorizontal = true) {
+    revealRange(range, scrollType = ScrollType.Smooth, revealVerticalInCenter = false, revealHorizontal = true) {
         this._targetEditor.revealRange(range, scrollType, revealVerticalInCenter, revealHorizontal);
     }
-    revealRangeInCenter(range, scrollType = 0 ) {
+    revealRangeInCenter(range, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealRangeInCenter(range, scrollType);
     }
-    revealRangeInCenterIfOutsideViewport(range, scrollType = 0 ) {
+    revealRangeInCenterIfOutsideViewport(range, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealRangeInCenterIfOutsideViewport(range, scrollType);
     }
-    revealRangeNearTop(range, scrollType = 0 ) {
+    revealRangeNearTop(range, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealRangeNearTop(range, scrollType);
     }
-    revealRangeNearTopIfOutsideViewport(range, scrollType = 0 ) {
+    revealRangeNearTopIfOutsideViewport(range, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealRangeNearTopIfOutsideViewport(range, scrollType);
     }
-    revealRangeAtTop(range, scrollType = 0 ) {
+    revealRangeAtTop(range, scrollType = ScrollType.Smooth) {
         this._targetEditor.revealRangeAtTop(range, scrollType);
     }
     getSupportedActions() {

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

@@ -5,6 +5,7 @@ import '../../../../base/common/observableInternal/autorun.js';
 import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
 import '../../../../base/common/cancellation.js';
 import '../../../../base/common/arrays.js';
+import { Constants } from '../../../../base/common/uint.js';
 import { diffEditorDefaultOptions } from '../../../common/config/diffEditor.js';
 import { boolean, clampedFloat, clampedInt, stringSet } from '../../../common/config/editorOptions.js';
 import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
@@ -74,8 +75,8 @@ function validateDiffEditorOptions(options, defaults) {
         splitViewDefaultRatio: clampedFloat(options.splitViewDefaultRatio, 0.5, 0.1, 0.9),
         renderSideBySide: boolean(options.renderSideBySide, defaults.renderSideBySide),
         renderMarginRevertIcon: boolean(options.renderMarginRevertIcon, defaults.renderMarginRevertIcon),
-        maxComputationTime: clampedInt(options.maxComputationTime, defaults.maxComputationTime, 0, 1073741824 ),
-        maxFileSize: clampedInt(options.maxFileSize, defaults.maxFileSize, 0, 1073741824 ),
+        maxComputationTime: clampedInt(options.maxComputationTime, defaults.maxComputationTime, 0, Constants.MAX_SAFE_SMALL_INTEGER),
+        maxFileSize: clampedInt(options.maxFileSize, defaults.maxFileSize, 0, Constants.MAX_SAFE_SMALL_INTEGER),
         ignoreTrimWhitespace: boolean(options.ignoreTrimWhitespace, defaults.ignoreTrimWhitespace),
         renderIndicators: boolean(options.renderIndicators, defaults.renderIndicators),
         originalEditable: boolean(options.originalEditable, defaults.originalEditable),
@@ -90,13 +91,13 @@ function validateDiffEditorOptions(options, defaults) {
         },
         hideUnchangedRegions: {
             enabled: boolean(options.hideUnchangedRegions?.enabled ?? options.experimental?.collapseUnchangedRegions, defaults.hideUnchangedRegions.enabled),
-            contextLineCount: clampedInt(options.hideUnchangedRegions?.contextLineCount, defaults.hideUnchangedRegions.contextLineCount, 0, 1073741824 ),
-            minimumLineCount: clampedInt(options.hideUnchangedRegions?.minimumLineCount, defaults.hideUnchangedRegions.minimumLineCount, 0, 1073741824 ),
-            revealLineCount: clampedInt(options.hideUnchangedRegions?.revealLineCount, defaults.hideUnchangedRegions.revealLineCount, 0, 1073741824 ),
+            contextLineCount: clampedInt(options.hideUnchangedRegions?.contextLineCount, defaults.hideUnchangedRegions.contextLineCount, 0, Constants.MAX_SAFE_SMALL_INTEGER),
+            minimumLineCount: clampedInt(options.hideUnchangedRegions?.minimumLineCount, defaults.hideUnchangedRegions.minimumLineCount, 0, Constants.MAX_SAFE_SMALL_INTEGER),
+            revealLineCount: clampedInt(options.hideUnchangedRegions?.revealLineCount, defaults.hideUnchangedRegions.revealLineCount, 0, Constants.MAX_SAFE_SMALL_INTEGER),
         },
         isInEmbeddedEditor: boolean(options.isInEmbeddedEditor, defaults.isInEmbeddedEditor),
         onlyShowAccessibleDiffViewer: boolean(options.onlyShowAccessibleDiffViewer, defaults.onlyShowAccessibleDiffViewer),
-        renderSideBySideInlineBreakpoint: clampedInt(options.renderSideBySideInlineBreakpoint, defaults.renderSideBySideInlineBreakpoint, 0, 1073741824 ),
+        renderSideBySideInlineBreakpoint: clampedInt(options.renderSideBySideInlineBreakpoint, defaults.renderSideBySideInlineBreakpoint, 0, Constants.MAX_SAFE_SMALL_INTEGER),
         useInlineViewWhenSpaceIsLimited: boolean(options.useInlineViewWhenSpaceIsLimited, defaults.useInlineViewWhenSpaceIsLimited),
         renderGutterMenu: boolean(options.renderGutterMenu, defaults.renderGutterMenu),
     };

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

@@ -437,7 +437,7 @@ class UnchangedRegion {
     showModifiedLine(lineNumber, preference, tx) {
         const top = lineNumber + 1 - (this.modifiedLineNumber + this._visibleLineCountTop.get());
         const bottom = (this.modifiedLineNumber - this._visibleLineCountBottom.get() + this.lineCount) - lineNumber;
-        if (preference === 0  && top < bottom || preference === 1 ) {
+        if (preference === RevealPreference.FromCloserSide && top < bottom || preference === RevealPreference.FromTop) {
             this._visibleLineCountTop.set(this._visibleLineCountTop.get() + top, tx);
         }
         else {
@@ -447,7 +447,7 @@ class UnchangedRegion {
     showOriginalLine(lineNumber, preference, tx) {
         const top = lineNumber - this.originalLineNumber;
         const bottom = (this.originalLineNumber + this.lineCount) - lineNumber;
-        if (preference === 0  && top < bottom || preference === 1 ) {
+        if (preference === RevealPreference.FromCloserSide && top < bottom || preference === RevealPreference.FromTop) {
             this._visibleLineCountTop.set(Math.min(this._visibleLineCountTop.get() + bottom - top, this.getMaxVisibleLineCountTop()), tx);
         }
         else {
@@ -465,4 +465,10 @@ class UnchangedRegion {
         this._visibleLineCountBottom.set(visibleLineCountBottom, tx);
     }
 }
-export { DiffEditorViewModel, DiffMapping, DiffState, UnchangedRegion };
+var RevealPreference;
+( (function(RevealPreference) {
+    RevealPreference[RevealPreference["FromCloserSide"] = 0] = "FromCloserSide";
+    RevealPreference[RevealPreference["FromTop"] = 1] = "FromTop";
+    RevealPreference[RevealPreference["FromBottom"] = 2] = "FromBottom";
+})(RevealPreference || (RevealPreference = {})));
+export { DiffEditorViewModel, DiffMapping, DiffState, RevealPreference, UnchangedRegion };