Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

* 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

View File

@@ -23,6 +23,7 @@ import { MoveLinesCommand } from 'vs/editor/contrib/linesOperations/moveLinesCom
import { SortLinesCommand } from 'vs/editor/contrib/linesOperations/sortLinesCommand';
import { MenuId } from 'vs/platform/actions/common/actions';
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { EditorOption } from 'vs/editor/common/config/editorOptions';
// copy lines
@@ -111,7 +112,7 @@ abstract class AbstractMoveLinesAction extends EditorAction {
let commands: ICommand[] = [];
let selections = editor.getSelections() || [];
let autoIndent = editor.getConfiguration().autoIndent;
const autoIndent = editor.getOption(EditorOption.autoIndent);
for (const selection of selections) {
commands.push(new MoveLinesCommand(selection, this.down, autoIndent));
@@ -886,7 +887,7 @@ export abstract class AbstractCaseAction extends EditorAction {
return;
}
let wordSeparators = editor.getConfiguration().wordSeparators;
let wordSeparators = editor.getOption(EditorOption.wordSeparators);
let commands: ICommand[] = [];