ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-18 11:03:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode merge-base (#22780)

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

This reverts commit 47a1745180.

* Fix notebook download task

* Remove done call from extensions-ci
This commit is contained in:
Karl Burtram
2023-04-19 21:48:46 -07:00
committed by GitHub
parent decbe8dded
commit e7d3d047ec
2389 changed files with 92155 additions and 42602 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
let key = this.getCacheKey(document);
const key = this.getCacheKey(document);
if (!key) {
// Document doesn't have a uri, can't cache it, so return
@@ -67,11 +67,9 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
}
return cacheItem.delayTask.trigger(() => {
let conflicts = this.getConflictsOrEmpty(document, Array.from(cacheItem!.origins));
const conflicts = this.getConflictsOrEmpty(document, Array.from(cacheItem!.origins));
if (this.cache) {
this.cache.delete(key!);
}
this.cache?.delete(key!);
return conflicts;
});
@@ -82,7 +80,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
return false;
}
let key = this.getCacheKey(document);
const key = this.getCacheKey(document);
if (!key) {
return false;
}
@@ -100,7 +98,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
}
forget(document: vscode.TextDocument) {
let key = this.getCacheKey(document);
const key = this.getCacheKey(document);
if (key) {
this.cache.delete(key);