@codingame/monaco-vscode-api 15.0.3 → 16.0.1

package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLines.css

@@ -0,0 +1,53 @@
+.mtkcontrol {
+	color: rgb(255, 255, 255) !important;
+	background: rgb(150, 0, 0) !important;
+}
+.mtkoverflow {
+	background-color: var(--vscode-button-background, var(--vscode-editor-background));
+	color: var(--vscode-button-foreground, var(--vscode-editor-foreground));
+	border-width: 1px;
+	border-style: solid;
+	border-color: var(--vscode-contrastBorder);
+	border-radius: 2px;
+	padding: 4px;
+	cursor: pointer;
+}
+.mtkoverflow:hover {
+	background-color: var(--vscode-button-hoverBackground);
+}
+.monaco-editor.no-user-select .lines-content,
+.monaco-editor.no-user-select .view-line,
+.monaco-editor.no-user-select .view-lines {
+	user-select: none;
+	-webkit-user-select: none;
+}
+.monaco-editor.mac .lines-content:hover,
+.monaco-editor.mac .view-line:hover,
+.monaco-editor.mac .view-lines:hover {
+	user-select: text;
+	-webkit-user-select: text;
+	-ms-user-select: text;
+}
+.monaco-editor.enable-user-select {
+	user-select: initial;
+	-webkit-user-select: initial;
+}
+.monaco-editor .view-lines {
+	white-space: nowrap;
+}
+.monaco-editor .view-line {
+	position: absolute;
+	width: 100%;
+}
+.monaco-editor .lines-content > .view-lines > .view-line > span {
+	top: 0;
+	bottom: 0;
+	position: absolute;
+}
+.monaco-editor .mtkw {
+	color: var(--vscode-editorWhitespace-foreground) !important;
+}
+.monaco-editor .mtkz {
+	display: inline-block;
+	color: var(--vscode-editorWhitespace-foreground) !important;
+}

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

@@ -3,7 +3,7 @@ import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mo
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { isLinux } from '../../../../base/common/platform.js';
 import { Constants } from '../../../../base/common/uint.js';
-import './viewLines.css.js';
+import './viewLines.css';
 import { applyFontInfo } from '../../config/domFontInfo.js';
 import { LineVisibleRanges, HorizontalRange, HorizontalPosition } from '../../view/renderingContext.js';
 import { VisibleLinesCollection } from '../../view/viewLayer.js';

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

@@ -0,0 +1,4 @@
+.monaco-editor .mwh {
+	position: absolute;
+	color: var(--vscode-editorWhitespace-foreground) !important;
+}

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

@@ -1,5 +1,5 @@
 
-import './whitespace.css.js';
+import './whitespace.css';
 import { DynamicViewOverlay } from '../../view/dynamicViewOverlay.js';
 import { EditorOption } from '../../../common/config/editorOptions.js';
 import { firstNonWhitespaceIndex, lastNonWhitespaceIndex } from '../../../../base/common/strings.js';

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

@@ -142,7 +142,6 @@ export declare class CodeEditorWidget extends Disposable implements editorBrowse
     protected readonly _codeEditorService: ICodeEditorService;
     private readonly _commandService;
     private readonly _themeService;
-    private readonly _focusTracker;
     private _contentWidgets;
     private _overlayWidgets;
     private _glyphMarginWidgets;

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

@@ -1,13 +1,13 @@
 
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
 import '../../services/markerDecorations.js';
-import { DragAndDropObserver, getWindow, scheduleAtNextAnimationFrame, trackFocus } from '../../../../base/browser/dom.js';
+import { DragAndDropObserver, getWindow, scheduleAtNextAnimationFrame } from '../../../../base/browser/dom.js';
 import { onUnexpectedError } from '../../../../base/common/errors.js';
 import { createEventDeliveryQueue, Emitter } from '../../../../base/common/event.js';
 import { hash } from '../../../../base/common/hash.js';
 import { Disposable, dispose } from '../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../base/common/network.js';
