This commit is contained in:
Johannes Rieken 2020-05-26 16:59:01 +02:00
parent 667142d6b9
commit 553a11c6c8

View file

@ -20,6 +20,7 @@ import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
import { ConflictDetector } from 'vs/workbench/services/bulkEdit/browser/conflicts';
import { ResourceMap } from 'vs/base/common/map';
import { localize } from 'vs/nls';
import { exturi } from 'vs/base/common/resources';
export class CheckedStates<T extends object> {
@ -209,13 +210,13 @@ export class BulkFileOperations {
}
const insert = (uri: URI, map: Map<string, BulkFileOperation>) => {
let key = uri.toString();
let key = exturi.getComparisonKey(uri, true);
let operation = map.get(key);
// rename
if (!operation && newToOldUri.has(uri)) {
uri = newToOldUri.get(uri)!;
key = uri.toString();
key = exturi.getComparisonKey(uri, true);
operation = map.get(key);
}