fix diff.patch issue

Author: David Hasani

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -224,7 +224,7 @@ export class GumbyController {
         this.sessionStorage.getSession().conversationState = ConversationState.WAITING_FOR_TRANSFORMATION_OBJECTIVE
         this.messenger.sendStaticTextResponse('choose-transformation-objective', message.tabID)
         this.messenger.sendChatInputEnabled(message.tabID, true)
-        this.messenger.sendUpdatePlaceholder(message.tabID, "Enter 'language upgrade' or 'SQL conversion'")
+        this.messenger.sendUpdatePlaceholder(message.tabID, CodeWhispererConstants.chooseTransformationObjective)
     }
 
     private async beginTransformation(message: any) {

packages/core/src/amazonqGumby/chat/controller/messenger/messenger.ts

@@ -394,7 +394,7 @@ export class Messenger {
                 message = 'I will continue transforming your code without upgrading this dependency.'
                 break
             case 'choose-transformation-objective':
-                message = 'Choose your transformation objective.'
+                message = CodeWhispererConstants.chooseTransformationObjective
                 break
         }
 

packages/core/src/amazonqGumby/models/constants.ts

@@ -3,10 +3,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { TransformationType, transformByQState } from '../../codewhisperer/models/model'
+
 // For uniquely identifiying which chat messages should be routed to Gumby
 export const gumbyChat = 'gumbyChat'
 
 // This sets the tab name
 export const featureName = 'Q - Code Transform'
 
 export const dependencyNoAvailableVersions = 'no available versions'
+
+export function getTransformationActionString() {
+    return transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE ? 'upgraded' : 'converted'
+}

packages/core/src/codewhisperer/models/constants.ts

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+import { getTransformationActionString } from '../../amazonqGumby/models/constants'
+
 /**
  * Automated and manual trigger
  */
@@ -450,6 +452,8 @@ export const codeTransformLocThreshold = 100000
 export const jobStartedChatMessage =
     'I am starting to transform your code. It can take 10 to 30 minutes to upgrade your code, depending on the size of your project. To monitor progress, go to the Transformation Hub. If I run into any issues, I might pause the transformation to get input from you on how to proceed.'
 
+export const chooseTransformationObjective = 'Enter "language upgrade" or "sql conversion"'
+
 export const uploadingCodeStepMessage = 'Upload your code'
 
 export const buildCodeStepMessage = 'Build uploaded code in secure build environment'
@@ -490,8 +494,7 @@ export const startTransformationButtonText = 'Start a new transformation'
 
 export const stopTransformationButtonText = 'Stop transformation'
 
-export const checkingForProjectsChatMessage =
-    'I am checking for open projects that are eligible for Code Transformation.'
+export const checkingForProjectsChatMessage = 'Checking for eligible projects...'
 
 export const buildStartedChatMessage =
     'I am building your project. This can take up to 10 minutes, depending on the size of your project.'
@@ -578,17 +581,13 @@ export const jobCancelledChatMessage =
 
 export const jobCancelledNotification = 'You cancelled the transformation.'
 
-export const jobCompletedChatMessage =
-    'I upgraded your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated.'
+export const jobCompletedChatMessage = `I ${getTransformationActionString()} your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated.`
 
-export const jobCompletedNotification =
-    'Amazon Q upgraded your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated.'
+export const jobCompletedNotification = `Amazon Q ${getTransformationActionString()} your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated.`
 
-export const jobPartiallyCompletedChatMessage =
-    'I upgraded part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.'
+export const jobPartiallyCompletedChatMessage = `I ${getTransformationActionString()} part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.`
 
-export const jobPartiallyCompletedNotification =
-    'Amazon Q upgraded part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.'
+export const jobPartiallyCompletedNotification = `Amazon Q ${getTransformationActionString()} part of your code. You can review the diff to see my proposed changes and accept or reject them. The transformation summary has details about the files I updated and the errors that prevented a complete transformation.`
 
 export const noPomXmlFoundChatMessage = `I couldn\'t find a project that I can upgrade. Your Java project must be built on Maven and contain a pom.xml file. For more information, see the [Amazon Q documentation](${codeTransformPrereqDoc}).`
 

packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts

@@ -373,6 +373,25 @@ export class ProposedTransformationExplorer {
                 pathContainingArchive = path.dirname(pathToArchive)
                 const zip = new AdmZip(pathToArchive)
                 zip.extractAllTo(pathContainingArchive)
+                // TODO: below only needed if the backend cannot fix the "b/" diff.patch issue
+                // read in the diff.patch
+                const diffPatch = fs.readFileSync(
+                    path.join(pathContainingArchive, ExportResultArchiveStructure.PathToDiffPatch),
+                    'utf-8'
+                )
+                // go through each line, and replace "b" with "b/" on lines that start with "diff"
+                const lines = diffPatch.split('\n')
+                const newLines = lines.map((line) => {
+                    if (line.trim().startsWith('diff') || line.trim().startsWith('+++')) {
+                        return line.replace('b', 'b/')
+                    }
+                    return line
+                })
+                const newDiffPatch = newLines.join('\n')
+                fs.writeFileSync(
+                    path.join(pathContainingArchive, ExportResultArchiveStructure.PathToDiffPatch),
+                    newDiffPatch
+                )
                 diffModel.parseDiff(
                     path.join(pathContainingArchive, ExportResultArchiveStructure.PathToDiffPatch),
                     transformByQState.getProjectPath()