Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-25 04:36:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes https://github.com/microsoft/monaco-editor/issues/4659 (#271497)

Browse Source
This commit is contained in:
Henning Dieterichs
2025-10-15 12:58:20 +02:00
committed by GitHub
parent 2b00e85c86
commit 70c82b00a9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
View File

@@ -92,7 +92,7 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
codeEditorWidgetOptions: IDiffCodeEditorWidgetOptions,
@IContextKeyService private readonly _parentContextKeyService: IContextKeyService,
@IInstantiationService private readonly _parentInstantiationService: IInstantiationService,
@ICodeEditorService codeEditorService: ICodeEditorService,
@ICodeEditorService private readonly _codeEditorService: ICodeEditorService,
@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService,
@IEditorProgressService private readonly _editorProgressService: IEditorProgressService,
) {
@@ -180,7 +180,7 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
});
this._diffValue = this._diffModel.map((m, r) => m?.diff.read(r));
this.onDidUpdateDiff = Event.fromObservableLight(this._diffValue);
codeEditorService.willCreateDiffEditor();
this._codeEditorService.willCreateDiffEditor();
this._contextKeyService.createKey('isInDiffEditor', true);
@@ -344,7 +344,10 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
this._createDiffEditorContributions();
codeEditorService.addDiffEditor(this);
this._codeEditorService.addDiffEditor(this);
this._register(toDisposable(() => {
this._codeEditorService.removeDiffEditor(this);
}));
this._gutter = derivedDisposable(this, reader => {
return this._options.shouldRenderGutterMenu.read(reader)