From b333e113b9670d9f7ca092e189d8930cd02e2ac8 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 5 Mar 2019 18:17:47 +0100 Subject: fixes #68549 --- src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts index 28142311db4..373ff8a5f47 100644 --- a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts +++ b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts @@ -410,7 +410,7 @@ export class BulkEditService implements IBulkEditService { } } - const bulkEdit = new BulkEdit(codeEditor, options.progress, this._logService, this._textModelService, this._fileService, this._textFileService, this._labelService, this._configurationService); + const bulkEdit = new BulkEdit(options.editor, options.progress, this._logService, this._textModelService, this._fileService, this._textFileService, this._labelService, this._configurationService); bulkEdit.add(edits); return bulkEdit.perform().then(() => { -- cgit v1.2.3 From ade4c7e86d289387a555c4b33fea6487eae9f7ab Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 5 Mar 2019 22:28:39 +0100 Subject: bulkEditService: use codeEditor: undefined when it is readonly --- src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts index 373ff8a5f47..75260b013b9 100644 --- a/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts +++ b/src/vs/workbench/services/bulkEdit/browser/bulkEditService.ts @@ -410,7 +410,11 @@ export class BulkEditService implements IBulkEditService { } } - const bulkEdit = new BulkEdit(options.editor, options.progress, this._logService, this._textModelService, this._fileService, this._textFileService, this._labelService, this._configurationService); + if (codeEditor && codeEditor.getConfiguration().readOnly) { + // If the code editor is readonly still alow bulk edits to be applied #68549 + codeEditor = undefined; + } + const bulkEdit = new BulkEdit(codeEditor, options.progress, this._logService, this._textModelService, this._fileService, this._textFileService, this._labelService, this._configurationService); bulkEdit.add(edits); return bulkEdit.perform().then(() => { -- cgit v1.2.3