Skip to content

Commit c5ee74f

Browse files
committed
Avoid controversial method (ref microsoft#92811)
1 parent 4de7667 commit c5ee74f

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/vs/editor/common/model/editStack.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@ import { EndOfLineSequence, ICursorStateComputer, IIdentifiedSingleEditOperation
1010
import { TextModel } from 'vs/editor/common/model/textModel';
1111
import { IUndoRedoService, IResourceUndoRedoElement, UndoRedoElementType, IWorkspaceUndoRedoElement } from 'vs/platform/undoRedo/common/undoRedo';
1212
import { URI } from 'vs/base/common/uri';
13-
import { getComparisonKey as uriGetComparisonKey } from 'vs/base/common/resources';
1413
import { TextChange, compressConsecutiveTextChanges } from 'vs/editor/common/model/textChange';
1514
import * as buffer from 'vs/base/common/buffer';
1615

16+
function uriGetComparisonKey(resource: URI): string {
17+
return resource.toString();
18+
}
19+
1720
class SingleModelEditStackData {
1821

1922
public static create(model: ITextModel, beforeCursorState: Selection[] | null): SingleModelEditStackData {

src/vs/platform/undoRedo/common/undoRedoService.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,17 @@
66
import * as nls from 'vs/nls';
77
import { IUndoRedoService, IResourceUndoRedoElement, IWorkspaceUndoRedoElement, UndoRedoElementType, IUndoRedoElement, IPastFutureElements } from 'vs/platform/undoRedo/common/undoRedo';
88
import { URI } from 'vs/base/common/uri';
9-
import { getComparisonKey as uriGetComparisonKey } from 'vs/base/common/resources';
109
import { onUnexpectedError } from 'vs/base/common/errors';
1110
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
1211
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
1312
import Severity from 'vs/base/common/severity';
1413
import { Schemas } from 'vs/base/common/network';
1514
import { INotificationService } from 'vs/platform/notification/common/notification';
1615

16+
function uriGetComparisonKey(resource: URI): string {
17+
return resource.toString();
18+
}
19+
1720
class ResourceStackElement {
1821
public readonly type = UndoRedoElementType.Resource;
1922
public readonly actual: IResourceUndoRedoElement;

0 commit comments

Comments
 (0)