rename suggestions: migrate to using list widget

Author: ulugbekna

src/vs/editor/common/languages.ts

@@ -1652,8 +1652,17 @@ export interface RenameProvider {
 	resolveRenameLocation?(model: model.ITextModel, position: Position, token: CancellationToken): ProviderResult<RenameLocation & Rejection>;
 }
 
+export enum NewSymbolNameTag {
+	AIGenerated = 1
+}
+
+export interface NewSymbolName {
+	readonly newSymbolName: string;
+	readonly tags?: readonly NewSymbolNameTag[];
+}
+
 export interface NewSymbolNamesProvider {
-	provideNewSymbolNames(model: model.ITextModel, range: IRange, token: CancellationToken): ProviderResult<string[]>;
+	provideNewSymbolNames(model: model.ITextModel, range: IRange, token: CancellationToken): ProviderResult<NewSymbolName[]>;
 }
 
 export interface Command {

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

@@ -702,6 +702,10 @@ export enum MouseTargetType {
 	OUTSIDE_EDITOR = 13
 }
 
+export enum NewSymbolNameTag {
+	AIGenerated = 1
+}
+
 /**
  * A positioning preference for rendering overlay widgets.
  */

src/vs/editor/contrib/rename/browser/rename.ts

@@ -11,20 +11,23 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { assertType } from 'vs/base/common/types';
 import { URI } from 'vs/base/common/uri';
-import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { EditorAction, EditorCommand, EditorContributionInstantiation, registerEditorAction, registerEditorCommand, registerEditorContribution, registerModelAndPositionCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
+import { EditorAction, EditorCommand, EditorContributionInstantiation, ServicesAccessor, registerEditorAction, registerEditorCommand, registerEditorContribution, registerModelAndPositionCommand } from 'vs/editor/browser/editorExtensions';
 import { IBulkEditService } from 'vs/editor/browser/services/bulkEditService';
 import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
 import { IPosition, Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { IEditorContribution } from 'vs/editor/common/editorCommon';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
+import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
+import { NewSymbolName, Rejection, RenameLocation, RenameProvider, WorkspaceEdit } from 'vs/editor/common/languages';
 import { ITextModel } from 'vs/editor/common/model';
-import { Rejection, RenameLocation, RenameProvider, WorkspaceEdit } from 'vs/editor/common/languages';
+import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration';
+import { CodeEditorStateFlag, EditorStateCancellationTokenSource } from 'vs/editor/contrib/editorState/browser/editorState';
 import { MessageController } from 'vs/editor/contrib/message/browser/messageController';
 import * as nls from 'vs/nls';
+import { Action2, registerAction2 } from 'vs/platform/actions/common/actions';
 import { ConfigurationScope, Extensions, IConfigurationRegistry } from 'vs/platform/configuration/common/configurationRegistry';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -33,9 +36,7 @@ import { ILogService } from 'vs/platform/log/common/log';
 import { INotificationService } from 'vs/platform/notification/common/notification';
 import { IEditorProgressService } from 'vs/platform/progress/common/progress';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { CONTEXT_RENAME_INPUT_VISIBLE, RenameInputField } from './renameInputField';
-import { LanguageFeatureRegistry } from 'vs/editor/common/languageFeatureRegistry';
-import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
+import { CONTEXT_RENAME_INPUT_FOCUSED, CONTEXT_RENAME_INPUT_VISIBLE, RenameInputField } from './renameInputField';
 
 class RenameSkeleton {
 
@@ -213,7 +214,7 @@ class RenameController implements IEditorContribution {
 			this._languageFeaturesService.newSymbolNamesProvider
 				.all(model)
 				.map(provider => provider.provideNewSymbolNames(model, loc.range, cts2.token)) // TODO@ulugbekna: make sure this works regardless if the result is then-able
-		).then((candidates) => candidates.filter((c): c is string[] => !!c).flat());
+		).then((candidates) => candidates.filter((c): c is NewSymbolName[] => !!c).flat());
 
 		const selection = this.editor.getSelection();
 		let selectionStart = 0;
@@ -288,6 +289,14 @@ class RenameController implements IEditorContribution {
 	cancelRenameInput(): void {
 		this._renameInputField.cancelInput(true);
 	}
+
+	focusNextRenameSuggestion(): void {
+		this._renameInputField.focusNextRenameSuggestion();
+	}
+
+	focusPreviousRenameSuggestion(): void {
+		this._renameInputField.focusPreviousRenameSuggestion();
+	}
 }
 
 // ---- action implementation
@@ -380,6 +389,76 @@ registerEditorCommand(new RenameCommand({
 	}
 }));
 
+registerAction2(class FocusNextRenameSuggestion extends Action2 {
+	constructor() {
+		super({
+			id: 'focusNextRenameSuggestion',
+			title: {
+				...nls.localize2('focusNextRenameSuggestion', "Focus Next Rename Suggestion"),
+			},
+			precondition: CONTEXT_RENAME_INPUT_VISIBLE,
+			keybinding: [
+				{
+					when: CONTEXT_RENAME_INPUT_FOCUSED,
+					primary: KeyCode.Tab,
+					weight: KeybindingWeight.EditorContrib + 99,
+				},
+				{
+					when: CONTEXT_RENAME_INPUT_FOCUSED.toNegated(),
+					primary: KeyCode.Tab,
+					secondary: [KeyCode.DownArrow],
+					weight: KeybindingWeight.EditorContrib + 99,
+				}
+			]
+		});
+	}
+
+	override run(accessor: ServicesAccessor): void {
+		const currentEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
+		if (!currentEditor) { return; }
+
+		const controller = RenameController.get(currentEditor);
+		if (!controller) { return; }
+
+		controller.focusNextRenameSuggestion();
+	}
+});
+
+registerAction2(class FocusPreviousRenameSuggestion extends Action2 {
+	constructor() {
+		super({
+			id: 'focusPreviousRenameSuggestion',
+			title: {
+				...nls.localize2('focusPreviousRenameSuggestion', "Focus Previous Rename Suggestion"),
+			},
+			precondition: CONTEXT_RENAME_INPUT_VISIBLE,
+			keybinding: [
+				{
+					when: CONTEXT_RENAME_INPUT_FOCUSED,
+					primary: KeyCode.Tab | KeyCode.Shift,
+					weight: KeybindingWeight.EditorContrib + 99,
+				},
+				{
+					when: CONTEXT_RENAME_INPUT_FOCUSED.toNegated(),
+					primary: KeyMod.Shift | KeyCode.Tab,
+					secondary: [KeyCode.UpArrow],
+					weight: KeybindingWeight.EditorContrib + 99,
+				}
+			]
+		});
+	}
+
+	override run(accessor: ServicesAccessor): void {
+		const currentEditor = accessor.get(ICodeEditorService).getFocusedCodeEditor();
+		if (!currentEditor) { return; }
+
+		const controller = RenameController.get(currentEditor);
+		if (!controller) { return; }
+
+		controller.focusPreviousRenameSuggestion();
+	}
+});
+
 // ---- api bridge command
 
 registerModelAndPositionCommand('_executeDocumentRenameProvider', function (accessor, model, position, ...args) {

src/vs/editor/contrib/rename/browser/renameInputField.css

@@ -24,19 +24,6 @@
 	opacity: .8;
 }
 
-.rename-box .new-name-candidates-container {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	margin-top: 5px;
-}
-
-.rename-box .new-name-candidates-container > .monaco-text-button {
-	width: auto;
-	margin: 2px;
-	padding: 2px;
-}
-
 .monaco-editor .rename-box.preview .rename-label {
 	display: inherit;
 }