@codingame/monaco-vscode-api 9.0.3 → 10.0.1

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

@@ -1,6 +1,5 @@
 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';
@@ -9,13 +8,12 @@ import { localize2 } 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';
 class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2(4956, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(4987, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( (ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled'))),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
@@ -37,7 +35,7 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2(4957, 'Toggle Show Moved Code Blocks')),
+            title: ( localize2(4988, 'Toggle Show Moved Code Blocks')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -51,7 +49,7 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2(4958, 'Toggle Use Inline View When Space Is Limited')),
+            title: ( localize2(4989, 'Toggle Use Inline View When Space Is Limited')),
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
         });
     }
@@ -61,12 +59,12 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2(4959, "Diff Editor"));
+const diffEditorCategory = ( localize2(4990, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2(4960, 'Switch Side')),
+            title: ( localize2(4991, 'Switch Side')),
             icon: Codicon.arrowSwap,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -90,14 +88,14 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2(4961, 'Exit Compare Move')),
+            title: ( localize2(4992, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
             category: diffEditorCategory,
             keybinding: {
                 weight: 10000,
-                primary: KeyCode.Escape,
+                primary: 9 ,
             }
         });
     }
@@ -112,7 +110,7 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2(4962, 'Collapse All Unchanged Regions')),
+            title: ( localize2(4993, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -130,7 +128,7 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2(4963, 'Show All Unchanged Regions')),
+            title: ( localize2(4994, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             f1: true,
@@ -148,7 +146,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2(4964, 'Revert')),
+            title: ( localize2(4995, 'Revert')),
             f1: false,
             category: diffEditorCategory,
         });
@@ -161,18 +159,18 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2(4965, "Accessible Diff Viewer"));
+const accessibleDiffViewerCategory = ( localize2(4996, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2(4966, 'Go to Next Difference')),
+            title: ( localize2(4997, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
-                primary: KeyCode.F7,
-                weight: KeybindingWeight.EditorContrib
+                primary: 65 ,
+                weight: 100
             },
             f1: true,
         });
@@ -187,12 +185,12 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2(4967, 'Go to Previous Difference')),
+            title: ( localize2(4998, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( (ContextKeyExpr.has('isInDiffEditor'))),
             keybinding: {
-                primary: KeyMod$1.Shift | KeyCode.F7,
-                weight: KeybindingWeight.EditorContrib
+                primary: 1024  | 65 ,
+                weight: 100
             },
             f1: true,
         });

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

@@ -6,17 +6,17 @@ 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';
+import '../../../../../base/common/event.js';
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
+import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/observableInternal/utils.js';
 import { ThemeIcon } from '../../../../../base/common/themables.js';
 import { applyFontInfo } from '../../../config/domFontInfo.js';
 import { applyStyle } from '../utils.js';
