Merge pull request microsoft#184591 from microsoft/aiday/IEtoICmigration

Further migrating Interactive Editor to Inline Chat

Author: aiday-mar

src/vs/workbench/api/common/extHostInteractiveEditor.ts

@@ -68,7 +68,7 @@ export class ExtHostInteractiveEditor implements ExtHostInteractiveEditorShape {
 		};
 
 		extHostCommands.registerApiCommand(new ApiCommand(
-			'vscode.editorChat.start', 'interactiveEditor.start', 'Invoke a new editor chat session',
+			'vscode.editorChat.start', 'inlineChat.start', 'Invoke a new editor chat session',
 			[new ApiCommandArgument<EditorChatApiArg | undefined, InteractiveEditorRunOptions | undefined>('Run arguments', '', _v => true, v => {
 
 				if (!v) {

src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.ts

@@ -33,7 +33,7 @@ export function getAccessibilityHelpText(accessor: ServicesAccessor, type: 'chat
 		const match = currentInput?.match(regex);
 		const command = match && match.length ? match[0].substring(1) : undefined;
 		if (command === 'fix') {
-			const editMode = configurationService.getValue('interactiveEditor.editMode');
+			const editMode = configurationService.getValue('inlineChat.mode');
 			if (editMode === EditMode.Preview) {
 				const keybinding = keybindingService.lookupKeybinding('editor.action.diffReview.next')?.getAriaLabel();
 				content.push(keybinding ? localize('interactiveSession.diff', "Tab again to enter the Diff editor with the changes and enter review mode with ({0}). Use Up/DownArrow to navigate lines with the proposed changes.", keybinding) : localize('interactiveSession.diffNoKb', "Tab again to enter the Diff editor with the changes and enter review mode with the Go to Next Difference Command. Use Up/DownArrow to navigate lines with the proposed changes."));

src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.ts

@@ -26,13 +26,15 @@ import { fromNow } from 'vs/base/common/date';
 import { IInlineChatSessionService, Recording } from 'vs/workbench/contrib/inlineChat/browser/inlineChatSession';
 import { runAccessibilityHelpAction } from 'vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp';
 import { CONTEXT_ACCESSIBILITY_MODE_ENABLED } from 'vs/platform/accessibility/common/accessibility';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 
+CommandsRegistry.registerCommandAlias('interactiveEditor.start', 'inlineChat.start');
 
 export class StartSessionAction extends EditorAction2 {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.start',
+			id: 'inlineChat.start',
 			title: { value: localize('run', 'Start Code Chat'), original: 'Start Code Chat' },
 			category: AbstractInlineChatAction.category,
 			f1: true,
@@ -69,7 +71,7 @@ export class StartSessionAction extends EditorAction2 {
 export class UnstashSessionAction extends EditorAction2 {
 	constructor() {
 		super({
-			id: 'interactiveEditor.unstash',
+			id: 'inlineChat.unstash',
 			title: { value: localize('unstash', 'Resume Last Dismissed Code Chat'), original: 'Resume Last Dismissed Code Chat' },
 			category: AbstractInlineChatAction.category,
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_HAS_STASHED_SESSION, EditorContextKeys.writable),
@@ -132,7 +134,7 @@ export class MakeRequestAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.accept',
+			id: 'inlineChat.accept',
 			title: localize('accept', 'Make Request'),
 			icon: Codicon.send,
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EMPTY.negate()),
@@ -159,7 +161,7 @@ export class StopRequestAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.stop',
+			id: 'inlineChat.stop',
 			title: localize('stop', 'Stop Request'),
 			icon: Codicon.debugStop,
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EMPTY.negate(), CTX_INLINE_CHAT_HAS_ACTIVE_REQUEST),
@@ -184,7 +186,7 @@ export class StopRequestAction extends AbstractInlineChatAction {
 export class ArrowOutUpAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
-			id: 'interactiveEditor.arrowOutUp',
+			id: 'inlineChat.arrowOutUp',
 			title: localize('arrowUp', 'Cursor Up'),
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, EditorContextKeys.isEmbeddedDiffEditor.negate(), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 			keybinding: {
@@ -202,7 +204,7 @@ export class ArrowOutUpAction extends AbstractInlineChatAction {
 export class ArrowOutDownAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
-			id: 'interactiveEditor.arrowOutDown',
+			id: 'inlineChat.arrowOutDown',
 			title: localize('arrowDown', 'Cursor Down'),
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_INNER_CURSOR_LAST, EditorContextKeys.isEmbeddedDiffEditor.negate(), CONTEXT_ACCESSIBILITY_MODE_ENABLED.negate()),
 			keybinding: {
@@ -221,7 +223,7 @@ export class FocusInlineChat extends EditorAction2 {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.focus',
+			id: 'inlineChat.focus',
 			title: { value: localize('focus', 'Focus Input'), original: 'Focus Input' },
 			f1: true,
 			category: AbstractInlineChatAction.category,
@@ -247,7 +249,7 @@ export class PreviousFromHistory extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.previousFromHistory',
+			id: 'inlineCat.previousFromHistory',
 			title: localize('previousFromHistory', 'Previous From History'),
 			precondition: CTX_INLINE_CHAT_FOCUSED,
 			keybinding: {
@@ -266,7 +268,7 @@ export class NextFromHistory extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.nextFromHistory',
+			id: 'inlineChat.nextFromHistory',
 			title: localize('nextFromHistory', 'Next From History'),
 			precondition: CTX_INLINE_CHAT_FOCUSED,
 			keybinding: {
@@ -296,7 +298,7 @@ export class DiscardAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.discard',
+			id: 'inlineChat.discard',
 			title: localize('discard', 'Discard'),
 			icon: Codicon.discard,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -321,7 +323,7 @@ export class DiscardToClipboardAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.discardToClipboard',
+			id: 'inlineChat.discardToClipboard',
 			title: localize('undo.clipboard', 'Discard to Clipboard'),
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DID_EDIT),
 			// keybinding: {
@@ -350,7 +352,7 @@ export class DiscardUndoToNewFileAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.discardToFile',
+			id: 'inlineChat.discardToFile',
 			title: localize('undo.newfile', 'Discard to New File'),
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DID_EDIT),
 			menu: {
@@ -374,7 +376,7 @@ export class DiscardUndoToNewFileAction extends AbstractInlineChatAction {
 export class FeebackHelpfulCommand extends AbstractInlineChatAction {
 	constructor() {
 		super({
-			id: 'interactiveEditor.feedbackHelpful',
+			id: 'inlineChat.feedbackHelpful',
 			title: localize('feedback.helpful', 'Helpful'),
 			icon: Codicon.thumbsup,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -396,7 +398,7 @@ export class FeebackHelpfulCommand extends AbstractInlineChatAction {
 export class FeebackUnhelpfulCommand extends AbstractInlineChatAction {
 	constructor() {
 		super({
-			id: 'interactiveEditor.feedbackunhelpful',
+			id: 'inlineChat.feedbackunhelpful',
 			title: localize('feedback.unhelpful', 'Unhelpful'),
 			icon: Codicon.thumbsdown,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -419,7 +421,7 @@ export class ToggleInlineDiff extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.toggleDiff',
+			id: 'inlineChat.toggleDiff',
 			title: localize('toggleDiff', 'Toggle Diff'),
 			icon: Codicon.diff,
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_DID_EDIT),
@@ -468,7 +470,7 @@ export class CancelSessionAction extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.cancel',
+			id: 'inlineChat.cancel',
 			title: localize('cancel', 'Cancel'),
 			icon: Codicon.clearAll,
 			precondition: ContextKeyExpr.and(CTX_INLINE_CHAT_VISIBLE, CTX_INLINE_CHAT_EDIT_MODE.isEqualTo(EditMode.Preview)),
@@ -494,7 +496,7 @@ export class CopyRecordings extends AbstractInlineChatAction {
 
 	constructor() {
 		super({
-			id: 'interactiveEditor.copyRecordings',
+			id: 'inlineChat.copyRecordings',
 			f1: true,
 			title: {
 				value: localize('copyRecordings', '(Developer) Write Exchange to Clipboard'),
@@ -532,7 +534,7 @@ export class CopyRecordings extends AbstractInlineChatAction {
 export class ViewInChatAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
-			id: 'interactiveEditor.viewInChat',
+			id: 'inlineChat.viewInChat',
 			title: localize('viewInChat', 'View in Chat'),
 			icon: Codicon.commentDiscussion,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -552,7 +554,7 @@ export class ViewInChatAction extends AbstractInlineChatAction {
 export class ExpandMessageAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
-			id: 'interactiveEditor.expandMessageAction',
+			id: 'inlineChat.expandMessageAction',
 			title: localize('expandMessage', 'Expand Message'),
 			icon: Codicon.chevronDown,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -572,7 +574,7 @@ export class ExpandMessageAction extends AbstractInlineChatAction {
 export class ContractMessageAction extends AbstractInlineChatAction {
 	constructor() {
 		super({
-			id: 'interactiveEditor.contractMessageAction',
+			id: 'inlineChat.contractMessageAction',
 			title: localize('contractMessage', 'Contract Message'),
 			icon: Codicon.chevronUp,
 			precondition: CTX_INLINE_CHAT_VISIBLE,
@@ -592,7 +594,7 @@ export class ContractMessageAction extends AbstractInlineChatAction {
 export class AccessibilityHelpEditorAction extends EditorAction2 {
 	constructor() {
 		super({
-			id: 'interactiveEditor.accessibilityHelp',
+			id: 'inlineChat.accessibilityHelp',
 			title: localize('actions.interactiveSession.accessibiltyHelpEditor', "Interactive Session Editor Accessibility Help"),
 			category: AbstractInlineChatAction.category,
 			keybinding: {

src/vs/workbench/contrib/inlineChat/browser/inlineChatController.ts

@@ -157,7 +157,7 @@ export class InlineChatController implements IEditorContribution {
 	}
 
 	private _getMode(): EditMode {
-		const editMode = this._configurationService.inspect<EditMode>('interactiveEditor.editMode');
+		const editMode = this._configurationService.inspect<EditMode>('inlineChat.mode');
 		let editModeValue = editMode.value;
 		if (this._accessibilityService.isScreenReaderOptimized() && editModeValue === editMode.defaultValue) {
 			// By default, use preview mode for screen reader users
@@ -315,8 +315,8 @@ export class InlineChatController implements IEditorContribution {
 		}
 		let result = this._activeSession.session.placeholder ?? localize('default.placeholder', "Ask a question");
 		if (InlineChatController._promptHistory.length > 0) {
-			const kb1 = this._keybindingService.lookupKeybinding('interactiveEditor.previousFromHistory')?.getLabel();
-			const kb2 = this._keybindingService.lookupKeybinding('interactiveEditor.nextFromHistory')?.getLabel();
+			const kb1 = this._keybindingService.lookupKeybinding('inlineChat.previousFromHistory')?.getLabel();
+			const kb2 = this._keybindingService.lookupKeybinding('inlineChat.nextFromHistory')?.getLabel();
 
 			if (kb1 && kb2) {
 				result = localize('default.placeholder.history', "{0} ({1}, {2} for history)", result, kb1, kb2);

src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.ts

@@ -360,8 +360,8 @@ export class InlineChatWidget {
 		}
 		let label = defaultAriaLabel;
 		if (this._configurationService.getValue<boolean>(AccessibilityVerbositySettingId.InteractiveEditor)) {
-			const kbLabel = this._keybindingService.lookupKeybinding('interactiveEditor.accessibilityHelp')?.getLabel();
-			label = kbLabel ? localize('interactiveEditor.accessibilityHelp', "Interactive Editor Input, Use {0} for Interactive Editor Accessibility Help.", kbLabel) : localize('interactiveSessionInput.accessibilityHelpNoKb', "Interactive Editor Input, Run the Interactive Editor Accessibility Help command for more information.");
+			const kbLabel = this._keybindingService.lookupKeybinding('inlineChat.accessibilityHelp')?.getLabel();
+			label = kbLabel ? localize('inlineChat.accessibilityHelp', "Inline Chat Input, Use {0} for Inline Chat Accessibility Help.", kbLabel) : localize('inlineChat.accessibilityHelpNoKb', "Inline Chat Input, Run the Inline Chat Accessibility Help command for more information.");
 		}
 		_inputEditorOptions.ariaLabel = label;
 		this._inputEditor.updateOptions({ ariaLabel: label });

src/vs/workbench/contrib/inlineChat/common/inlineChat.ts

@@ -17,6 +17,7 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';
 import { diffInserted, diffRemoved, editorHoverHighlight, editorWidgetBorder, focusBorder, inputBackground, inputPlaceholderForeground, registerColor, transparent, widgetShadow } from 'vs/platform/theme/common/colorRegistry';
+import { Extensions as ExtensionsMigration, IConfigurationMigrationRegistry } from 'vs/workbench/common/configuration';
 
 export interface IInlineChatSlashCommand {
 	command: string;
@@ -150,18 +151,26 @@ export const enum EditMode {
 	Preview = 'preview'
 }
 
+Registry.as<IConfigurationMigrationRegistry>(ExtensionsMigration.ConfigurationMigration).registerConfigurationMigrations(
+	[{
+		key: 'interactiveEditor.editMode', migrateFn: (value: any) => {
+			return [['inlineChat.mode', { value: value }]];
+		}
+	}]
+);
+
 Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 	id: 'editor',
 	properties: {
-		'interactiveEditor.editMode': {
-			description: localize('editMode', "Configure if changes crafted in the interactive editor are applied directly to the document or are previewed first."),
+		'inlineChat.mode': {
+			description: localize('mode', "Configure if changes crafted in the interactive editor are applied directly to the document or are previewed first."),
 			default: EditMode.LivePreview,
 			type: 'string',
 			enum: [EditMode.LivePreview, EditMode.Preview, EditMode.Live],
 			markdownEnumDescriptions: [
-				localize('editMode.livePreview', "Changes are applied directly to the document and are highlighted visually via inline or side-by-side diffs. Ending a session will keep the changes."),
-				localize('editMode.preview', "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."),
-				localize('editMode.live', "Changes are applied directly to the document but can be highlighted via inline diffs. Ending a session will keep the changes."),
+				localize('mode.livePreview', "Changes are applied directly to the document and are highlighted visually via inline or side-by-side diffs. Ending a session will keep the changes."),
+				localize('mode.preview', "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."),
+				localize('mode.live', "Changes are applied directly to the document but can be highlighted via inline diffs. Ending a session will keep the changes."),
 			]
 		}
 	}

src/vs/workbench/contrib/preferences/browser/settingsLayout.ts

@@ -232,8 +232,8 @@ export const tocData: ITOCEntry<string> = {
 				},
 				{
 					id: 'features/chat',
-					label: localize('interactiveSession', 'Interactive Session'),
-					settings: ['chat.*', 'interactiveEditor.*']
+					label: localize('chat', 'Chat'),
+					settings: ['chat.*', 'inlineChat.*']
 				}
 			]
 		},