Skip to content

Commit 29137c6

Browse files
authored
make sure codeEditor is set when bulk editing via diff editor (microsoft#191810)
re microsoft#188385
1 parent fe0237c commit 29137c6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
88
import { LinkedList } from 'vs/base/common/linkedList';
99
import { ResourceMap, ResourceSet } from 'vs/base/common/map';
1010
import { URI } from 'vs/base/common/uri';
11-
import { ICodeEditor, isCodeEditor } from 'vs/editor/browser/editorBrowser';
11+
import { ICodeEditor, isCodeEditor, isDiffEditor } from 'vs/editor/browser/editorBrowser';
1212
import { IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit, ResourceFileEdit, ResourceTextEdit } from 'vs/editor/browser/services/bulkEditService';
1313
import { EditorOption } from 'vs/editor/common/config/editorOptions';
1414
import { WorkspaceEdit } from 'vs/editor/common/languages';
@@ -197,6 +197,8 @@ export class BulkEditService implements IBulkEditService {
197197
const candidate = this._editorService.activeTextEditorControl;
198198
if (isCodeEditor(candidate)) {
199199
codeEditor = candidate;
200+
} else if (isDiffEditor(candidate)) {
201+
codeEditor = candidate.getModifiedEditor();
200202
}
201203
}
202204

0 commit comments

Comments
 (0)