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

Fixes #195384 (#206004)

Browse Source
This commit is contained in:
Henning Dieterichs
2024-02-23 11:55:32 +01:00
committed by GitHub
parent ba8645668e
commit 64355fa7f4
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/editor/browser/widget/diffEditor/diffEditorWidget.ts
+5 -10
View File
@@ -20,10 +20,11 @@ import { CodeEditorWidget, ICodeEditorWidgetOptions } from 'vs/editor/browser/wi
import { AccessibleDiffViewer, AccessibleDiffViewerModelFromEditors } from 'vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer';
import { DiffEditorDecorations } from 'vs/editor/browser/widget/diffEditor/components/diffEditorDecorations';
import { DiffEditorSash } from 'vs/editor/browser/widget/diffEditor/components/diffEditorSash';
import { HideUnchangedRegionsFeature } from 'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature';
import { DiffEditorViewZones } from 'vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones';
import { HideUnchangedRegionsFeature } from 'vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature';
import { MovedBlocksLinesFeature } from 'vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature';
import { OverviewRulerFeature } from 'vs/editor/browser/widget/diffEditor/features/overviewRulerFeature';
import { RevertButtonsFeature } from 'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature';
import { CSSStyle, ObservableElementSizeObserver, applyStyle, applyViewZones, bindContextKey, readHotReloadableExport, translatePosition } from 'vs/editor/browser/widget/diffEditor/utils';
import { IDiffEditorOptions } from 'vs/editor/common/config/editorOptions';
import { IDimension } from 'vs/editor/common/core/dimension';
@@ -31,7 +32,7 @@ import { Position } from 'vs/editor/common/core/position';
import { Range } from 'vs/editor/common/core/range';
import { CursorChangeReason } from 'vs/editor/common/cursorEvents';
import { IDiffComputationResult, ILineChange } from 'vs/editor/common/diff/legacyLinesDiffComputer';
import { DetailedLineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
import { LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
import { EditorType, IDiffEditorModel, IDiffEditorViewModel, IDiffEditorViewState } from 'vs/editor/common/editorCommon';
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
@@ -40,11 +41,10 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
import { IEditorProgressService } from 'vs/platform/progress/common/progress';
import { DelegatingEditor } from './delegatingEditorImpl';
import { DiffEditorEditors } from './components/diffEditorEditors';
import { DelegatingEditor } from './delegatingEditorImpl';
import { DiffEditorOptions } from './diffEditorOptions';
import { DiffEditorViewModel, DiffMapping, DiffState } from './diffEditorViewModel';
import { RevertButtonsFeature } from 'vs/editor/browser/widget/diffEditor/features/revertButtonsFeature';
export interface IDiffCodeEditorWidgetOptions {
originalEditor?: ICodeEditorWidgetOptions;
@@ -477,12 +477,7 @@ export class DiffEditorWidget extends DelegatingEditor implements IDiffEditor {
};
}
revert(diff: DetailedLineRangeMapping): void {
if (diff.innerChanges) {
this.revertRangeMappings(diff.innerChanges);
return;
}
revert(diff: LineRangeMapping): void {
const model = this._diffModel.get();
if (!model || !model.isDiffUpToDate.get()) { return; }
src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.ts
+8 -4
View File
@@ -15,7 +15,7 @@ import { DiffEditorViewModel } from 'vs/editor/browser/widget/diffEditor/diffEdi
import { DiffEditorWidget } from 'vs/editor/browser/widget/diffEditor/diffEditorWidget';
import { LineRange, LineRangeSet } from 'vs/editor/common/core/lineRange';
import { Range } from 'vs/editor/common/core/range';
import { RangeMapping } from 'vs/editor/common/diff/rangeMapping';
import { LineRangeMapping, RangeMapping } from 'vs/editor/common/diff/rangeMapping';
import { GlyphMarginLane } from 'vs/editor/common/model';
import { localize } from 'vs/nls';
@@ -62,7 +62,7 @@ export class RevertButtonsFeature extends Disposable {
const btn = store.add(new RevertButton(
m.lineRangeMapping.modified.startLineNumber,
this._widget,
m.lineRangeMapping.innerChanges,
m.lineRangeMapping,
false
));
this._editors.modified.addGlyphMarginWidget(btn);
@@ -122,7 +122,7 @@ export class RevertButton extends Disposable implements IGlyphMarginWidget {
constructor(
private readonly _lineNumber: number,
private readonly _widget: DiffEditorWidget,
private readonly _diffs: RangeMapping[],
private readonly _diffs: RangeMapping[] | LineRangeMapping,
private readonly _revertSelection: boolean,
) {
super();
@@ -142,7 +142,11 @@ export class RevertButton extends Disposable implements IGlyphMarginWidget {
}));
this._register(addDisposableListener(this._domNode, EventType.CLICK, (e) => {
this._widget.revertRangeMappings(this._diffs);
if (this._diffs instanceof LineRangeMapping) {
this._widget.revert(this._diffs);
} else {
this._widget.revertRangeMappings(this._diffs);
}
e.stopPropagation();
e.preventDefault();
}));