Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

multi diff - implement revert to enable "Do not save" (#203376)

Browse Source 
* multi diff - implement `revert` to enable "Do not save"

* restore close handler

* align save/revert handling for original side with diff editor
This commit is contained in:
Benjamin Pasero
2024-01-25 18:18:20 +01:00
committed by GitHub
parent 6429752b2b
commit bc7fc03d6a
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.ts
+22 -4
View File
@@ -9,6 +9,7 @@ import { Emitter, Event } from 'vs/base/common/event';
import { IMarkdownString } from 'vs/base/common/htmlContent';
import { Disposable, DisposableStore, IDisposable, IReference, toDisposable } from 'vs/base/common/lifecycle';
import { parse } from 'vs/base/common/marshalling';
import { Schemas } from 'vs/base/common/network';
import { deepClone } from 'vs/base/common/objects';
import { autorun, derived, observableFromEvent } from 'vs/base/common/observable';
import { constObservable, mapObservableArrayCached } from 'vs/base/common/observableInternal/utils';
@@ -24,7 +25,7 @@ import { localize } from 'vs/nls';
import { ConfirmResult } from 'vs/platform/dialogs/common/dialogs';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IEditorConfiguration } from 'vs/workbench/browser/parts/editor/textEditor';
import { DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, EditorInputWithOptions, IEditorSerializer, IResourceMultiDiffEditorInput, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
import { DEFAULT_EDITOR_ASSOCIATION, EditorInputCapabilities, EditorInputWithOptions, GroupIdentifier, IEditorSerializer, IResourceMultiDiffEditorInput, IRevertOptions, ISaveOptions, IUntypedEditorInput } from 'vs/workbench/common/editor';
import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput';
import { MultiDiffEditorIcon } from 'vs/workbench/contrib/multiDiffEditor/browser/icons.contribution';
import { ConstResolvedMultiDiffSource, IMultiDiffSourceResolverService, IResolvedMultiDiffSource, MultiDiffEditorItem } from 'vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService';
@@ -242,15 +243,27 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
override readonly onDidChangeDirty = Event.fromObservableLight(this._isDirtyObservable);
override isDirty() { return this._isDirtyObservable.get(); }
override async save(group: number, options?: ISaveOptions | undefined): Promise<EditorInput | IUntypedEditorInput | undefined> {
override async save(group: number, options?: ISaveOptions | undefined): Promise<EditorInput> {
await this.doSaveOrRevert('save', group, options);
return this;
}
override revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> {
return this.doSaveOrRevert('revert', group, options);
}
private async doSaveOrRevert(mode: 'save', group: GroupIdentifier, options?: ISaveOptions): Promise<void>;
private async doSaveOrRevert(mode: 'revert', group: GroupIdentifier, options?: IRevertOptions): Promise<void>;
private async doSaveOrRevert(mode: 'save' | 'revert', group: GroupIdentifier, options?: ISaveOptions | IRevertOptions): Promise<void> {
const items = this._viewModel.currentValue?.items.get();
if (items) {
await Promise.all(items.map(async item => {
const model = item.diffEditorViewModel.model;
const handleOriginal = model.original.uri.scheme !== Schemas.untitled && this._textFileService.isDirty(model.original.uri); // match diff editor behaviour
await Promise.all([
this._textFileService.save(model.original.uri, options),
this._textFileService.save(model.modified.uri, options),
handleOriginal ? mode === 'save' ? this._textFileService.save(model.original.uri, options) : this._textFileService.revert(model.original.uri, options) : Promise.resolve(),
mode === 'save' ? this._textFileService.save(model.modified.uri, options) : this._textFileService.revert(model.modified.uri, options),
]);
}));
}
@@ -258,6 +271,11 @@ export class MultiDiffEditorInput extends EditorInput implements ILanguageSuppor
}
override readonly closeHandler: IEditorCloseHandler = {
// TODO@bpasero TODO@hediet this is a workaround for
// not having a better way to figure out if the
// editors this input wraps around are opened or not
async confirm() {
return ConfirmResult.DONT_SAVE;
},