-import './editor.css.js';
+import './editor.css';
 import { applyFontInfo } from '../../config/domFontInfo.js';
 import { EditorConfiguration } from '../../config/editorConfiguration.js';
 import { TabFocus } from '../../config/tabFocus.js';
@@ -201,10 +201,6 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         this._register(( new EditorModeContext(this, this._contextKeyService, languageFeaturesService)));
         this._instantiationService = this._register(instantiationService.createChild(( new ServiceCollection([IContextKeyService, this._contextKeyService]))));
         this._modelData = null;
-        this._focusTracker = ( new CodeEditorWidgetFocusTracker(domElement, this._overflowWidgetsDomNode));
-        this._register(this._focusTracker.onChange(() => {
-            this._editorWidgetFocus.setValue(this._focusTracker.hasFocus());
-        }));
         this._contentWidgets = {};
         this._overlayWidgets = {};
         this._glyphMarginWidgets = {};
@@ -293,7 +289,6 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     }
     dispose() {
         this._codeEditorService.removeCodeEditor(this);
-        this._focusTracker.dispose();
         this._actions.clear();
         this._contentWidgets = {};
         this._overlayWidgets = {};
@@ -376,8 +371,14 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
             const hasTextFocus = this.hasTextFocus();
             const detachedModel = this._detachModel();
             this._attachModel(model);
-            if (hasTextFocus && this.hasModel()) {
-                this.focus();
+            if (this.hasModel()) {
+                if (hasTextFocus) {
+                    this.focus();
+                }
+            }
+            else {
+                this._editorTextFocus.setValue(false);
+                this._editorWidgetFocus.setValue(false);
             }
             this._removeDecorationTypes();
             this._onDidChangeModel.fire(e);
@@ -749,7 +750,6 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
     }
     onHide() {
         this._modelData?.view.refreshFocusState();
-        this._focusTracker.refreshState();
     }
     getContribution(id) {
         return this._contributions.get(id);
@@ -1097,7 +1097,10 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         return this._modelData.view.isFocused();
     }
     hasWidgetFocus() {
-        return this._focusTracker && this._focusTracker.hasFocus();
+        if (!this._modelData || !this._modelData.hasRealView) {
+            return false;
+        }
+        return this._modelData.view.isWidgetFocused();
     }
     addContentWidget(widget) {
         const widgetData = {
@@ -1299,6 +1302,9 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
                 case OutgoingViewModelEventKind.FocusChanged:
                     this._editorTextFocus.setValue(e.hasFocus);
                     break;
+                case OutgoingViewModelEventKind.WidgetFocusChanged:
+                    this._editorWidgetFocus.setValue(e.hasFocus);
+                    break;
                 case OutgoingViewModelEventKind.ScrollChanged:
                     this._onDidScrollChange.fire(e);
                     break;
@@ -1471,6 +1477,7 @@ let CodeEditorWidget = class CodeEditorWidget extends Disposable {
         viewUserInputEvents.onMouseDropCanceled = (e) => this._onMouseDropCanceled.fire(e);
         viewUserInputEvents.onMouseWheel = (e) => this._onMouseWheel.fire(e);
         const view = ( new View(
+            this._domElement,
             this.getId(),
             commandDelegate,
             this._configuration,
@@ -1778,50 +1785,6 @@ class EditorModeContext extends Disposable {
         });
     }
 }
-class CodeEditorWidgetFocusTracker extends Disposable {
-    constructor(domElement, overflowWidgetsDomNode) {
-        super();
-        this._onChange = this._register(( new Emitter()));
-        this.onChange = this._onChange.event;
-        this._hadFocus = undefined;
-        this._hasDomElementFocus = false;
-        this._domFocusTracker = this._register(trackFocus(domElement));
-        this._overflowWidgetsDomNodeHasFocus = false;
-        this._register(this._domFocusTracker.onDidFocus(() => {
-            this._hasDomElementFocus = true;
-            this._update();
-        }));
-        this._register(this._domFocusTracker.onDidBlur(() => {
-            this._hasDomElementFocus = false;
-            this._update();
-        }));
-        if (overflowWidgetsDomNode) {
-            this._overflowWidgetsDomNode = this._register(trackFocus(overflowWidgetsDomNode));
-            this._register(this._overflowWidgetsDomNode.onDidFocus(() => {
-                this._overflowWidgetsDomNodeHasFocus = true;
-                this._update();
-            }));
-            this._register(this._overflowWidgetsDomNode.onDidBlur(() => {
-                this._overflowWidgetsDomNodeHasFocus = false;
-                this._update();
-            }));
-        }
-    }
-    _update() {
-        const focused = this._hasDomElementFocus || this._overflowWidgetsDomNodeHasFocus;
-        if (this._hadFocus !== focused) {
-            this._hadFocus = focused;
-            this._onChange.fire(undefined);
-        }
-    }
-    hasFocus() {
-        return this._hadFocus ?? false;
-    }
-    refreshState() {
-        this._domFocusTracker.refreshState();
-        this._overflowWidgetsDomNode?.refreshState?.();
-    }
-}
 class EditorDecorationsCollection {
     get length() {
         return this._decorationIds.length;

package/vscode/src/vs/editor/browser/widget/codeEditor/editor.css

@@ -0,0 +1,92 @@
+::-ms-clear {
+	display: none;
+}
+.monaco-editor .editor-widget input {
+	color: inherit;
+}
+.monaco-editor {
+	position: relative;
+	overflow: visible;
+	-webkit-text-size-adjust: 100%;
+	color: var(--vscode-editor-foreground);
+	background-color: var(--vscode-editor-background);
+	overflow-wrap: initial;
+}
+.monaco-editor-background {
+	background-color: var(--vscode-editor-background);
+}
+.monaco-editor .rangeHighlight {
+	background-color: var(--vscode-editor-rangeHighlightBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-rangeHighlightBorder);
+}
+.monaco-editor.hc-black .rangeHighlight, .monaco-editor.hc-light .rangeHighlight {
+	border-style: dotted;
+}
+.monaco-editor .symbolHighlight {
+	background-color: var(--vscode-editor-symbolHighlightBackground);
+	box-sizing: border-box;
+	border: 1px solid var(--vscode-editor-symbolHighlightBorder);
+}
+.monaco-editor.hc-black .symbolHighlight, .monaco-editor.hc-light .symbolHighlight {
+	border-style: dotted;
+}
+.monaco-editor .editorCanvas {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	z-index: 0;
+	pointer-events: none;
+}
+.monaco-editor .overflow-guard {
+	position: relative;
+	overflow: hidden;
+}
+.monaco-editor .view-overlays {
+	position: absolute;
+	top: 0;
+}
+.monaco-editor .view-overlays > div, .monaco-editor .margin-view-overlays > div {
+	position: absolute;
+	width: 100%;
+}
+.monaco-editor .squiggly-error {
+	border-bottom: 4px double var(--vscode-editorError-border);
+}
+.monaco-editor .squiggly-error::before {
+	display: block;
+	content: '';
+	width: 100%;
+	height: 100%;
+	background: var(--vscode-editorError-background);
+}
+.monaco-editor .squiggly-warning {
+	border-bottom: 4px double var(--vscode-editorWarning-border);
+}
+.monaco-editor .squiggly-warning::before {
+	display: block;
+	content: '';
+	width: 100%;
+	height: 100%;
+	background: var(--vscode-editorWarning-background);
+}
+.monaco-editor .squiggly-info {
+	border-bottom: 4px double var(--vscode-editorInfo-border);
+}
+.monaco-editor .squiggly-info::before {
+	display: block;
+	content: '';
+	width: 100%;
+	height: 100%;
+	background: var(--vscode-editorInfo-background);
+}
+.monaco-editor .squiggly-hint {
+	border-bottom: 2px dotted var(--vscode-editorHint-border);
+}
+.monaco-editor.showUnused .squiggly-unnecessary {
+	border-bottom: 2px dashed var(--vscode-editorUnnecessaryCode-border);
+}
+.monaco-editor.showDeprecated .squiggly-inline-deprecated {
+	text-decoration: line-through;
+	text-decoration-color: var(--vscode-editor-foreground, inherit);
+}

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

@@ -0,0 +1,54 @@
+.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;
+}

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

@@ -27,7 +27,7 @@ import { AccessibilitySignal } from '../../../../../platform/accessibilitySignal
 import { IAccessibilitySignalService } from '../../../../../platform/accessibilitySignal/browser/accessibilitySignalService.service.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { registerIcon } from '../../../../../platform/theme/common/iconRegistry.js';
-import './accessibleDiffViewer.css.js';
+import './accessibleDiffViewer.css';
 import { toAction } from '../../../../../base/common/actions.js';
 import { transaction, observableValue, subtransaction } from '../../../../../base/common/observableInternal/base.js';
 import { derivedWithStore, derived } from '../../../../../base/common/observableInternal/derived.js';

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

@@ -28,6 +28,7 @@ export declare class RenderOptions {
     static fromEditor(editor: ICodeEditor): RenderOptions;
     constructor(tabSize: number, fontInfo: FontInfo, disableMonospaceOptimizations: boolean, typicalHalfwidthCharacterWidth: number, scrollBeyondLastColumn: number, lineHeight: number, lineDecorationsWidth: number, stopRenderingLineAfter: number, renderWhitespace: FindComputedEditorOptionValueById<EditorOption.renderWhitespace>, renderControlCharacters: boolean, fontLigatures: FindComputedEditorOptionValueById<EditorOption.fontLigatures>, setWidth?: boolean);
     withSetWidth(setWidth: boolean): RenderOptions;
+    withScrollBeyondLastColumn(scrollBeyondLastColumn: number): RenderOptions;
 }
 export interface RenderLinesResult {
     minWidthInPx: number;

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

@@ -104,6 +104,22 @@ class RenderOptions {
             setWidth
         ));
     }
+    withScrollBeyondLastColumn(scrollBeyondLastColumn) {
+        return ( new RenderOptions(
+            this.tabSize,
+            this.fontInfo,
+            this.disableMonospaceOptimizations,
+            this.typicalHalfwidthCharacterWidth,
+            scrollBeyondLastColumn,
+            this.lineHeight,
+            this.lineDecorationsWidth,
+            this.stopRenderingLineAfter,
+            this.renderWhitespace,
+            this.renderControlCharacters,
+            this.fontLigatures,
+            this.setWidth
+        ));
+    }
 }
 function renderOriginalLine(viewLineIdx, lineTokens, decorations, hasCharChanges, mightContainNonBasicASCII, mightContainRTL, options, sb, noExtra) {
     sb.appendString('<div class="view-line');

package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.d.ts

@@ -2,7 +2,7 @@ import { Disposable } from "../../../../base/common/lifecycle.js";
 import { IObservable, IReader, ISettableObservable, ITransaction } from "../../../../base/common/observable.js";
 import { IDiffProviderFactoryService } from "./diffProviderFactoryService.service.js";
 import { ISerializedLineRange, LineRange } from "../../../common/core/lineRange.js";
-import { IDocumentDiff } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/editor/common/diff/documentDiffProvider";
+import { IDocumentDiff } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/editor/common/diff/documentDiffProvider";
 import { MovedText } from "../../../common/diff/linesDiffComputer.js";
 import { DetailedLineRangeMapping, LineRangeMapping } from "../../../common/diff/rangeMapping.js";
 import { IDiffEditorModel, IDiffEditorViewModel } from "../../../common/editorCommon.js";

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

@@ -6,22 +6,16 @@ import { Disposable, toDisposable } from '../../../../base/common/lifecycle.js';
 import '../../../../base/common/observableInternal/index.js';
 import { IDiffProviderFactoryService } from './diffProviderFactoryService.service.js';
 import { filterWithPrevious } from './utils.js';
-import '../../../../base/common/process.js';
+import { readHotReloadableExport } from '../../../../base/common/hotReloadHelpers.js';
 import { LineRange, LineRangeSet } from '../../../common/core/lineRange.js';
-import { groupAdjacentBy } from '../../../../base/common/arrays.js';
-import { softAssert } from '../../../../base/common/assert.js';
-import '../../../../base/common/strings.js';
-import '../../../../base/common/arraysFind.js';
-import '../../../common/core/textLength.js';
+import { DefaultLinesDiffComputer } from '../../../common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js';
 import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from '../../../common/diff/rangeMapping.js';
-import '../../../common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js';
-import '../../../common/diff/defaultLinesDiffComputer/utils.js';
-import '../../../../base/common/map.js';
-import '../../../common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js';
-import '../../../../base/common/charCode.js';
 import { TextEditInfo } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/beforeEditPositionMapper.js';
 import { combineTextEditInfos } from '../../../common/model/bracketPairsTextModelPart/bracketPairsTree/combineTextEditInfos.js';
+import { optimizeSequenceDiffs } from '../../../common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.js';
 import { isDefined } from '../../../../base/common/types.js';
+import { groupAdjacentBy } from '../../../../base/common/arrays.js';
+import { softAssert } from '../../../../base/common/assert.js';
 import { waitForState } from '../../../../base/common/observableInternal/utilsCancellation.js';
 import { observableValue, transaction } from '../../../../base/common/observableInternal/base.js';
 import { derived } from '../../../../base/common/observableInternal/derived.js';
@@ -206,6 +200,8 @@ let DiffEditorViewModel = class DiffEditorViewModel extends Disposable {
             contentChangedSignal.read(reader);
             const documentDiffProvider = this._diffProvider.read(reader);
             documentDiffProvider.onChangeSignal.read(reader);
+            readHotReloadableExport(DefaultLinesDiffComputer, reader);
+            readHotReloadableExport(optimizeSequenceDiffs, reader);
             this._isDiffUpToDate.set(false, undefined);
             let originalTextEditInfos = [];
             store.add(model.original.onDidChangeContent((e) => {

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

@@ -36,7 +36,7 @@ import { HideUnchangedRegionsFeature } from './features/hideUnchangedRegionsFeat
 import { MovedBlocksLinesFeature } from './features/movedBlocksLinesFeature.js';
 import { OverviewRulerFeature } from './features/overviewRulerFeature.js';
 import { RevertButtonsFeature } from './features/revertButtonsFeature.js';
-import './style.css.js';
+import './style.css';
 import { ObservableElementSizeObserver, applyViewZones, applyStyle, RefCounted, translatePosition } from './utils.js';
 import { disposableObservableValue, observableValue, subtransaction, transaction } from '../../../../base/common/observableInternal/base.js';
 import { derived, derivedDisposable } from '../../../../base/common/observableInternal/derived.js';
@@ -145,7 +145,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         this._register(bindContextKey(EditorContextKeys.diffEditorModifiedUri, this._contextKeyService, reader => this._diffModel.read(reader)?.model.modified.uri.toString() ?? ''));
         this._overviewRulerPart = derivedDisposable(this, reader => !this._options.renderOverviewRuler.read(reader)
             ? undefined
-            : this._instantiationService.createInstance(readHotReloadableExport(OverviewRulerFeature), this._editors, this.elements.root, this._diffModel, this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._layoutInfo.map(i => i.modifiedEditor)))).recomputeInitiallyAndOnChange(this._store);
+            : this._instantiationService.createInstance(readHotReloadableExport(OverviewRulerFeature, reader), this._editors, this.elements.root, this._diffModel, this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._layoutInfo.map(i => i.modifiedEditor)))).recomputeInitiallyAndOnChange(this._store);
         const dimensions = {
             height: this._rootSizeObserver.height,
             width: ( this._rootSizeObserver.width.map((w, reader) => w - (this._overviewRulerPart.read(reader)?.width ?? 0))),
@@ -163,12 +163,12 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
                 () => this._sashLayout.resetSash()
             ));
         }).recomputeInitiallyAndOnChange(this._store);
-        const unchangedRangesFeature = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(HideUnchangedRegionsFeature), this._editors, this._diffModel, this._options)).recomputeInitiallyAndOnChange(this._store);
-        derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorDecorations), this._editors, this._diffModel, this._options, this)).recomputeInitiallyAndOnChange(this._store);
+        const unchangedRangesFeature = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(HideUnchangedRegionsFeature, reader), this._editors, this._diffModel, this._options)).recomputeInitiallyAndOnChange(this._store);
+        derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorDecorations, reader), this._editors, this._diffModel, this._options, this)).recomputeInitiallyAndOnChange(this._store);
         const origViewZoneIdsToIgnore = ( new Set());
         const modViewZoneIdsToIgnore = ( new Set());
         let isUpdatingViewZones = false;
