Merge pull request microsoft#125498 from microsoft/hediet/fix-125034

Renames "Inline Completion" to "Inline Suggestion". Removes Ghost Text Expanded Setting (default true)

Author: hediet

src/vs/editor/common/config/editorOptions.ts

@@ -382,6 +382,7 @@ export interface IEditorOptions {
 	 * Suggest options.
 	 */
 	suggest?: ISuggestOptions;
+	inlineSuggest?: IInlineSuggestOptions;
 	/**
 	 * Smart select options.
 	 */
@@ -3140,6 +3141,51 @@ class EditorScrollbar extends BaseEditorOption<EditorOption.scrollbar, InternalE
 
 //#endregion
 
+//#region inlineSuggest
+
+export interface IInlineSuggestOptions {
+	/**
+	 * Enable or disable the rendering of automatic inline completions.
+	*/
+	enabled?: boolean;
+}
+
+export type InternalInlineSuggestOptions = Readonly<Required<IInlineSuggestOptions>>;
+
+/**
+ * Configuration options for inline suggestions
+ */
+class InlineEditorSuggest extends BaseEditorOption<EditorOption.inlineSuggest, InternalInlineSuggestOptions> {
+	constructor() {
+		const defaults: InternalInlineSuggestOptions = {
+			enabled: false
+		};
+
+		super(
+			EditorOption.inlineSuggest, 'inlineSuggest', defaults,
+			{
+				'editor.inlineSuggest.enabled': {
+					type: 'boolean',
+					default: defaults.enabled,
+					description: nls.localize('inlineSuggest.enabled', "Controls whether to automatically show inline suggestions in the editor.")
+				},
+			}
+		);
+	}
+
+	public validate(_input: any): InternalInlineSuggestOptions {
+		if (!_input || typeof _input !== 'object') {
+			return this.defaultValue;
+		}
+		const input = _input as IInlineSuggestOptions;
+		return {
+			enabled: boolean(input.enabled, this.defaultValue.enabled),
+		};
+	}
+}
+
+//#endregion
+
 //#region suggest
 
 /**
@@ -3177,16 +3223,7 @@ export interface ISuggestOptions {
 	/**
 	 * Enable or disable the rendering of the suggestion preview.
 	 */
-	showSuggestionPreview?: boolean;
-	/**
-	 * Enable or disable the rendering of automatic inline completions.
-	*/
-	showInlineCompletions?: boolean;
-	/**
-	 * Enable or disable the default expansion of the ghost text as used
-	 * by the suggestion preview or the inline completions.
-	 */
-	ghostTextExpanded?: boolean;
+	preview?: boolean;
 	/**
 	 * Show details inline with the label. Defaults to true.
 	 */
@@ -3318,9 +3355,7 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
 			shareSuggestSelections: false,
 			showIcons: true,
 			showStatusBar: false,
-			showSuggestionPreview: false,
-			ghostTextExpanded: true,
-			showInlineCompletions: false,
+			preview: false,
 			showInlineDetails: true,
 			showMethods: true,
 			showFunctions: true,
@@ -3394,20 +3429,10 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
 					default: defaults.showStatusBar,
 					description: nls.localize('suggest.showStatusBar', "Controls the visibility of the status bar at the bottom of the suggest widget.")
 				},
