Skip to content

fix(amazonq): show diff.patch first, then parse it #8008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2025
Merged

fix(amazonq): show diff.patch first, then parse it #8008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ff9a0a
fix(amazonq): show diff.patch first, then parse it
Sep 9, 2025
f300c52
small log fix
Sep 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/core/src/codewhisperer/service/transformByQ/transformApiHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ export async function pollTransformationJob(jobId: string, validStates: string[]
}
await sleep(CodeWhispererConstants.transformationJobPollingIntervalSeconds * 1000)
} catch (e: any) {
getLogger().error(`CodeTransformation: GetTransformation error = %O`, e)
getLogger().error(`CodeTransformation: error = %O`, e)
throw e
}
}
Expand Down Expand Up @@ -827,11 +827,11 @@ async function processClientInstructions(jobId: string, clientInstructionsPath:
getLogger().info(`CodeTransformation: copied project to ${destinationPath}`)
const diffContents = await fs.readFileText(clientInstructionsPath)
if (diffContents.trim()) {
const diffModel = new DiffModel()
diffModel.parseDiff(clientInstructionsPath, path.join(destinationPath, 'sources'), true)
// show user the diff.patch
const doc = await vscode.workspace.openTextDocument(clientInstructionsPath)
await vscode.window.showTextDocument(doc, { viewColumn: vscode.ViewColumn.One })
const diffModel = new DiffModel()
diffModel.parseDiff(clientInstructionsPath, path.join(destinationPath, 'sources'), true)
} else {
// still need to set the project copy so that we can use it below
transformByQState.setProjectCopyFilePath(path.join(destinationPath, 'sources'))
Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/codewhisperer/service/transformByQ/transformationResultsViewProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ export class DiffModel {
throw new Error(CodeWhispererConstants.noChangesMadeMessage)
}

getLogger().info(`CodeTransformation: parsing patch file at ${pathToDiff}`)

let changedFiles = parsePatch(diffContents)
// exclude dependency_upgrade.yml from patch application
changedFiles = changedFiles.filter((file) => !file.oldFileName?.includes('dependency_upgrade'))
Expand Down
Loading