mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-18 19:11:36 -04:00
Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 * fix config changes * fix strictnull checks
This commit is contained in:
@@ -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[] = [];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user