Parameter hints should restore editor focus after using buttons

mjbvz · mjbvz · commit c9a90bc62652 · 2019-01-10T14:24:41.000-08:00
Fixes microsoft#65435
diff --git a/src/vs/editor/contrib/parameterHints/parameterHints.ts b/src/vs/editor/contrib/parameterHints/parameterHints.ts
@@ -98,7 +98,7 @@ registerEditorCommand(new ParameterHintsCommand({
 	handler: x => x.cancel(),
 	kbOpts: {
 		weight: weight,
-		kbExpr: EditorContextKeys.editorTextFocus,
+		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.Escape,
 		secondary: [KeyMod.Shift | KeyCode.Escape]
 	}
@@ -109,7 +109,7 @@ registerEditorCommand(new ParameterHintsCommand({
 	handler: x => x.previous(),
 	kbOpts: {
 		weight: weight,
-		kbExpr: EditorContextKeys.editorTextFocus,
+		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.UpArrow,
 		secondary: [KeyMod.Alt | KeyCode.UpArrow],
 		mac: { primary: KeyCode.UpArrow, secondary: [KeyMod.Alt | KeyCode.UpArrow, KeyMod.WinCtrl | KeyCode.KEY_P] }
@@ -121,7 +121,7 @@ registerEditorCommand(new ParameterHintsCommand({
 	handler: x => x.next(),
 	kbOpts: {
 		weight: weight,
-		kbExpr: EditorContextKeys.editorTextFocus,
+		kbExpr: EditorContextKeys.focus,
 		primary: KeyCode.DownArrow,
 		secondary: [KeyMod.Alt | KeyCode.DownArrow],
 		mac: { primary: KeyCode.DownArrow, secondary: [KeyMod.Alt | KeyCode.DownArrow, KeyMod.WinCtrl | KeyCode.KEY_N] }
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts b/src/vs/editor/contrib/parameterHints/parameterHintsWidget.ts
@@ -284,12 +284,14 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {
 
 	next(): void {
 		if (this.model) {
+			this.editor.focus();
 			this.model.next();
 		}
 	}
 
 	previous(): void {
 		if (this.model) {
+			this.editor.focus();
 			this.model.previous();
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,14 @@ export class ParameterHintsWidget implements IContentWidget, IDisposable {`
`284`	`284`
`285`	`285`	`next(): void {`
`286`	`286`	`if (this.model) {`
	`287`	`+ this.editor.focus();`
`287`	`288`	`this.model.next();`
`288`	`289`	`}`
`289`	`290`	`}`
`290`	`291`
`291`	`292`	`previous(): void {`
`292`	`293`	`if (this.model) {`
	`294`	`+ this.editor.focus();`
`293`	`295`	`this.model.previous();`
`294`	`296`	`}`
`295`	`297`	`}`