rename widget fixes

Author: benibenj

src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.ts

@@ -922,8 +922,9 @@ export class InlineCompletionsModel extends Disposable {
 			} else if (completion.action?.kind === 'edit') {
 				const action = completion.action;
 				if (action.alternativeAction && alternativeAction) {
+					const altCommand = action.alternativeAction.command;
 					await this._commandService
-						.executeCommand(action.alternativeAction?.id, ...(action.alternativeAction?.arguments || []))
+						.executeCommand(altCommand.id, ...(altCommand.arguments || []))
 						.then(undefined, onUnexpectedExternalError);
 				} else if (action.snippetInfo) {
 					const mainEdit = TextReplacement.delete(action.textReplacement.range);

src/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.ts

@@ -25,7 +25,7 @@ import { EndOfLinePreference, ITextModel } from '../../../../common/model.js';
 import { TextModelText } from '../../../../common/model/textModelText.js';
 import { InlineCompletionViewData, InlineCompletionViewKind } from '../view/inlineEdits/inlineEditsViewInterface.js';
 import { computeEditKind, InlineSuggestionEditKind } from './editKind.js';
-import { IInlineSuggestDataAction, IInlineSuggestDataActionEdit, InlineSuggestData, InlineSuggestionList, PartialAcceptance, RenameInfo, SnippetInfo } from './provideInlineCompletions.js';
+import { IInlineSuggestDataAction, IInlineSuggestDataActionEdit, InlineSuggestAlternativeAction, InlineSuggestData, InlineSuggestionList, PartialAcceptance, RenameInfo, SnippetInfo } from './provideInlineCompletions.js';
 import { singleTextRemoveCommonPrefix } from './singleTextEditHelpers.js';
 
 export type InlineSuggestionItem = InlineEditItem | InlineCompletionItem;
@@ -51,7 +51,7 @@ export interface IInlineSuggestionActionEdit {
 	snippetInfo: SnippetInfo | undefined;
 	stringEdit: StringEdit;
 	uri: URI | undefined;
-	alternativeAction: Command | undefined;
+	alternativeAction: InlineSuggestAlternativeAction | undefined;
 }
 
 export interface IInlineSuggestionActionJumpTo {
@@ -62,7 +62,7 @@ export interface IInlineSuggestionActionJumpTo {
 }
 
 function hashInlineSuggestionAction(action: InlineSuggestionAction | undefined): string {
-	const obj = action?.kind === 'edit' ? { ...action, alternativeAction: action.alternativeAction?.id } : action;
+	const obj = action?.kind === 'edit' ? { ...action, alternativeAction: InlineSuggestAlternativeAction.toString(action.alternativeAction) } : action;
 	return JSON.stringify(obj);
 }
 

src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.ts

@@ -31,6 +31,7 @@ import { inlineCompletionIsVisible } from './inlineSuggestionItem.js';
 import { EditDeltaInfo } from '../../../../common/textModelEditSource.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { InlineSuggestionEditKind } from './editKind.js';
+import { ThemeIcon } from '../../../../../base/common/themables.js';
 
 export type InlineCompletionContextWithoutUuid = Omit<InlineCompletionContext, 'requestUuid'>;
 
@@ -313,6 +314,19 @@ export type InlineSuggestViewData = {
 	viewKind?: InlineCompletionViewKind;
 };
 
+export type InlineSuggestAlternativeAction = {
+	label: string;
+	icon?: ThemeIcon;
+	command: Command;
+	count: Promise<number>;
+};
+
+export namespace InlineSuggestAlternativeAction {
+	export function toString(action: InlineSuggestAlternativeAction | undefined): string | undefined {
+		return action?.command.id ?? undefined;
+	}
+}
+
 export type IInlineSuggestDataAction = IInlineSuggestDataActionEdit | IInlineSuggestDataActionJumpTo;
 
 export interface IInlineSuggestDataActionEdit {
@@ -321,7 +335,7 @@ export interface IInlineSuggestDataActionEdit {
 	insertText: string;
 	snippetInfo: SnippetInfo | undefined;
 	uri: URI | undefined;
-	alternativeAction: Command | undefined;
+	alternativeAction: InlineSuggestAlternativeAction | undefined;
 }
 
 export interface IInlineSuggestDataActionJumpTo {

src/vs/editor/contrib/inlineCompletions/browser/model/renameSymbolProcessor.ts

@@ -23,7 +23,7 @@ import { EditSources, TextModelEditSource } from '../../../../common/textModelEd
 import { hasProvider, rawRename } from '../../../rename/browser/rename.js';
 import { renameSymbolCommandId } from '../controller/commandIds.js';
 import { InlineSuggestionItem } from './inlineSuggestionItem.js';
-import { IInlineSuggestDataActionEdit } from './provideInlineCompletions.js';
+import { IInlineSuggestDataActionEdit, InlineSuggestAlternativeAction } from './provideInlineCompletions.js';
 
 enum RenameKind {
 	no = 'no',
@@ -227,7 +227,7 @@ class RenameSymbolRunnable {
 	private readonly _promise: Promise<WorkspaceEdit & Rejection>;
 	private _result: WorkspaceEdit & Rejection | undefined = undefined;
 
-	constructor(languageFeaturesService: ILanguageFeaturesService, textModel: ITextModel, position: Position, newName: string, source: TextModelEditSource) {
+	constructor(languageFeaturesService: ILanguageFeaturesService, textModel: ITextModel, position: Position, newName: string) {
 		this._cancellationTokenSource = new CancellationTokenSource();
 		this._promise = rawRename(languageFeaturesService.renameProvider, textModel, position, newName, this._cancellationTokenSource.token);
 	}
@@ -282,7 +282,7 @@ export class RenameSymbolProcessor extends Disposable {
 			if (self._renameRunnable.id !== id) {
 				self._renameRunnable.runnable.cancel();
 				self._renameRunnable = undefined;
-				const runnable = new RenameSymbolRunnable(self._languageFeaturesService, textModel, position, newName, source);
+				const runnable = new RenameSymbolRunnable(self._languageFeaturesService, textModel, position, newName);
 				workspaceEdit = await runnable.getWorkspaceEdit();
 			} else {
 				workspaceEdit = await self._renameRunnable.runnable.getWorkspaceEdit();
@@ -304,19 +304,19 @@ export class RenameSymbolProcessor extends Disposable {
 			return suggestItem;
 		}
 
-		const edit = suggestItem.action.textReplacement;
-
 		const start = Date.now();
-
+		const edit = suggestItem.action.textReplacement;
 		const languageConfiguration = this._languageConfigurationService.getLanguageConfiguration(textModel.getLanguageId());
 
+		// Check synchronously if a rename is possible
 		const edits = this._renameInferenceEngine.inferRename(textModel, edit.range, edit.text, languageConfiguration.wordDefinition);
 		if (edits === undefined || edits.renames.edits.length === 0) {
 			return suggestItem;
 		}
 
 		const { oldName, newName, position, edits: renameEdits } = edits.renames;
 
+		// Check asynchronously if a rename is possible
 		let timedOut = false;
 		const check = await raceTimeout<RenameKind>(this.checkRenamePrecondition(suggestItem, textModel, position, oldName, newName), 1000, () => { timedOut = true; });
 		const renamePossible = check === RenameKind.yes || check === RenameKind.maybe;
@@ -333,7 +333,16 @@ export class RenameSymbolProcessor extends Disposable {
 			return suggestItem;
 		}
 
+		// Prepare the rename edits
 		const id = suggestItem.identity.id;
+		if (this._renameRunnable !== undefined) {
+			this._renameRunnable.runnable.cancel();
+			this._renameRunnable = undefined;
+		}
+		const runnable = new RenameSymbolRunnable(this._languageFeaturesService, textModel, position, newName);
+		this._renameRunnable = { id, runnable };
+
+		// Create alternative action
 		const source = EditSources.inlineCompletionAccept({
 			nes: suggestItem.isInlineEdit,
 			requestUuid: suggestItem.requestUuid,
@@ -345,23 +354,21 @@ export class RenameSymbolProcessor extends Disposable {
 			title: localize('rename', "Rename"),
 			arguments: [textModel, position, newName, source, id],
 		};
-		const textReplacement = renameEdits[0];
+		const alternativeAction: InlineSuggestAlternativeAction = {
+			label: localize('rename', "Rename"),
+			//icon: Codicon.replaceAll,
+			command,
+			count: runnable.getCount(),
+		};
 		const renameAction: IInlineSuggestDataActionEdit = {
 			kind: 'edit',
-			range: textReplacement.range,
-			insertText: textReplacement.text,
+			range: renameEdits[0].range,
+			insertText: renameEdits[0].text,
 			snippetInfo: suggestItem.snippetInfo,
-			alternativeAction: command,
+			alternativeAction,
 			uri: textModel.uri
 		};
 
-		if (this._renameRunnable !== undefined) {
-			this._renameRunnable.runnable.cancel();
-			this._renameRunnable = undefined;
-		}
-		const runnable = new RenameSymbolRunnable(this._languageFeaturesService, textModel, position, newName, source);
-		this._renameRunnable = { id, runnable };
-
 		return InlineSuggestionItem.create(suggestItem.withAction(renameAction), textModel);
 	}
 

src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { n, trackFocus } from '../../../../../../../base/browser/dom.js';
+import { ModifierKeyEmitter, n, trackFocus } from '../../../../../../../base/browser/dom.js';
 import { renderIcon } from '../../../../../../../base/browser/ui/iconLabel/iconLabels.js';
 import { Codicon } from '../../../../../../../base/common/codicons.js';
 import { BugIndicatingError } from '../../../../../../../base/common/errors.js';
@@ -33,12 +33,14 @@ import { Command, InlineCompletionCommand, IInlineCompletionModelInfo } from '..
 import { InlineSuggestionItem } from '../../../model/inlineSuggestionItem.js';
 import { localize } from '../../../../../../../nls.js';
 import { InlineCompletionsModel } from '../../../model/inlineCompletionsModel.js';
+import { InlineSuggestAlternativeAction } from '../../../model/provideInlineCompletions.js';
 
 export class InlineEditsGutterIndicatorData {
 	constructor(
 		readonly gutterMenuData: InlineSuggestionGutterMenuData,
 		readonly originalRange: LineRange,
 		readonly model: SimpleInlineSuggestModel,
+		readonly altAction: InlineSuggestAlternativeAction | undefined,
 	) { }
 }
 
@@ -144,8 +146,17 @@ export class InlineEditsGutterIndicator extends Disposable {
 
 	private readonly _isHoveredOverInlineEditDebounced: IObservable<boolean>;
 
+	private readonly _modifierPressed = observableFromEvent(this, ModifierKeyEmitter.getInstance().event, () => ModifierKeyEmitter.getInstance().keyStatus.shiftKey);
 	private readonly _gutterIndicatorStyles = derived(this, reader => {
-		const v = this._tabAction.read(reader);
+		let v = this._tabAction.read(reader);
+
+		// TODO: add source of truth for alt action active and key pressed
+		const altAction = this._data.read(reader)?.altAction;
+		const modifiedPressed = this._modifierPressed.read(reader);
+		if (altAction && modifiedPressed) {
+			v = InlineEditTabAction.Inactive;
+		}
+
 		switch (v) {
 			case InlineEditTabAction.Inactive: return {
 				background: getEditorBlendedColor(inlineEditIndicatorSecondaryBackground, this._themeService).read(reader).toString(),
@@ -509,7 +520,7 @@ export class InlineEditsGutterIndicator extends Disposable {
 				borderRadius: '4px',
 				display: 'flex',
 				justifyContent: 'flex-end',
-				transition: 'background-color 0.2s ease-in-out, width 0.2s ease-in-out',
+				transition: this._modifierPressed.map(m => m ? '' : 'background-color 0.2s ease-in-out, width 0.2s ease-in-out'),
 				...rectToProps(reader => layout.read(reader).pillRect),
 			}
 		}, [