From 667ff8ede88edc6c1c7fd68607941429ba03afee Mon Sep 17 00:00:00 2001 From: Will Lo Date: Thu, 17 Jul 2025 10:07:56 -0700 Subject: [PATCH 1/2] fix(amazonq): skip edit suggestion if applyDiff fail --- .../amazonq/src/app/inline/EditRendering/imageRenderer.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts index 9af3878ef82..60376b6341e 100644 --- a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts +++ b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts @@ -29,6 +29,11 @@ export async function showEdits( const { svgImage, startLine, newCode, origionalCodeHighlightRange } = await svgGenerationService.generateDiffSvg(currentFile, item.insertText as string) + if (newCode.length === 0) { + getLogger('nextEditPrediction').warn('not able to apply provided edit suggestion, skip rendering') + return + } + if (svgImage) { // display the SVG image await displaySvgDecoration( From d1dcc86430ecf377ab2467bb675c4f95bb506e4d Mon Sep 17 00:00:00 2001 From: Will Lo Date: Thu, 17 Jul 2025 10:11:04 -0700 Subject: [PATCH 2/2] todo --- packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts index 60376b6341e..195879ff779 100644 --- a/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts +++ b/packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts @@ -29,6 +29,7 @@ export async function showEdits( const { svgImage, startLine, newCode, origionalCodeHighlightRange } = await svgGenerationService.generateDiffSvg(currentFile, item.insertText as string) + // TODO: To investigate why it fails and patch [generateDiffSvg] if (newCode.length === 0) { getLogger('nextEditPrediction').warn('not able to apply provided edit suggestion, skip rendering') return