ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-01 09:30:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge from vscode merge-base (#22769)" (#22779)

Browse Source 
This reverts commit 6bd0a17d3c.
This commit is contained in:
Karl Burtram
2023-04-18 21:44:05 -07:00
committed by GitHub
parent 6bd0a17d3c
commit 47a1745180
2389 changed files with 42588 additions and 92170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/merge-conflict/src/documentTracker.ts
View File

@@ -50,7 +50,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
getConflicts(document: vscode.TextDocument, origin: string): PromiseLike<interfaces.IDocumentMergeConflict[]> {
// Attempt from cache
const key = this.getCacheKey(document);
let key = this.getCacheKey(document);
if (!key) {
// Document doesn't have a uri, can't cache it, so return
@@ -67,9 +67,11 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
}
return cacheItem.delayTask.trigger(() => {
const conflicts = this.getConflictsOrEmpty(document, Array.from(cacheItem!.origins));
let conflicts = this.getConflictsOrEmpty(document, Array.from(cacheItem!.origins));
this.cache?.delete(key!);
if (this.cache) {
this.cache.delete(key!);
}
return conflicts;
});
@@ -80,7 +82,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
return false;
}
const key = this.getCacheKey(document);
let key = this.getCacheKey(document);
if (!key) {
return false;
}
@@ -98,7 +100,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
}
forget(document: vscode.TextDocument) {
const key = this.getCacheKey(document);
let key = this.getCacheKey(document);
if (key) {
this.cache.delete(key);