-import { EditorOption, EditorFontLigatures } from '../../../../common/config/editorOptions.js';
+import { 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';
@@ -32,9 +32,9 @@ import { IAccessibilitySignalService } from '../../../../../platform/accessibili
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import './accessibleDiffViewer.css.js';
-const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(5230, 'Icon for \'Insert\' in accessible diff viewer.')));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(5231, 'Icon for \'Remove\' in accessible diff viewer.')));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(5232, 'Icon for \'Close\' in accessible diff viewer.')));
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(5265, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(5266, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(5267, 'Icon for \'Close\' in accessible diff viewer.')));
 let AccessibleDiffViewer = class AccessibleDiffViewer extends Disposable {
     static { this._ttPolicy = createTrustedTypesPolicy('diffReview', { createHTML: value => value }); }
     constructor(_parentNode, _visible, _setVisible, _canClose, _width, _height, _diffs, _models, _instantiationService) {
@@ -302,7 +302,7 @@ let View = class View extends Disposable {
         this._register(autorun(reader => {
             this._actionBar.clear();
             if (this._model.canClose.read(reader)) {
-                this._actionBar.push(( (new Action('diffreview.close', ( localize(5233, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
+                this._actionBar.push(( (new Action('diffreview.close', ( localize(5268, "Close")), 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon), true, async () => _model.close()))), { label: false, icon: true });
             }
         }));
         this._content = document.createElement('div');
@@ -323,27 +323,27 @@ let View = class View extends Disposable {
             this._render(store);
         }));
         this._register(addStandardDisposableListener(this.domNode, 'keydown', (e) => {
-            if (e.equals(KeyCode.DownArrow)
-                || e.equals(KeyMod$1.CtrlCmd | KeyCode.DownArrow)
-                || e.equals(KeyMod$1.Alt | KeyCode.DownArrow)) {
+            if (e.equals(18 )
+                || e.equals(2048  | 18 )
+                || e.equals(512  | 18 )) {
                 e.preventDefault();
                 this._model.goToNextLine();
             }
-            if (e.equals(KeyCode.UpArrow)
-                || e.equals(KeyMod$1.CtrlCmd | KeyCode.UpArrow)
-                || e.equals(KeyMod$1.Alt | KeyCode.UpArrow)) {
+            if (e.equals(16 )
+                || e.equals(2048  | 16 )
+                || e.equals(512  | 16 )) {
                 e.preventDefault();
                 this._model.goToPreviousLine();
             }
-            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)) {
+            if (e.equals(9 )
+                || e.equals(2048  | 9 )
+                || e.equals(512  | 9 )
+                || e.equals(1024  | 9 )) {
                 e.preventDefault();
                 this._model.close();
             }
-            if (e.equals(KeyCode.Space)
-                || e.equals(KeyCode.Enter)) {
+            if (e.equals(10 )
+                || e.equals(3 )) {
                 e.preventDefault();
                 this._model.revealCurrentElementInEditor();
             }
@@ -355,8 +355,8 @@ let View = class View extends Disposable {
         const container = document.createElement('div');
         container.className = 'diff-review-table';
         container.setAttribute('role', 'list');
-        container.setAttribute('aria-label', ( localize(5234, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
-        applyFontInfo(container, modifiedOptions.get(EditorOption.fontInfo));
+        container.setAttribute('aria-label', ( localize(5269, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
+        applyFontInfo(container, modifiedOptions.get(52 ));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
         const modifiedModel = this._models.getModifiedModel();
@@ -365,7 +365,7 @@ let View = class View extends Disposable {
         }
         const originalModelOpts = originalModel.getOptions();
         const modifiedModelOpts = modifiedModel.getOptions();
-        const lineHeight = modifiedOptions.get(EditorOption.lineHeight);
+        const lineHeight = modifiedOptions.get(69 );
         const group = this._model.currentGroup.get();
         for (const viewItem of group?.lines || []) {
             if (!group) {
@@ -379,13 +379,13 @@ let View = class View extends Disposable {
                 const r = group.range;
                 const diffIndex = this._model.currentGroupIndex.get();
                 const diffsLength = this._model.groups.get().length;
-                const getAriaLines = (lines) => lines === 0 ? ( localize(5235, "no lines changed"))
-                    : lines === 1 ? ( localize(5236, "1 line changed"))
-                        : ( localize(5237, "{0} lines changed", lines));
+                const getAriaLines = (lines) => lines === 0 ? ( localize(5270, "no lines changed"))
+                    : lines === 1 ? ( localize(5271, "1 line changed"))
+                        : ( localize(5272, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
                 header.setAttribute('aria-label', ( localize(
-                    5238,
+                    5273,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -419,9 +419,9 @@ let View = class View extends Disposable {
         this._scrollbar.scanDomNode();
     }
     _createRow(item, lineHeight, width, originalOptions, originalModel, originalModelOpts, modifiedOptions, modifiedModel, modifiedModelOpts) {
-        const originalLayoutInfo = originalOptions.get(EditorOption.layoutInfo);
+        const originalLayoutInfo = originalOptions.get(148 );
         const originalLineNumbersWidth = originalLayoutInfo.glyphMarginWidth + originalLayoutInfo.lineNumbersWidth;
-        const modifiedLayoutInfo = modifiedOptions.get(EditorOption.layoutInfo);
+        const modifiedLayoutInfo = modifiedOptions.get(148 );
         const modifiedLineNumbersWidth = 10 + modifiedLayoutInfo.glyphMarginWidth + modifiedLayoutInfo.lineNumbersWidth;
         let rowClassName = 'diff-review-row';
         let lineNumbersExtraClassName = '';
@@ -501,17 +501,17 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localize(5239, "blank"));
+            lineContent = ( localize(5274, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
-                    ariaLabel = ( localize(5240, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
+                    ariaLabel = ( localize(5275, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
                 }
                 else {
                     ariaLabel = ( localize(
-                        5241,
+                        5276,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -520,10 +520,10 @@ let View = class View extends Disposable {
                 }
                 break;
             case LineType.Added:
-                ariaLabel = ( localize(5242, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
+                ariaLabel = ( localize(5277, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
                 break;
             case LineType.Deleted:
-                ariaLabel = ( localize(5243, "- {0} original line {1}", lineContent, item.originalLineNumber));
+                ariaLabel = ( localize(5278, "- {0} original line {1}", lineContent, item.originalLineNumber));
                 break;
         }
         row.setAttribute('aria-label', ariaLabel);
@@ -531,12 +531,12 @@ let View = class View extends Disposable {
     }
     _getLineHtml(model, options, tabSize, lineNumber, languageIdCodec) {
         const lineContent = model.getLineContent(lineNumber);
-        const fontInfo = options.get(EditorOption.fontInfo);
+        const fontInfo = options.get(52 );
         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(EditorOption.disableMonospaceOptimizations)),
+            (fontInfo.isMonospace && !options.get(33 )),
             fontInfo.canUseHalfwidthRightwardsArrow,
             lineContent,
             false,
@@ -550,10 +550,10 @@ let View = class View extends Disposable {
             fontInfo.spaceWidth,
             fontInfo.middotWidth,
             fontInfo.wsmiddotWidth,
-            options.get(EditorOption.stopRenderingLineAfter),
-            options.get(EditorOption.renderWhitespace),
-            options.get(EditorOption.renderControlCharacters),
-            options.get(EditorOption.fontLigatures) !== EditorFontLigatures.OFF,
+            options.get(120 ),
+            options.get(102 ),
+            options.get(97 ),
+            options.get(53 ) !== EditorFontLigatures.OFF,
             null
         ))));
         return r.html;

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

@@ -1,9 +1,10 @@
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/arrays.js';
-import { derived } from '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/event.js';
 import '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
+import { derived } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
+import '../../../../../base/common/observableInternal/utils.js';
 import { allowsTrueInlineDiffRendering } from './diffEditorViewZones/diffEditorViewZones.js';
 import { MovedBlocksLinesFeature } from '../features/movedBlocksLinesFeature.js';
 import { diffLineDeleteDecorationBackgroundWithIndicator, diffLineDeleteDecorationBackground, diffLineAddDecorationBackgroundWithIndicator, diffLineAddDecorationBackground, diffWholeLineDeleteDecoration, diffWholeLineAddDecoration, diffDeleteDecorationEmpty, diffDeleteDecoration, diffAddDecorationEmpty, diffAddDecoration } from '../registrations.contribution.js';

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

@@ -2,10 +2,10 @@ import { __decorate, __param } from '../../../../../../../../external/tslib/tsli
 import { Emitter } from '../../../../../base/common/event.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import '../../../../../base/common/arrays.js';
-import { derivedOpts, derived } from '../../../../../base/common/observableInternal/derived.js';
 import { autorunHandleChanges } from '../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
+import { derivedOpts, derived } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
+import { observableFromEvent } from '../../../../../base/common/observableInternal/utils.js';
 import { observableCodeEditor } from '../../../observableCodeEditor.js';
 import { OverviewRulerFeature } from '../features/overviewRulerFeature.js';
 import { EditorOptions } from '../../../../common/config/editorOptions.js';
@@ -143,7 +143,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = '';
         }
         const ariaNavigationTip = ( localize(
-            5250,
+            5279,
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()
         ));

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

@@ -1,11 +1,12 @@
-import { Sash, Orientation, SashState } from '../../../../../base/browser/ui/sash/sash.js';
+import { Sash } from '../../../../../base/browser/ui/sash/sash.js';
 import { Disposable } from '../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../base/common/observableInternal/base.js';
-import { derivedWithSetter } from '../../../../../base/common/observableInternal/derived.js';
+import '../../../../../base/common/arrays.js';
+import '../../../../../base/common/event.js';
 import { autorun } from '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/utils.js';
+import { derivedWithSetter } from '../../../../../base/common/observableInternal/derived.js';
 import '../../../../../base/common/cancellation.js';
-import '../../../../../base/common/arrays.js';
+import '../../../../../base/common/observableInternal/utils.js';
 class SashLayout {
     resetSash() {
         this._sashRatio.set(undefined, undefined);
@@ -52,7 +53,7 @@ class DiffEditorSash extends Disposable {
             getVerticalSashTop: (_sash) => 0,
             getVerticalSashLeft: (_sash) => this.sashLeft.get(),
             getVerticalSashHeight: (_sash) => this._dimensions.height.get(),
-        }, { orientation: Orientation.VERTICAL })));
+        }, { orientation: 0  })));
         this._startSashPosition = undefined;
         this._register(this._sash.onDidStart(() => {
             this._startSashPosition = this.sashLeft.get();
@@ -70,7 +71,7 @@ class DiffEditorSash extends Disposable {
         }));
         this._register(autorun(reader => {
             const enabled = this._enabled.read(reader);
-            this._sash.state = enabled ? SashState.Enabled : SashState.Disabled;
+            this._sash.state = enabled ? 3  : 0 ;
             this.sashLeft.read(reader);
             this._dimensions.height.read(reader);
             this._sash.layout();

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

@@ -5,10 +5,11 @@ import { RunOnceScheduler } from '../../../../../../base/common/async.js';
 import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import { observableValue } from '../../../../../../base/common/observableInternal/base.js';
-import { derivedWithStore, derived } from '../../../../../../base/common/observableInternal/derived.js';
+import '../../../../../../base/common/event.js';
 import { autorun } from '../../../../../../base/common/observableInternal/autorun.js';
-import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
+import { derivedWithStore, derived } from '../../../../../../base/common/observableInternal/derived.js';
 import '../../../../../../base/common/cancellation.js';
+import { observableFromEvent } from '../../../../../../base/common/observableInternal/utils.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
 import { assertIsDefined } from '../../../../../../base/common/types.js';
 import { applyFontInfo } from '../../../../config/domFontInfo.js';
@@ -17,12 +18,9 @@ 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 { ScrollType } from '../../../../../common/editorCommon.js';
-import { BackgroundTokenizationState } from '../../../../../common/tokenizationTextModelPart.js';
-import { InlineDecoration, InlineDecorationType } from '../../../../../common/viewModel.js';
+import { InlineDecoration } from '../../../../../common/viewModel.js';
 import { IClipboardService } from '../../../../../../platform/clipboard/common/clipboardService.service.js';
 import { IContextMenuService } from '../../../../../../platform/contextview/browser/contextView.service.js';
 import { Range } from '../../../../../common/core/range.js';
@@ -56,17 +54,17 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             updateImmediately.schedule();
         } }));
         this._register(this._editors.original.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(EditorOption.wrappingInfo) || args.hasChanged(EditorOption.lineHeight)) {
+            if (args.hasChanged(149 ) || args.hasChanged(69 )) {
                 updateImmediately.schedule();
             }
         }));
         this._register(this._editors.modified.onDidChangeConfiguration((args) => {
-            if (args.hasChanged(EditorOption.wrappingInfo) || args.hasChanged(EditorOption.lineHeight)) {
+            if (args.hasChanged(149 ) || args.hasChanged(69 )) {
                 updateImmediately.schedule();
             }
         }));
         const originalModelTokenizationCompleted = ( ( this._diffModel.map(
-            m => m ? observableFromEvent(this, m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === BackgroundTokenizationState.Completed) : undefined
+            m => m ? observableFromEvent(this, m.model.original.onDidChangeTokens, () => m.model.original.tokenization.backgroundTokenizationState === 2 ) : undefined
         )).map((m, reader) => m?.read(reader)));
         const alignments = derived((reader) => {
             const diffModel = this._diffModel.read(reader);
@@ -136,7 +134,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
             }
             const lineBreakData = deletedCodeLineBreaksComputer?.finalize() ?? [];
             let lineBreakDataIdx = 0;
-            const modLineHeight = this._editors.modified.getOption(EditorOption.lineHeight);
+            const modLineHeight = this._editors.modified.getOption(69 );
             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;
@@ -162,7 +160,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                             decorations.push(( new InlineDecoration(
                                 i.originalRange.delta(-(a.diff.original.startLineNumber - 1)),
                                 diffDeleteDecoration.className,
-                                InlineDecorationType.Regular
+                                0
                             )));
                         }
                         const result = renderLines(source, renderOptions, decorations, deletedCodeDomNode);
@@ -315,7 +313,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, ScrollType.Immediate);
+                this._editors.modified.setScrollTop(newScrollTopModified, 1 );
             }
         }));
         this._register(autorun(reader => {
@@ -323,7 +321,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, ScrollType.Immediate);
+                this._editors.original.setScrollTop(newScrollTopOriginal, 1 );
             }
         }));
         this._register(autorun(reader => {
@@ -364,8 +362,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(EditorOption.lineHeight);
-    const modLineHeight = modifiedEditor.getOption(EditorOption.lineHeight);
+    const origLineHeight = originalEditor.getOption(69 );
+    const modLineHeight = modifiedEditor.getOption(69 );
     const result = [];
     let lastOriginalLineNumber = 0;
     let lastModifiedLineNumber = 0;
@@ -470,9 +468,9 @@ function computeRangeAlignment(originalEditor, modifiedEditor, diffs, originalEd
 function getAdditionalLineHeights(editor, viewZonesToIgnore) {
     const viewZoneHeights = [];
     const wrappingZoneHeights = [];
-    const hasWrapping = editor.getOption(EditorOption.wrappingInfo).wrappingColumn !== -1;
+    const hasWrapping = editor.getOption(149 ).wrappingColumn !== -1;
     const coordinatesConverter = editor._getViewModel().coordinatesConverter;
-    const editorLineHeight = editor.getOption(EditorOption.lineHeight);
+    const editorLineHeight = editor.getOption(69 );
     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,9 +4,6 @@ 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 { localize } from '../../../../../../nls.js';
 class InlineDiffDeletedCodeMargin extends Disposable {
     get visibility() {
@@ -34,14 +31,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(EditorOption.lineHeight);
+        const lineHeight = this._modifiedEditor.getOption(69 );
         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(EditorOption.useShadowDOM) && !isIOS;
+        const useShadowDOM = _modifiedEditor.getOption(130 ) && !isIOS;
         const showContextMenu = (x, y) => {
             this._contextMenuService.showContextMenu({
                 domForShadowRoot: useShadowDOM ? _modifiedEditor.getDomNode() ?? undefined : undefined,
@@ -51,37 +48,37 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( (new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localize(9993, "Copy deleted lines"))
-                            : ( localize(9994, "Copy deleted line")))
+                            ? ( localize(10074, "Copy deleted lines"))
+                            : ( localize(10075, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localize(9995, "Copy changed lines"))
-                            : ( localize(9996, "Copy changed line"))), undefined, true, async () => {
+                            ? ( localize(10076, "Copy changed lines"))
+                            : ( localize(10077, "Copy changed line"))), undefined, true, async () => {
                         const originalText = this._originalTextModel.getValueInRange(_diff.original.toExclusiveRange());
                         await this._clipboardService.writeText(originalText);
                     }))));
                     if (_diff.original.length > 1) {
                         actions.push(( (new Action('diff.clipboard.copyDeletedLineContent', isDeletion
                             ? ( localize(
-                            9997,
+                            10078,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localize(
-                            9998,
+                            10079,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
                             let lineContent = this._originalTextModel.getLineContent(_diff.original.startLineNumber + currentLineNumberOffset);
                             if (lineContent === '') {
                                 const eof = this._originalTextModel.getEndOfLineSequence();
-                                lineContent = eof === EndOfLineSequence.LF ? '\n' : '\r\n';
+                                lineContent = eof === 0  ? '\n' : '\r\n';
                             }
                             await this._clipboardService.writeText(lineContent);
                         }))));
                     }
-                    const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
+                    const readOnly = _modifiedEditor.getOption(94 );
                     if (!readOnly) {
-                        actions.push(( (new Action('diff.inline.revertChange', ( localize(9999, "Revert this change")), undefined, true, async () => {
+                        actions.push(( (new Action('diff.inline.revertChange', ( localize(10080, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         }))));
                     }
@@ -100,7 +97,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
             showContextMenu(e.posx, top + height + pad);
         }));
         this._register(_modifiedEditor.onMouseMove((e) => {
-            if ((e.target.type === MouseTargetType.CONTENT_VIEW_ZONE || e.target.type === MouseTargetType.GUTTER_VIEW_ZONE) && e.target.detail.viewZoneId === this._getViewZoneId()) {
+            if (((e.target.type === 8  || e.target.type === 5) ) && e.target.detail.viewZoneId === this._getViewZoneId()) {
                 currentLineNumberOffset = this._updateLightBulbPosition(this._marginDomNode, e.event.browserEvent.y, lineHeight);
                 this.visibility = true;
             }
@@ -112,7 +109,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
             if (!e.event.leftButton) {
                 return;
             }
-            if (e.target.type === MouseTargetType.CONTENT_VIEW_ZONE || e.target.type === MouseTargetType.GUTTER_VIEW_ZONE) {
+            if (e.target.type === 8  || e.target.type === 5 ) {
                 const viewZoneId = e.target.detail.viewZoneId;
                 if (viewZoneId === this._getViewZoneId()) {
                     e.event.preventDefault();