-				'editor.suggest.showSuggestionPreview': {
-					type: 'boolean',
-					default: defaults.showSuggestionPreview,
-					description: nls.localize('suggest.showSuggestionPreview', "Controls whether to preview the suggestion outcome in the editor.")
-				},
-				'editor.suggest.showInlineCompletions': {
-					type: 'boolean',
-					default: defaults.showInlineCompletions,
-					description: nls.localize('suggest.showInlineCompletions', "Controls whether to show inline completions in the editor.")
-				},
-				'editor.suggest.ghostTextExpanded': {
+				'editor.suggest.preview': {
 					type: 'boolean',
-					default: defaults.ghostTextExpanded,
-					description: nls.localize('suggest.ghostTextExpanded', "Controls whether the ghost text that is used by the suggestion preview or the inline completions is expanted by default.")
+					default: defaults.preview,
+					description: nls.localize('suggest.preview', "Controls whether to preview the suggestion outcome in the editor.")
 				},
 				'editor.suggest.showInlineDetails': {
 					type: 'boolean',
@@ -3584,9 +3609,7 @@ class EditorSuggest extends BaseEditorOption<EditorOption.suggest, InternalSugge
 			shareSuggestSelections: boolean(input.shareSuggestSelections, this.defaultValue.shareSuggestSelections),
 			showIcons: boolean(input.showIcons, this.defaultValue.showIcons),
 			showStatusBar: boolean(input.showStatusBar, this.defaultValue.showStatusBar),
-			showSuggestionPreview: boolean(input.showSuggestionPreview, this.defaultValue.showSuggestionPreview),
-			ghostTextExpanded: boolean(input.ghostTextExpanded, this.defaultValue.ghostTextExpanded),
-			showInlineCompletions: boolean(input.showInlineCompletions, this.defaultValue.showInlineCompletions),
+			preview: boolean(input.preview, this.defaultValue.preview),
 			showInlineDetails: boolean(input.showInlineDetails, this.defaultValue.showInlineDetails),
 			showMethods: boolean(input.showMethods, this.defaultValue.showMethods),
 			showFunctions: boolean(input.showFunctions, this.defaultValue.showFunctions),
@@ -3834,6 +3857,7 @@ export const enum EditorOption {
 	highlightActiveIndentGuide,
 	hover,
 	inDiffEditor,
+	inlineSuggest,
 	letterSpacing,
 	lightbulb,
 	lineDecorationsWidth,
@@ -4452,6 +4476,7 @@ export const EditorOptions = {
 		10000, -1, Constants.MAX_SAFE_SMALL_INTEGER,
 	)),
 	suggest: register(new EditorSuggest()),
+	inlineSuggest: register(new InlineEditorSuggest()),
 	suggestFontSize: register(new EditorIntOption(
 		EditorOption.suggestFontSize, 'suggestFontSize',
 		0, 0, 1000,

src/vs/editor/common/standalone/standaloneEnums.ts

@@ -219,83 +219,84 @@ export enum EditorOption {
 	highlightActiveIndentGuide = 49,
 	hover = 50,
 	inDiffEditor = 51,
-	letterSpacing = 52,
-	lightbulb = 53,
-	lineDecorationsWidth = 54,
-	lineHeight = 55,
-	lineNumbers = 56,
-	lineNumbersMinChars = 57,
-	linkedEditing = 58,
-	links = 59,
-	matchBrackets = 60,
-	minimap = 61,
-	mouseStyle = 62,
-	mouseWheelScrollSensitivity = 63,
-	mouseWheelZoom = 64,
-	multiCursorMergeOverlapping = 65,
-	multiCursorModifier = 66,
-	multiCursorPaste = 67,
-	occurrencesHighlight = 68,
-	overviewRulerBorder = 69,
-	overviewRulerLanes = 70,
-	padding = 71,
-	parameterHints = 72,
-	peekWidgetDefaultFocus = 73,
-	definitionLinkOpensInPeek = 74,
-	quickSuggestions = 75,
-	quickSuggestionsDelay = 76,
-	readOnly = 77,
-	renameOnType = 78,
-	renderControlCharacters = 79,
-	renderIndentGuides = 80,
-	renderFinalNewline = 81,
-	renderLineHighlight = 82,
-	renderLineHighlightOnlyWhenFocus = 83,
-	renderValidationDecorations = 84,
-	renderWhitespace = 85,
-	revealHorizontalRightPadding = 86,
-	roundedSelection = 87,
-	rulers = 88,
-	scrollbar = 89,
-	scrollBeyondLastColumn = 90,
-	scrollBeyondLastLine = 91,
-	scrollPredominantAxis = 92,
-	selectionClipboard = 93,
-	selectionHighlight = 94,
-	selectOnLineNumbers = 95,
-	showFoldingControls = 96,
-	showUnused = 97,
-	snippetSuggestions = 98,
-	smartSelect = 99,
-	smoothScrolling = 100,
-	stickyTabStops = 101,
-	stopRenderingLineAfter = 102,
-	suggest = 103,
-	suggestFontSize = 104,
-	suggestLineHeight = 105,
-	suggestOnTriggerCharacters = 106,
-	suggestSelection = 107,
-	tabCompletion = 108,
-	tabIndex = 109,
-	unusualLineTerminators = 110,
-	useShadowDOM = 111,
-	useTabStops = 112,
-	wordSeparators = 113,
-	wordWrap = 114,
-	wordWrapBreakAfterCharacters = 115,
-	wordWrapBreakBeforeCharacters = 116,
-	wordWrapColumn = 117,
-	wordWrapOverride1 = 118,
-	wordWrapOverride2 = 119,
-	wrappingIndent = 120,
-	wrappingStrategy = 121,
-	showDeprecated = 122,
-	inlayHints = 123,
-	editorClassName = 124,
-	pixelRatio = 125,
-	tabFocusMode = 126,
-	layoutInfo = 127,
-	wrappingInfo = 128
+	inlineSuggest = 52,
+	letterSpacing = 53,
+	lightbulb = 54,
+	lineDecorationsWidth = 55,
+	lineHeight = 56,
+	lineNumbers = 57,
+	lineNumbersMinChars = 58,
+	linkedEditing = 59,
+	links = 60,
+	matchBrackets = 61,
+	minimap = 62,
+	mouseStyle = 63,
+	mouseWheelScrollSensitivity = 64,
+	mouseWheelZoom = 65,
+	multiCursorMergeOverlapping = 66,
+	multiCursorModifier = 67,
+	multiCursorPaste = 68,
+	occurrencesHighlight = 69,
+	overviewRulerBorder = 70,
+	overviewRulerLanes = 71,
+	padding = 72,
+	parameterHints = 73,
+	peekWidgetDefaultFocus = 74,
+	definitionLinkOpensInPeek = 75,
+	quickSuggestions = 76,
+	quickSuggestionsDelay = 77,
+	readOnly = 78,
+	renameOnType = 79,
+	renderControlCharacters = 80,
+	renderIndentGuides = 81,
+	renderFinalNewline = 82,
+	renderLineHighlight = 83,
+	renderLineHighlightOnlyWhenFocus = 84,
+	renderValidationDecorations = 85,
+	renderWhitespace = 86,
+	revealHorizontalRightPadding = 87,
+	roundedSelection = 88,
+	rulers = 89,
+	scrollbar = 90,
+	scrollBeyondLastColumn = 91,
+	scrollBeyondLastLine = 92,
+	scrollPredominantAxis = 93,
+	selectionClipboard = 94,
+	selectionHighlight = 95,
+	selectOnLineNumbers = 96,
+	showFoldingControls = 97,
+	showUnused = 98,
+	snippetSuggestions = 99,
+	smartSelect = 100,
+	smoothScrolling = 101,
+	stickyTabStops = 102,
+	stopRenderingLineAfter = 103,
+	suggest = 104,
+	suggestFontSize = 105,
+	suggestLineHeight = 106,
+	suggestOnTriggerCharacters = 107,
+	suggestSelection = 108,
+	tabCompletion = 109,
+	tabIndex = 110,
+	unusualLineTerminators = 111,
+	useShadowDOM = 112,
+	useTabStops = 113,
+	wordSeparators = 114,
+	wordWrap = 115,
+	wordWrapBreakAfterCharacters = 116,
+	wordWrapBreakBeforeCharacters = 117,
+	wordWrapColumn = 118,
+	wordWrapOverride1 = 119,
+	wordWrapOverride2 = 120,
+	wrappingIndent = 121,
+	wrappingStrategy = 122,
+	showDeprecated = 123,
+	inlayHints = 124,
+	editorClassName = 125,
+	pixelRatio = 126,
+	tabFocusMode = 127,
+	layoutInfo = 128,
+	wrappingInfo = 129
 }
 
 /**