-        const viewZoneManager = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorViewZones), getWindow(this._domElement), this._editors, this._diffModel, this._options, this, () => isUpdatingViewZones || unchangedRangesFeature.get().isUpdatingHiddenAreas, origViewZoneIdsToIgnore, modViewZoneIdsToIgnore)).recomputeInitiallyAndOnChange(this._store);
+        const viewZoneManager = derivedDisposable(this, reader =>  this._instantiationService.createInstance(readHotReloadableExport(DiffEditorViewZones, reader), getWindow(this._domElement), this._editors, this._diffModel, this._options, this, () => isUpdatingViewZones || unchangedRangesFeature.get().isUpdatingHiddenAreas, origViewZoneIdsToIgnore, modViewZoneIdsToIgnore)).recomputeInitiallyAndOnChange(this._store);
         const originalViewZones = derived(this, (reader) => {
             const orig = viewZoneManager.read(reader).viewZones.read(reader).orig;
             const orig2 = unchangedRangesFeature.read(reader).viewZones.read(reader).origViewZones;
@@ -193,7 +193,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
                 scrollState = undefined;
             }
         }, modViewZoneIdsToIgnore));
-        this._accessibleDiffViewer = derivedDisposable(this, reader => this._instantiationService.createInstance(readHotReloadableExport(AccessibleDiffViewer), this.elements.accessibleDiffViewer, this._accessibleDiffViewerVisible, (visible, tx) => this._accessibleDiffViewerShouldBeVisible.set(visible, tx), ( this._options.onlyShowAccessibleDiffViewer.map(v => !v)), this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._diffModel.map((m, r) => m?.diff.read(r)?.mappings.map(m => m.lineRangeMapping))), ( new AccessibleDiffViewerModelFromEditors(this._editors)))).recomputeInitiallyAndOnChange(this._store);
+        this._accessibleDiffViewer = derivedDisposable(this, reader => this._instantiationService.createInstance(readHotReloadableExport(AccessibleDiffViewer, reader), this.elements.accessibleDiffViewer, this._accessibleDiffViewerVisible, (visible, tx) => this._accessibleDiffViewerShouldBeVisible.set(visible, tx), ( this._options.onlyShowAccessibleDiffViewer.map(v => !v)), this._rootSizeObserver.width, this._rootSizeObserver.height, ( this._diffModel.map((m, r) => m?.diff.read(r)?.mappings.map(m => m.lineRangeMapping))), ( new AccessibleDiffViewerModelFromEditors(this._editors)))).recomputeInitiallyAndOnChange(this._store);
         const visibility = ( this._accessibleDiffViewerVisible.map(v => v ? 'hidden' : 'visible'));
         this._register(applyStyle(this.elements.modified, { visibility }));
         this._register(applyStyle(this.elements.original, { visibility }));
