rename setting to peekWidgetDefaultFocus and make it an enum of "tree" and "editor", microsoft#23001

jrieken · jrieken · commit 03dff92d9478 · 2020-01-23T11:01:23.000+01:00
diff --git a/src/vs/editor/common/config/editorOptions.ts b/src/vs/editor/common/config/editorOptions.ts
@@ -549,7 +549,7 @@ export interface IEditorOptions {
 	 * Controls whether to focus the inline editor in the peek widget by default.
 	 * Defaults to false.
 	 */
-	peekWidgetFocusInlineEditor?: boolean;
+	peekWidgetDefaultFocus?: 'tree' | 'editor';
 }
 
 export interface IEditorConstructionOptions extends IEditorOptions {
@@ -3160,7 +3160,7 @@ export const enum EditorOption {
 	overviewRulerBorder,
 	overviewRulerLanes,
 	parameterHints,
-	peekWidgetFocusInlineEditor,
+	peekWidgetDefaultFocus,
 	quickSuggestions,
 	quickSuggestionsDelay,
 	readOnly,
@@ -3539,9 +3539,17 @@ export const EditorOptions = {
 		3, 0, 3
 	)),
 	parameterHints: register(new EditorParameterHints()),
-	peekWidgetFocusInlineEditor: register(new EditorBooleanOption(
-		EditorOption.peekWidgetFocusInlineEditor, 'peekWidgetFocusInlineEditor', false,
-		{ description: nls.localize('peekWidgetFocusInlineEditor', "Controls whether to focus the inline editor in the peek widget by default.") }
+	peekWidgetDefaultFocus: register(new EditorStringEnumOption(
+		EditorOption.peekWidgetDefaultFocus, 'peekWidgetDefaultFocus',
+		'tree' as 'tree' | 'editor',
+		['tree', 'editor'] as const,
+		{
+			enumDescriptions: [
+				nls.localize('peekWidgetDefaultFocus.tree', "Focus the tree when openeing peek"),
+				nls.localize('peekWidgetDefaultFocus.editor', "Focus the editor when opening peek")
+			],
+			description: nls.localize('peekWidgetDefaultFocus', "Controls whether to focus the inline editor or the tree in the peek widget.")
+		}
 	)),
 	quickSuggestions: register(new EditorQuickSuggestions()),
 	quickSuggestionsDelay: register(new EditorIntOption(
diff --git a/src/vs/editor/common/standalone/standaloneEnums.ts b/src/vs/editor/common/standalone/standaloneEnums.ts
@@ -230,7 +230,7 @@ export enum EditorOption {
 	overviewRulerBorder = 62,
 	overviewRulerLanes = 63,
 	parameterHints = 64,
-	peekWidgetFocusInlineEditor = 65,
+	peekWidgetDefaultFocus = 65,
 	quickSuggestions = 66,
 	quickSuggestionsDelay = 67,
 	readOnly = 68,
diff --git a/src/vs/editor/contrib/gotoSymbol/peek/referencesController.ts b/src/vs/editor/contrib/gotoSymbol/peek/referencesController.ts
@@ -165,7 +165,7 @@ export abstract class ReferencesController implements IEditorContribution {
 					let selection = this._model.nearestReference(uri, pos);
 					if (selection) {
 						return this._widget.setSelection(selection).then(() => {
-							if (this._widget && this._editor.getOption(EditorOption.peekWidgetFocusInlineEditor)) {
+							if (this._widget && this._editor.getOption(EditorOption.peekWidgetDefaultFocus) === 'editor') {
 								this._widget.focusOnPreviewEditor();
 							}
 						});
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -3023,7 +3023,7 @@ declare namespace monaco.editor {
 		 * Controls whether to focus the inline editor in the peek widget by default.
 		 * Defaults to false.
 		 */
-		peekWidgetFocusInlineEditor?: boolean;
+		peekWidgetDefaultFocus?: 'tree' | 'editor';
 	}
 
 	export interface IEditorConstructionOptions extends IEditorOptions {
@@ -3745,7 +3745,7 @@ declare namespace monaco.editor {
 		overviewRulerBorder = 62,
 		overviewRulerLanes = 63,
 		parameterHints = 64,
-		peekWidgetFocusInlineEditor = 65,
+		peekWidgetDefaultFocus = 65,
 		quickSuggestions = 66,
 		quickSuggestionsDelay = 67,
 		readOnly = 68,
@@ -3856,7 +3856,7 @@ declare namespace monaco.editor {
 		overviewRulerBorder: IEditorOption<EditorOption.overviewRulerBorder, boolean>;
 		overviewRulerLanes: IEditorOption<EditorOption.overviewRulerLanes, number>;
 		parameterHints: IEditorOption<EditorOption.parameterHints, InternalParameterHintOptions>;
-		peekWidgetFocusInlineEditor: IEditorOption<EditorOption.peekWidgetFocusInlineEditor, boolean>;
+		peekWidgetDefaultFocus: IEditorOption<EditorOption.peekWidgetDefaultFocus, 'tree' | 'editor'>;
 		quickSuggestions: IEditorOption<EditorOption.quickSuggestions, ValidQuickSuggestionsOptions>;
 		quickSuggestionsDelay: IEditorOption<EditorOption.quickSuggestionsDelay, number>;
 		readOnly: IEditorOption<EditorOption.readOnly, boolean>;

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ export abstract class ReferencesController implements IEditorContribution {`
`165`	`165`	`let selection = this._model.nearestReference(uri, pos);`
`166`	`166`	`if (selection) {`
`167`	`167`	`return this._widget.setSelection(selection).then(() => {`
`168`		`- if (this._widget && this._editor.getOption(EditorOption.peekWidgetFocusInlineEditor)) {`
	`168`	`+ if (this._widget && this._editor.getOption(EditorOption.peekWidgetDefaultFocus) === 'editor') {`
`169`	`169`	`this._widget.focusOnPreviewEditor();`
`170`	`170`	`}`
`171`	`171`	`});`