ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 4d91d96e5e121b38d33508cdef17868bab255eae

Browse Source
This commit is contained in:
ADS Merger
2020-06-18 04:32:54 +00:00
committed by AzureDataStudio
parent a971aee5bd
commit 5e7071e466
1002 changed files with 24201 additions and 13193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts
View File

@@ -165,17 +165,11 @@ class BulkEditModel implements IDisposable {
this._tasks = [];
const promises: Promise<any>[] = [];
this._edits.forEach((value, key) => {
for (let [key, value] of this._edits) {
const promise = this._textModelResolverService.createModelReference(URI.parse(key)).then(async ref => {
const model = ref.object;
if (!model || !model.textEditorModel) {
throw new Error(`Cannot load file ${key}`);
}
let task: ModelEditTask;
let makeMinimal = false;
if (this._editor && this._editor.hasModel() && this._editor.getModel().uri.toString() === model.textEditorModel.uri.toString()) {
if (this._editor && this._editor.hasModel() && this._editor.getModel().uri.toString() === ref.object.textEditorModel.uri.toString()) {
task = new EditorEditTask(ref, this._editor);
makeMinimal = true;
} else {
@@ -201,7 +195,7 @@ class BulkEditModel implements IDisposable {
this._progress.report(undefined);
});
promises.push(promise);
});
}
await Promise.all(promises);
@@ -383,7 +377,7 @@ class BulkEdit {
export class BulkEditService implements IBulkEditService {
_serviceBrand: undefined;
declare readonly _serviceBrand: undefined;
private _previewHandler?: IBulkEditPreviewHandler;