@@ -201,11 +201,11 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
         codeEditorService.addDiffEditor(this);
         this._gutter = derivedDisposable(this, reader => {
             return this._options.shouldRenderGutterMenu.read(reader)
-                ? this._instantiationService.createInstance(readHotReloadableExport(DiffEditorGutter), this.elements.root, this._diffModel, this._editors, this._options, this._sashLayout, this._boundarySashes)
+                ? this._instantiationService.createInstance(readHotReloadableExport(DiffEditorGutter, reader), this.elements.root, this._diffModel, this._editors, this._options, this._sashLayout, this._boundarySashes)
                 : undefined;
         });
         this._register(recomputeInitiallyAndOnChange(this._layoutInfo));
-        derivedDisposable(this, reader =>  new (readHotReloadableExport(MovedBlocksLinesFeature))(this.elements.root, this._diffModel, ( this._layoutInfo.map(i => i.originalEditor)), ( this._layoutInfo.map(i => i.modifiedEditor)), this._editors)).recomputeInitiallyAndOnChange(this._store, value => {
+        derivedDisposable(this, reader =>  new (readHotReloadableExport(MovedBlocksLinesFeature, reader))(this.elements.root, this._diffModel, ( this._layoutInfo.map(i => i.originalEditor)), ( this._layoutInfo.map(i => i.modifiedEditor)), this._editors)).recomputeInitiallyAndOnChange(this._store, value => {
             this._movedBlocksLinesPart.set(value, undefined);
         });
         this._register(Event.runAndSubscribe(this._editors.modified.onDidChangeCursorPosition, e => this._handleCursorPositionChange(e, true)));
@@ -223,7 +223,7 @@ let DiffEditorWidget = class DiffEditorWidget extends DelegatingEditor {
             }
         }));
         this._register(autorunWithStore((reader, store) => {
-            store.add(new (readHotReloadableExport(RevertButtonsFeature))(this._editors, this._diffModel, this._options, this));
+            store.add(new (readHotReloadableExport(RevertButtonsFeature, reader))(this._editors, this._diffModel, this._options, this));
         }));
         this._register(autorunWithStore((reader, store) => {
             const model = this._diffModel.read(reader);

package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.d.ts

@@ -2,7 +2,7 @@ import { IInstantiationService } from "../../../../platform/instantiation/common
 import { CancellationToken } from "../../../../base/common/cancellation.js";
 import { Event } from "../../../../base/common/event.js";
 import { IDisposable } from "../../../../base/common/lifecycle.js";
-import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/editor/common/diff/documentDiffProvider";
+import { IDocumentDiff, IDocumentDiffProvider, IDocumentDiffProviderOptions } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/editor/common/diff/documentDiffProvider";
 import { ITextModel } from "../../../common/model.js";
 import { IEditorWorkerService } from "../../../common/services/editorWorker.service.js";
 import { ITelemetryService } from "../../../../platform/telemetry/common/telemetry.service.js";

package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.service.d.ts

@@ -1,4 +1,4 @@
-import { IDocumentDiffProvider } from "@codingame/monaco-vscode-e4d0fd26-1b26-5583-b3f7-582e08d7b389-common/vscode/vs/editor/common/diff/documentDiffProvider";
+import { IDocumentDiffProvider } from "@codingame/monaco-vscode-chat-service-override/vscode/vs/editor/common/diff/documentDiffProvider";
 import { IDocumentDiffFactoryOptions } from "./diffProviderFactoryService.js";
 export declare const IDiffProviderFactoryService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IDiffProviderFactoryService>;
 export interface IDiffProviderFactoryService {