ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-11 02:32:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

Browse Source 
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { ILabelService } from 'vs/platform/label/common/label';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { EditorOption } from 'vs/editor/common/config/editorOptions';
abstract class Recording {
@@ -374,7 +375,7 @@ export class BulkEdit {
export class BulkEditService implements IBulkEditService {
_serviceBrand: any;
_serviceBrand: undefined;
constructor(
@ILogService private readonly _logService: ILogService,
@@ -414,7 +415,7 @@ export class BulkEditService implements IBulkEditService {
}
}
if (codeEditor && codeEditor.getConfiguration().readOnly) {
if (codeEditor && codeEditor.getOption(EditorOption.readOnly)) {
// If the code editor is readonly still allow bulk edits to be applied #68549
codeEditor = undefined;
}