@codingame/monaco-vscode-api 18.3.1 → 19.0.0

package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.js

@@ -6,13 +6,8 @@ class ViewLineOptions {
         this.themeType = themeType;
         const options = config.options;
         const fontInfo = options.get(EditorOption.fontInfo);
-        const experimentalWhitespaceRendering = options.get(EditorOption.experimentalWhitespaceRendering);
-        if (experimentalWhitespaceRendering === 'off') {
-            this.renderWhitespace = options.get(EditorOption.renderWhitespace);
-        }
-        else {
-            this.renderWhitespace = 'none';
-        }
+        this.renderWhitespace = options.get(EditorOption.renderWhitespace);
+        this.experimentalWhitespaceRendering = options.get(EditorOption.experimentalWhitespaceRendering);
         this.renderControlCharacters = options.get(EditorOption.renderControlCharacters);
         this.spaceWidth = fontInfo.spaceWidth;
         this.middotWidth = fontInfo.middotWidth;
@@ -28,6 +23,7 @@ class ViewLineOptions {
     equals(other) {
         return (this.themeType === other.themeType
             && this.renderWhitespace === other.renderWhitespace
+            && this.experimentalWhitespaceRendering === other.experimentalWhitespaceRendering
             && this.renderControlCharacters === other.renderControlCharacters
             && this.spaceWidth === other.spaceWidth
             && this.middotWidth === other.middotWidth

package/vscode/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.js

@@ -142,7 +142,12 @@ let ViewLinesGpu = class ViewLinesGpu extends ViewPart {
         }
         const fontFamily = this._context.configuration.options.get(EditorOption.fontFamily);
         const fontSize = this._context.configuration.options.get(EditorOption.fontSize);
-        this._glyphRasterizer.value = this._register(( new GlyphRasterizer(fontSize, fontFamily, this._viewGpuContext.devicePixelRatio.get())));
+        this._glyphRasterizer.value = this._register(( new GlyphRasterizer(
+            fontSize,
+            fontFamily,
+            this._viewGpuContext.devicePixelRatio.get(),
+            ViewGpuContext.decorationStyleCache
+        )));
         this._register(runOnChange(this._viewGpuContext.devicePixelRatio, () => {
             this._refreshGlyphRasterizer();
         }));
@@ -333,7 +338,12 @@ let ViewLinesGpu = class ViewLinesGpu extends ViewPart {
         if (glyphRasterizer.fontFamily !== fontFamily ||
             glyphRasterizer.fontSize !== fontSize ||
             glyphRasterizer.devicePixelRatio !== devicePixelRatio) {
-            this._glyphRasterizer.value = ( new GlyphRasterizer(fontSize, fontFamily, devicePixelRatio));
+            this._glyphRasterizer.value = ( new GlyphRasterizer(
+                fontSize,
+                fontFamily,
+                devicePixelRatio,
+                ViewGpuContext.decorationStyleCache
+            ));
         }
     }
     renderText(viewportData) {

package/vscode/src/vs/editor/browser/viewParts/whitespace/whitespace.js

@@ -72,11 +72,10 @@ class WhitespaceOverlay extends DynamicViewOverlay {
         for (let i = 0; i < lineCount; i++) {
             needed[i] = true;
         }
-        const viewportData = this._context.viewModel.getMinimapLinesRenderingData(ctx.viewportData.startLineNumber, ctx.viewportData.endLineNumber, needed);
         this._renderResult = [];
         for (let lineNumber = ctx.viewportData.startLineNumber; lineNumber <= ctx.viewportData.endLineNumber; lineNumber++) {
             const lineIndex = lineNumber - ctx.viewportData.startLineNumber;
-            const lineData = viewportData.data[lineIndex];
+            const lineData = this._context.viewModel.getViewLineRenderingData(lineNumber);
             let selectionsOnLine = null;
             if (this._options.renderWhitespace === 'selection') {
                 const selections = this._selection;
@@ -98,6 +97,9 @@ class WhitespaceOverlay extends DynamicViewOverlay {
         }
     }
     _applyRenderWhitespace(ctx, lineNumber, selections, lineData) {
+        if (lineData.hasVariableFonts) {
+            return '';
+        }
         if (this._options.renderWhitespace === 'selection' && !selections) {
             return '';
         }

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.d.ts

@@ -19,7 +19,7 @@ import * as editorCommon from "../../../common/editorCommon.js";
 import { ILanguageConfigurationService } from "../../../common/languages/languageConfigurationRegistry.service.js";
 import { IAttachedView, ICursorStateComputer, IIdentifiedSingleEditOperation, IModelDecoration, IModelDecorationsChangeAccessor, IModelDeltaDecoration, ITextModel } from "../../../common/model.js";
 import { ILanguageFeaturesService } from "../../../common/services/languageFeatures.service.js";
-import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, ModelLineHeightChangedEvent } from "../../../common/textModelEvents.js";
+import { IModelContentChangedEvent, IModelDecorationsChangedEvent, IModelLanguageChangedEvent, IModelLanguageConfigurationChangedEvent, IModelOptionsChangedEvent, IModelTokensChangedEvent, ModelFontChangedEvent, ModelLineHeightChangedEvent } from "../../../common/textModelEvents.js";
 import { IEditorWhitespace, IViewModel } from "../../../common/viewModel.js";
 import { ViewModel } from "../../../common/viewModel/viewModelImpl.js";
 import { IAccessibilityService } from "../../../../platform/accessibility/common/accessibility.service.js";
@@ -30,6 +30,8 @@ import { IInstantiationService, ServicesAccessor } from "../../../../platform/in
 import { INotificationService } from "../../../../platform/notification/common/notification.service.js";
 import { IThemeService } from "../../../../platform/theme/common/themeService.service.js";
 import { MenuId } from "../../../../platform/actions/common/actions.js";
+import { TextModelEditReason } from "../../../common/textModelEditReason.js";
+import { TextEdit } from "../../../common/core/edits/textEdit.js";
 export declare class CodeEditorWidget extends Disposable implements editorBrowser.ICodeEditor {
     private readonly languageConfigurationService;
     private static readonly dropIntoEditorDecorationOptions;
@@ -49,6 +51,8 @@ export declare class CodeEditorWidget extends Disposable implements editorBrowse
     readonly onDidChangeModelDecorations: Event<IModelDecorationsChangedEvent>;
     private readonly _onDidChangeLineHeight;
     readonly onDidChangeLineHeight: Event<ModelLineHeightChangedEvent>;
+    private readonly _onDidChangeFont;
+    readonly onDidChangeFont: Event<ModelFontChangedEvent>;
     private readonly _onDidChangeModelTokens;
     readonly onDidChangeModelTokens: Event<IModelTokensChangedEvent>;
     private readonly _onDidChangeConfiguration;
@@ -249,13 +253,15 @@ export declare class CodeEditorWidget extends Disposable implements editorBrowse
     _getViewModel(): IViewModel | null;
     pushUndoStop(): boolean;
     popUndoStop(): boolean;
-    executeEdits(source: string | null | undefined, edits: IIdentifiedSingleEditOperation[], endCursorState?: ICursorStateComputer | Selection[]): boolean;
+    edit(edit: TextEdit, reason: TextModelEditReason): boolean;
+    executeEdits(source: string | null | undefined | TextModelEditReason, edits: IIdentifiedSingleEditOperation[], endCursorState?: ICursorStateComputer | Selection[]): boolean;
     executeCommand(source: string | null | undefined, command: editorCommon.ICommand): void;
     executeCommands(source: string | null | undefined, commands: editorCommon.ICommand[]): void;
     createDecorationsCollection(decorations?: IModelDeltaDecoration[]): EditorDecorationsCollection;
     changeDecorations(callback: (changeAccessor: IModelDecorationsChangeAccessor) => any): any;
     getLineDecorations(lineNumber: number): IModelDecoration[] | null;
     getDecorationsInRange(range: Range): IModelDecoration[] | null;
+    getFontSizeAtPosition(position: IPosition): string | null;
     deltaDecorations(oldDecorations: string[], newDecorations: IModelDeltaDecoration[]): string[];
     removeDecorations(decorationIds: string[]): void;
     setDecorationsByType(description: string, decorationTypeKey: string, decorationOptions: editorCommon.IDecorationOptions[]): readonly string[];

package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js

@@ -18,7 +18,7 @@ import { View } from '../../view.js';
 import { DOMLineBreaksComputerFactory } from '../../view/domLineBreaksComputer.js';
 import { ViewUserInputEvents } from '../../view/viewUserInputEvents.js';
 import { CodeEditorContributions } from './codeEditorContributions.js';
-import { EditorOption, filterValidationDecorations } from '../../../common/config/editorOptions.js';
+import { EditorOption, filterValidationDecorations, filterFontDecorations } from '../../../common/config/editorOptions.js';
 import { CursorColumns } from '../../../common/core/cursorColumns.js';
 import { editorUnnecessaryCodeOpacity } from '../../../common/core/editorColorRegistry.js';
 import { Position } from '../../../common/core/position.js';
@@ -60,6 +60,7 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
 import { IThemeService } from '../../../../platform/theme/common/themeService.service.js';
 import { MenuId } from '../../../../platform/actions/common/actions.js';
+import { TextModelEditReason, EditReasons } from '../../../common/textModelEditReason.js';
 import Severity$1 from '../../../../base/common/severity.js';
 
 var CodeEditorWidget_1;
@@ -96,6 +97,8 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this.onDidChangeModelDecorations = this._onDidChangeModelDecorations.event;
         this._onDidChangeLineHeight = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
         this.onDidChangeLineHeight = this._onDidChangeLineHeight.event;
+        this._onDidChangeFont = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
+        this.onDidChangeFont = this._onDidChangeFont.event;
         this._onDidChangeModelTokens = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
         this.onDidChangeModelTokens = this._onDidChangeModelTokens.event;
         this._onDidChangeConfiguration = this._register(( new Emitter({ deliveryQueue: this._deliveryQueue })));
@@ -463,8 +466,11 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
             return -1;
         }
         const viewModel = this._modelData.viewModel;
-        if (viewModel.coordinatesConverter.modelPositionIsVisible(Position.lift(position))) {
-            return viewModel.viewLayout.getLineHeightForLineNumber(position.lineNumber);
+        const coordinatesConverter = viewModel.coordinatesConverter;
+        const pos = Position.lift(position);
+        if (coordinatesConverter.modelPositionIsVisible(pos)) {
+            const viewPosition = coordinatesConverter.convertModelPositionToViewPosition(pos);
+            return viewModel.viewLayout.getLineHeightForLineNumber(viewPosition.lineNumber);
         }
         return 0;
     }
@@ -934,6 +940,9 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this._modelData.model.popStackElement();
         return true;
     }
+    edit(edit, reason) {
+        return this.executeEdits(reason, ( edit.replacements.map(e => ({ range: e.range, text: e.text }))), undefined);
+    }
     executeEdits(source, edits, endCursorState) {
         if (!this._modelData) {
             return false;
@@ -951,8 +960,18 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         else {
             cursorStateComputer = endCursorState;
         }
-        this._onBeforeExecuteEdit.fire({ source: source ?? undefined });
-        this._modelData.viewModel.executeEdits(source, edits, cursorStateComputer);
+        let sourceStr;
+        let reason;
+        if (source instanceof TextModelEditReason) {
+            reason = source;
+            sourceStr = source.metadata.source;
+        }
+        else {
+            reason = EditReasons.unknown({ name: sourceStr });
+            sourceStr = source;
+        }
+        this._onBeforeExecuteEdit.fire({ source: sourceStr ?? undefined });
+        this._modelData.viewModel.executeEdits(sourceStr, edits, cursorStateComputer, reason);
         return true;
     }
     executeCommand(source, command) {
@@ -980,13 +999,21 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         if (!this._modelData) {
             return null;
         }
-        return this._modelData.model.getLineDecorations(lineNumber, this._id, filterValidationDecorations(this._configuration.options));
+        const options = this._configuration.options;
+        return this._modelData.model.getLineDecorations(lineNumber, this._id, filterValidationDecorations(options), filterFontDecorations(options));
     }
     getDecorationsInRange(range) {
         if (!this._modelData) {
             return null;
         }
-        return this._modelData.model.getDecorationsInRange(range, this._id, filterValidationDecorations(this._configuration.options));
+        const options = this._configuration.options;
+        return this._modelData.model.getDecorationsInRange(range, this._id, filterValidationDecorations(options), filterFontDecorations(options));
+    }
+    getFontSizeAtPosition(position) {
+        if (!this._modelData) {
+            return null;
+        }
+        return this._modelData.viewModel.getFontSizeAtPosition(position);
     }
     deltaDecorations(oldDecorations, newDecorations) {
         if (!this._modelData) {
@@ -1337,7 +1364,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                     if (e.reachedMaxCursorCount) {
                         const multiCursorLimit = this.getOption(EditorOption.multiCursorLimit);
                         const message = ( localize(
-                            147,
+                            151,
                             "The number of cursors has been limited to {0}. Consider using [find and replace](https://code.visualstudio.com/docs/editor/codebasics#_find-and-replace) for larger changes or increase the editor multi cursor limit setting.",
                             multiCursorLimit
                         ));
@@ -1349,7 +1376,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                                 }
                             },
                             {
-                                label: ( localize(148, 'Increase Multi Cursor Limit')),
+                                label: ( localize(152, 'Increase Multi Cursor Limit')),
                                 run: () => {
                                     this._commandService.executeCommand('workbench.action.openSettings2', {
                                         query: 'editor.multiCursorLimit'
@@ -1403,6 +1430,9 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                 case OutgoingViewModelEventKind.ModelLineHeightChanged:
                     this._onDidChangeLineHeight.fire(e.event);
                     break;
+                case OutgoingViewModelEventKind.ModelFontChangedEvent:
+                    this._onDidChangeFont.fire(e.event);
+                    break;
             }
         }));
         const [view, hasRealView] = this._createView(viewModel);

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

@@ -18,7 +18,7 @@ class ToggleCollapseUnchangedRegions extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleCollapseUnchangedRegions',
-            title: ( localize2(149, 'Toggle Collapse Unchanged Regions')),
+            title: ( localize2(153, 'Toggle Collapse Unchanged Regions')),
             icon: Codicon.map,
             toggled: ( ContextKeyExpr.has('config.diffEditor.hideUnchangedRegions.enabled')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
@@ -40,7 +40,7 @@ class ToggleShowMovedCodeBlocks extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleShowMovedCodeBlocks',
-            title: ( localize2(150, 'Toggle Show Moved Code Blocks')),
+            title: ( localize2(154, 'Toggle Show Moved Code Blocks')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -54,7 +54,7 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.toggleUseInlineViewWhenSpaceIsLimited',
-            title: ( localize2(151, 'Toggle Use Inline View When Space Is Limited')),
+            title: ( localize2(155, 'Toggle Use Inline View When Space Is Limited')),
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
         });
     }
@@ -64,12 +64,12 @@ class ToggleUseInlineViewWhenSpaceIsLimited extends Action2 {
         configurationService.updateValue('diffEditor.useInlineViewWhenSpaceIsLimited', newValue);
     }
 }
-const diffEditorCategory = ( localize2(152, "Diff Editor"));
+const diffEditorCategory = ( localize2(156, "Diff Editor"));
 class SwitchSide extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.switchSide',
-            title: ( localize2(153, 'Switch Side')),
+            title: ( localize2(157, 'Switch Side')),
             icon: Codicon.arrowSwap,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -93,7 +93,7 @@ class ExitCompareMove extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.exitCompareMove',
-            title: ( localize2(154, 'Exit Compare Move')),
+            title: ( localize2(158, 'Exit Compare Move')),
             icon: Codicon.close,
             precondition: EditorContextKeys.comparingMovedCode,
             f1: false,
@@ -115,7 +115,7 @@ class CollapseAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.collapseAllUnchangedRegions',
-            title: ( localize2(155, 'Collapse All Unchanged Regions')),
+            title: ( localize2(159, 'Collapse All Unchanged Regions')),
             icon: Codicon.fold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -133,7 +133,7 @@ class ShowAllUnchangedRegions extends EditorAction2 {
     constructor() {
         super({
             id: 'diffEditor.showAllUnchangedRegions',
-            title: ( localize2(156, 'Show All Unchanged Regions')),
+            title: ( localize2(160, 'Show All Unchanged Regions')),
             icon: Codicon.unfold,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             f1: true,
@@ -151,7 +151,7 @@ class RevertHunkOrSelection extends Action2 {
     constructor() {
         super({
             id: 'diffEditor.revert',
-            title: ( localize2(157, 'Revert')),
+            title: ( localize2(161, 'Revert')),
             f1: false,
             category: diffEditorCategory,
         });
@@ -164,13 +164,13 @@ class RevertHunkOrSelection extends Action2 {
         return undefined;
     }
 }
-const accessibleDiffViewerCategory = ( localize2(158, "Accessible Diff Viewer"));
+const accessibleDiffViewerCategory = ( localize2(162, "Accessible Diff Viewer"));
 class AccessibleDiffViewerNext extends Action2 {
     static { this.id = 'editor.action.accessibleDiffViewer.next'; }
     constructor() {
         super({
             id: AccessibleDiffViewerNext.id,
-            title: ( localize2(159, 'Go to Next Difference')),
+            title: ( localize2(163, 'Go to Next Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {
@@ -190,7 +190,7 @@ class AccessibleDiffViewerPrev extends Action2 {
     constructor() {
         super({
             id: AccessibleDiffViewerPrev.id,
-            title: ( localize2(160, 'Go to Previous Difference')),
+            title: ( localize2(164, 'Go to Previous Difference')),
             category: accessibleDiffViewerCategory,
             precondition: ( ContextKeyExpr.has('isInDiffEditor')),
             keybinding: {

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

@@ -1,54 +1,57 @@
+.monaco-diff-editor .diff-review {
+	position: absolute;
+}
 .monaco-component.diff-review {
 	user-select: none;
 	-webkit-user-select: none;
 	z-index: 99;
-}
-.monaco-diff-editor .diff-review {
-	position: absolute;
-}
-.monaco-component.diff-review .diff-review-line-number {
-	text-align: right;
-	display: inline-block;
-	color: var(--vscode-editorLineNumber-foreground);
-}
-.monaco-component.diff-review .diff-review-summary {
-	padding-left: 10px;
-}
-.monaco-component.diff-review .diff-review-shadow {
-	position: absolute;
-	box-shadow: var(--vscode-scrollbar-shadow) 0 -6px 6px -6px inset;
-}
-.monaco-component.diff-review .diff-review-row {
-	white-space: pre;
-}
-.monaco-component.diff-review .diff-review-table {
-	display: table;
-	min-width: 100%;
-}
-.monaco-component.diff-review .diff-review-row {
-	display: table-row;
-	width: 100%;
-}
-.monaco-component.diff-review .diff-review-spacer {
-	display: inline-block;
-	width: 10px;
-	vertical-align: middle;
-}
-.monaco-component.diff-review .diff-review-spacer > .codicon {
-	font-size: 9px !important;
-}
-.monaco-component.diff-review .diff-review-actions {
-	display: inline-block;
-	position: absolute;
-	right: 10px;
-	top: 2px;
-	z-index: 100;
-}
-.monaco-component.diff-review .diff-review-actions .action-label {
-	width: 16px;
-	height: 16px;
-	margin: 2px 0;
-}
-.monaco-component.diff-review .revertButton {
-	cursor: pointer;
+	.diff-review-line-number {
+		text-align: right;
+		display: inline-block;
+		color: var(--vscode-editorLineNumber-foreground);
+	}
+	.diff-review-summary {
+		padding-left: 10px;
+	}
+	.diff-review-shadow {
+		position: absolute;
+		box-shadow: var(--vscode-scrollbar-shadow) 0 -6px 6px -6px inset;
+	}
+	.diff-review-row {
+		white-space: pre;
+	}
+	.diff-review-table {
+		display: table;
+		min-width: 100%;
+	}
+	.diff-review-row {
+		display: table-row;
+		width: 100%;
+	}
+	.diff-review-spacer {
+		display: inline-block;
+		width: 10px;
+		vertical-align: middle;
+	}
+	.diff-review-spacer > .codicon {
+		font-size: 9px !important;
+	}
+	.diff-review-actions {
+		display: inline-block;
+		position: absolute;
+		right: 10px;
+		top: 2px;
+		z-index: 100;
+	}
+	.diff-review-actions .action-label {
+		width: 16px;
+		height: 16px;
+		margin: 2px 0;
+	}
+	.revertButton {
+		cursor: pointer;
+	}
+	.action-label {
+		background: var(--vscode-editorActionList-background);
+	}
 }

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

@@ -30,15 +30,15 @@ import { IInstantiationService } from '../../../../../platform/instantiation/com
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
 import * as accessibleDiffViewer from './accessibleDiffViewer.css';
 import { toAction } from '../../../../../base/common/actions.js';
-import { transaction, subtransaction } from '../../../../../base/common/observableInternal/transaction.js';
 import { derived } from '../../../../../base/common/observableInternal/observables/derived.js';
+import { transaction, subtransaction } from '../../../../../base/common/observableInternal/transaction.js';
 import { observableValue } from '../../../../../base/common/observableInternal/observables/observableValue.js';
 import { autorun, autorunWithStore } from '../../../../../base/common/observableInternal/reactions/autorun.js';
 
 registerCss(accessibleDiffViewer);
-const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(161, 'Icon for \'Insert\' in accessible diff viewer.')));
-const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(162, 'Icon for \'Remove\' in accessible diff viewer.')));
-const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(163, 'Icon for \'Close\' in accessible diff viewer.')));
+const accessibleDiffViewerInsertIcon = registerIcon('diff-review-insert', Codicon.add, ( localize(165, 'Icon for \'Insert\' in accessible diff viewer.')));
+const accessibleDiffViewerRemoveIcon = registerIcon('diff-review-remove', Codicon.remove, ( localize(166, 'Icon for \'Remove\' in accessible diff viewer.')));
+const accessibleDiffViewerCloseIcon = registerIcon('diff-review-close', Codicon.close, ( localize(167, '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) {
@@ -305,7 +305,7 @@ let View = class View extends Disposable {
             if (this._model.canClose.read(reader)) {
                 this._actionBar.push(toAction({
                     id: 'diffreview.close',
-                    label: ( localize(164, "Close")),
+                    label: ( localize(168, "Close")),
                     class: 'close-diff-review ' + ThemeIcon.asClassName(accessibleDiffViewerCloseIcon),
                     enabled: true,
                     run: async () => _model.close()
@@ -362,7 +362,7 @@ 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(165, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
+        container.setAttribute('aria-label', ( localize(169, 'Accessible Diff Viewer. Use arrow up and down to navigate.')));
         applyFontInfo(container, modifiedOptions.get(EditorOption.fontInfo));
         reset(this._content, container);
         const originalModel = this._models.getOriginalModel();
@@ -386,13 +386,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(166, "no lines changed"))
-                    : lines === 1 ? ( localize(167, "1 line changed"))
-                        : ( localize(168, "{0} lines changed", lines));
+                const getAriaLines = (lines) => lines === 0 ? ( localize(170, "no lines changed"))
+                    : lines === 1 ? ( localize(171, "1 line changed"))
+                        : ( localize(172, "{0} lines changed", lines));
                 const originalChangedLinesCntAria = getAriaLines(r.original.length);
                 const modifiedChangedLinesCntAria = getAriaLines(r.modified.length);
                 header.setAttribute('aria-label', ( localize(
-                    169,
+                    173,
                     "Difference {0} of {1}: original line {2}, {3}, modified line {4}, {5}",
                     (diffIndex + 1),
                     diffsLength,
@@ -508,17 +508,17 @@ let View = class View extends Disposable {
             lineContent = originalModel.getLineContent(item.originalLineNumber);
         }
         if (lineContent.length === 0) {
-            lineContent = ( localize(170, "blank"));
+            lineContent = ( localize(174, "blank"));
         }
         let ariaLabel = '';
         switch (item.type) {
             case LineType.Unchanged:
                 if (item.originalLineNumber === item.modifiedLineNumber) {
-                    ariaLabel = ( localize(171, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
+                    ariaLabel = ( localize(175, "{0} unchanged line {1}", lineContent, item.originalLineNumber));
                 }
                 else {
                     ariaLabel = ( localize(
-                        172,
+                        176,
                         "{0} original line {1} modified line {2}",
                         lineContent,
                         item.originalLineNumber,
@@ -527,10 +527,10 @@ let View = class View extends Disposable {
                 }
                 break;
             case LineType.Added:
-                ariaLabel = ( localize(173, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
+                ariaLabel = ( localize(177, "+ {0} modified line {1}", lineContent, item.modifiedLineNumber));
                 break;
             case LineType.Deleted:
-                ariaLabel = ( localize(174, "- {0} original line {1}", lineContent, item.originalLineNumber));
+                ariaLabel = ( localize(178, "- {0} original line {1}", lineContent, item.originalLineNumber));
                 break;
         }
         row.setAttribute('aria-label', ariaLabel);

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

@@ -134,6 +134,8 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
         clonedOptions.inDiffEditor = true;
         clonedOptions.automaticLayout = false;
         clonedOptions.allowVariableLineHeights = false;
+        clonedOptions.allowVariableFonts = false;
+        clonedOptions.allowVariableFontsInAccessibilityMode = false;
         clonedOptions.scrollbar = { ...(clonedOptions.scrollbar || {}) };
         clonedOptions.folding = false;
         clonedOptions.codeLens = this._options.diffCodeLens.get();
@@ -153,7 +155,7 @@ let DiffEditorEditors = class DiffEditorEditors extends Disposable {
             ariaLabel = '';
         }
         const ariaNavigationTip = ( localize(
-            175,
+            179,
             ' use {0} to open the accessibility help.',
             this._keybindingService.lookupKeybinding('editor.action.accessibilityHelp')?.getAriaLabel()
         ));

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

@@ -7,7 +7,7 @@ import { Codicon } from '../../../../../../base/common/codicons.js';
 import { Disposable, DisposableStore } from '../../../../../../base/common/lifecycle.js';
 import '../../../../../../base/common/observableInternal/index.js';
 import { ThemeIcon } from '../../../../../../base/common/themables.js';
-import { assertIsDefined } from '../../../../../../base/common/types.js';
+import { assertReturnsDefined } from '../../../../../../base/common/types.js';
 import { applyFontInfo } from '../../../../config/domFontInfo.js';
 import { diffDeleteDecoration, diffRemoveIcon } from '../../registrations.contribution.js';
 import { DiffMapping } from '../../diffEditorViewModel.js';
@@ -181,7 +181,7 @@ let DiffEditorViewZones = class DiffEditorViewZones extends Disposable {
                         }
                         let zoneId = undefined;
                         alignmentViewZonesDisposables.add(( new InlineDiffDeletedCodeMargin(
-                            () => assertIsDefined(zoneId),
+                            () => assertReturnsDefined(zoneId),
                             marginDomNode,
                             this._editors.modified,
                             a.diff,

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

@@ -53,23 +53,23 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     const isDeletion = _diff.modified.isEmpty;
                     actions.push(( new Action('diff.clipboard.copyDeletedContent', isDeletion
                         ? (_diff.original.length > 1
-                            ? ( localize(176, "Copy deleted lines"))
-                            : ( localize(177, "Copy deleted line")))
+                            ? ( localize(180, "Copy deleted lines"))
+                            : ( localize(181, "Copy deleted line")))
                         : (_diff.original.length > 1
-                            ? ( localize(178, "Copy changed lines"))
-                            : ( localize(179, "Copy changed line"))), undefined, true, async () => {
+                            ? ( localize(182, "Copy changed lines"))
+                            : ( localize(183, "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(
-                            180,
+                            184,
                             "Copy deleted line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         ))
                             : ( localize(
-                            181,
+                            185,
                             "Copy changed line ({0})",
                             _diff.original.startLineNumber + currentLineNumberOffset
                         )), undefined, true, async () => {
@@ -83,7 +83,7 @@ class InlineDiffDeletedCodeMargin extends Disposable {
                     }
                     const readOnly = _modifiedEditor.getOption(EditorOption.readOnly);
                     if (!readOnly) {
-                        actions.push(( new Action('diff.inline.revertChange', ( localize(182, "Revert this change")), undefined, true, async () => {
+                        actions.push(( new Action('diff.inline.revertChange', ( localize(186, "Revert this change")), undefined, true, async () => {
                             this._editor.revert(this._diff);
                         })));
                     }