chore: rename acceptDiff to viewDiff

Author: ivikash

packages/amazonq/.changes/next-release/Feature-3ebcda93-ca02-4682-b475-dead26e94900.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Add View Diff button to allow users to open native diff view in the editor."
+}

packages/core/src/amazonq/commons/controllers/contentController.ts

@@ -55,7 +55,7 @@ export class EditorContentController {
         }
     }
 
-    public async acceptDiff(message: any) {
+    public async viewDiff(message: any) {
         const { filePath } = message?.context?.activeFileContext || {}
         if (filePath && message?.code?.trim().length > 0) {
             const left = Uri.file(filePath) // Existing File to Write
@@ -71,7 +71,7 @@ export class EditorContentController {
                 99
             )
 
-            const diffScheme = 'amazon-q-accept-diff'
+            const diffScheme = 'amazon-q-view-diff'
             const right = Uri.parse(`${diffScheme}:${rightFile}`)
 
             class LeftContentProvider {

packages/core/src/amazonq/webview/ui/commands.ts

@@ -16,7 +16,7 @@ type MessageCommand =
     | 'open-diff'
     | 'code_was_copied_to_clipboard'
     | 'insert_code_at_cursor_position'
-    | 'accept_diff'
+    | 'view_diff'
     | 'stop-response'
     | 'trigger-tabID-received'
     | 'clear'

packages/core/src/amazonq/webview/ui/connector.ts

@@ -242,7 +242,7 @@ export class Connector {
         }
     }
 
-    onAcceptDiff = (
+    onViewDiff = (
         tabId: string,
         messageId: string,
         actionId: string,
@@ -258,7 +258,7 @@ export class Connector {
         this.sendMessageToExtension({
             tabType,
             tabID: tabId,
-            command: 'accept_diff',
+            command: 'view_diff',
             messageId,
             actionId,
             data,

packages/core/src/amazonq/webview/ui/main.ts

@@ -224,12 +224,16 @@ export const createMynahUI = (ideApi: any, amazonQEnabled: boolean) => {
                     ...item,
                     messageId: item.messageId,
                     codeBlockActions: {
-                        'accept-diff': {
-                            id: 'accept-diff',
-                            label: 'Open Diff',
-                            icon: MynahIcons.OK_CIRCLED,
-                            data: messageData,
-                        },
+                        ...(true // update the condition for fix, refactor etc.
+                            ? {
+                                  'view-diff': {
+                                      id: 'view-diff',
+                                      label: 'View Diff',
+                                      icon: MynahIcons.OK_CIRCLED,
+                                      data: messageData,
+                                  },
+                              }
+                            : {}),
                     },
                 })
             }
@@ -432,8 +436,8 @@ export const createMynahUI = (ideApi: any, amazonQEnabled: boolean) => {
             codeBlockIndex?: number,
             totalCodeBlocks?: number
         ) => {
-            if (actionId === 'accept-diff') {
-                connector.onAcceptDiff(
+            if (actionId === 'view-diff') {
+                connector.onViewDiff(
                     tabId,
                     messageId,
                     actionId,

packages/core/src/codewhispererChat/app.ts

@@ -10,7 +10,7 @@ import { AmazonQAppInitContext } from '../amazonq/apps/initContext'
 import { MessageListener } from '../amazonq/messages/messageListener'
 import { MessagePublisher } from '../amazonq/messages/messagePublisher'
 import {
-    AcceptDiff,
+    ViewDiff,
     ChatItemFeedbackMessage,
     ChatItemVotedMessage,
     CopyCodeToClipboard,
@@ -35,7 +35,7 @@ export function init(appContext: AmazonQAppInitContext) {
         processTabClosedMessage: new EventEmitter<TabClosedMessage>(),
         processTabChangedMessage: new EventEmitter<TabChangedMessage>(),
         processInsertCodeAtCursorPosition: new EventEmitter<InsertCodeAtCursorPosition>(),
-        processAcceptDiff: new EventEmitter<AcceptDiff>(),
+        processViewDiff: new EventEmitter<ViewDiff>(),
         processCopyCodeToClipboard: new EventEmitter<CopyCodeToClipboard>(),
         processContextMenuCommand: new EventEmitter<EditorContextCommand>(),
         processTriggerTabIDReceived: new EventEmitter<TriggerTabIDReceived>(),
@@ -64,7 +64,7 @@ export function init(appContext: AmazonQAppInitContext) {
         processInsertCodeAtCursorPosition: new MessageListener<InsertCodeAtCursorPosition>(
             cwChatControllerEventEmitters.processInsertCodeAtCursorPosition
         ),
-        processAcceptDiff: new MessageListener<AcceptDiff>(cwChatControllerEventEmitters.processAcceptDiff),
+        processViewDiff: new MessageListener<ViewDiff>(cwChatControllerEventEmitters.processViewDiff),
         processCopyCodeToClipboard: new MessageListener<CopyCodeToClipboard>(
             cwChatControllerEventEmitters.processCopyCodeToClipboard
         ),
@@ -111,7 +111,7 @@ export function init(appContext: AmazonQAppInitContext) {
         processInsertCodeAtCursorPosition: new MessagePublisher<InsertCodeAtCursorPosition>(
             cwChatControllerEventEmitters.processInsertCodeAtCursorPosition
         ),
-        processAcceptDiff: new MessagePublisher<AcceptDiff>(cwChatControllerEventEmitters.processAcceptDiff),
+        processViewDiff: new MessagePublisher<ViewDiff>(cwChatControllerEventEmitters.processViewDiff),
         processCopyCodeToClipboard: new MessagePublisher<CopyCodeToClipboard>(
             cwChatControllerEventEmitters.processCopyCodeToClipboard
         ),

packages/core/src/codewhispererChat/controllers/chat/controller.ts

@@ -24,7 +24,7 @@ import {
     ResponseBodyLinkClickMessage,
     ChatPromptCommandType,
     FooterInfoLinkClick,
-    AcceptDiff,
+    ViewDiff,
 } from './model'
 import { AppToWebViewMessageDispatcher } from '../../view/connector/connector'
 import { MessagePublisher } from '../../../amazonq/messages/messagePublisher'
@@ -57,7 +57,7 @@ export interface ChatControllerMessagePublishers {
     readonly processTabClosedMessage: MessagePublisher<TabClosedMessage>
     readonly processTabChangedMessage: MessagePublisher<TabChangedMessage>
     readonly processInsertCodeAtCursorPosition: MessagePublisher<InsertCodeAtCursorPosition>
-    readonly processAcceptDiff: MessagePublisher<AcceptDiff>
+    readonly processViewDiff: MessagePublisher<ViewDiff>
     readonly processCopyCodeToClipboard: MessagePublisher<CopyCodeToClipboard>
     readonly processContextMenuCommand: MessagePublisher<EditorContextCommand>
     readonly processTriggerTabIDReceived: MessagePublisher<TriggerTabIDReceived>
@@ -76,7 +76,7 @@ export interface ChatControllerMessageListeners {
     readonly processTabClosedMessage: MessageListener<TabClosedMessage>
     readonly processTabChangedMessage: MessageListener<TabChangedMessage>
     readonly processInsertCodeAtCursorPosition: MessageListener<InsertCodeAtCursorPosition>
-    readonly processAcceptDiff: MessageListener<AcceptDiff>
+    readonly processViewDiff: MessageListener<ViewDiff>
     readonly processCopyCodeToClipboard: MessageListener<CopyCodeToClipboard>
     readonly processContextMenuCommand: MessageListener<EditorContextCommand>
     readonly processTriggerTabIDReceived: MessageListener<TriggerTabIDReceived>
@@ -144,8 +144,8 @@ export class ChatController {
             return this.processInsertCodeAtCursorPosition(data)
         })
 
-        this.chatControllerMessageListeners.processAcceptDiff.onMessage((data) => {
-            return this.processAcceptDiff(data)
+        this.chatControllerMessageListeners.processViewDiff.onMessage((data) => {
+            return this.processViewDiff(data)
         })
 
         this.chatControllerMessageListeners.processCopyCodeToClipboard.onMessage((data) => {
@@ -266,9 +266,9 @@ export class ChatController {
         this.telemetryHelper.recordInteractWithMessage(message)
     }
 
-    private async processAcceptDiff(message: AcceptDiff) {
+    private async processViewDiff(message: ViewDiff) {
         const context = this.triggerEventsStorage.getTriggerEvent((message.data as any)?.triggerID) || ''
-        void this.editorContentController.acceptDiff({ ...message, ...context })
+        void this.editorContentController.viewDiff({ ...message, ...context })
         this.telemetryHelper.recordInteractWithMessage(message)
     }
 

packages/core/src/codewhispererChat/controllers/chat/model.ts

@@ -59,7 +59,7 @@ export interface CopyCodeToClipboard {
     totalCodeBlocks: number
 }
 
-export interface AcceptDiff {
+export interface ViewDiff {
     command: string | undefined
     tabID: string // rename tabId
     messageId: string

packages/core/src/codewhispererChat/controllers/chat/telemetryHelper.ts

@@ -15,7 +15,7 @@ import {
 } from '../../../shared/telemetry/telemetry'
 import { ChatSessionStorage } from '../../storages/chatSession'
 import {
-    AcceptDiff,
+    ViewDiff,
     ChatItemFeedbackMessage,
     ChatItemVotedMessage,
     CopyCodeToClipboard,
@@ -148,7 +148,7 @@ export class CWCTelemetryHelper {
             | SourceLinkClickMessage
             | ResponseBodyLinkClickMessage
             | FooterInfoLinkClick
-            | AcceptDiff
+            | ViewDiff
     ) {
         const conversationId = this.getConversationId(message.tabID)
         let event: AmazonqInteractWithMessage | undefined
@@ -186,13 +186,13 @@ export class CWCTelemetryHelper {
                     cwsprChatHasProjectContext: this.responseWithProjectContext.get(message.messageId),
                 }
                 break
-            case 'accept_diff':
-                message = message as AcceptDiff
+            case 'view_diff':
+                message = message as ViewDiff
                 event = {
                     result: 'Succeeded',
                     cwsprChatConversationId: conversationId ?? '',
                     cwsprChatMessageId: message.messageId,
-                    cwsprChatInteractionType: 'acceptDiff',
+                    cwsprChatInteractionType: 'viewDiff',
                     credentialStartUrl: AuthUtil.instance.startUrl,
                     cwsprChatAcceptedCharactersLength: message.code.length,
                     cwsprChatHasReference:

packages/core/src/codewhispererChat/view/messages/messageListener.ts

@@ -63,8 +63,8 @@ export class UIMessageListener {
                     })
                 }
                 break
-            case 'accept_diff':
-                this.processAcceptDiff(msg)
+            case 'view_diff':
+                this.processViewDiff(msg)
                 break
             case 'code_was_copied_to_clipboard':
                 this.processCodeWasCopiedToClipboard(msg)
@@ -164,8 +164,8 @@ export class UIMessageListener {
         })
     }
 
-    private processAcceptDiff(msg: any) {
-        this.chatControllerMessagePublishers.processAcceptDiff.publish({
+    private processViewDiff(msg: any) {
+        this.chatControllerMessagePublishers.processViewDiff.publish({
             command: msg.command,
             tabID: msg.tabID || msg.tabId,
             ...msg,