Merge VS Code 1.23.1 (#1520)

This commit is contained in:
Matt Irvine
2018-06-05 11:24:51 -07:00
committed by GitHub
parent e3baf5c443
commit 0c58f09e59
3651 changed files with 74249 additions and 48599 deletions

View File

@@ -171,7 +171,7 @@ class GrowSelectionAction extends AbstractSmartSelect {
alias: 'Expand Select',
precondition: null,
kbOpts: {
kbExpr: EditorContextKeys.textFocus,
kbExpr: EditorContextKeys.editorTextFocus,
primary: KeyMod.Shift | KeyMod.Alt | KeyCode.RightArrow,
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.RightArrow }
}
@@ -187,7 +187,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect {
alias: 'Shrink Select',
precondition: null,
kbOpts: {
kbExpr: EditorContextKeys.textFocus,
kbExpr: EditorContextKeys.editorTextFocus,
primary: KeyMod.Shift | KeyMod.Alt | KeyCode.LeftArrow,
mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.LeftArrow }
}

View File

@@ -24,7 +24,7 @@ export class TokenSelectionSupport {
private _modelService: IModelService;
constructor( @IModelService modelService: IModelService) {
constructor(@IModelService modelService: IModelService) {
this._modelService = modelService;
}