Merge master into feature/emr

Author: aws-toolkit-automation

package-lock.json

@@ -41,7 +41,7 @@
         "skippedTestReport": "ts-node ./scripts/skippedTestReport.ts ./packages/amazonq/test/e2e/"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.307",
+        "@aws-toolkits/telemetry": "^1.0.308",
         "@playwright/browser-chromium": "^1.43.1",
         "@stylistic/eslint-plugin": "^2.11.0",
         "@types/he": "^1.2.3",

package.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "/review: show code diff for fix preview"
+}

packages/amazonq/.changes/next-release/Feature-6192cfc5-c6cb-4302-bfcf-ec90cac95b72.json

@@ -157,7 +157,11 @@ export class SecurityIssueHoverProvider implements vscode.HoverProvider {
      * @returns The markdown string
      */
     private _makeCodeBlock(code: string, language?: string) {
-        const lines = code.replaceAll('\n\\ No newline at end of file', '').split('\n')
+        const lines = code
+            .replaceAll('\n\\ No newline at end of file', '')
+            .replaceAll('--- buggyCode\n', '')
+            .replaceAll('+++ fixCode\n', '')
+            .split('\n')
         const maxLineChars = lines.reduce((acc, curr) => Math.max(acc, curr.length), 0)
         const paddedLines = lines.map((line) => line.padEnd(maxLineChars + 2))
 

packages/core/src/codewhisperer/service/securityIssueHoverProvider.ts

@@ -103,7 +103,6 @@ import highSeverity from '../../../../../resources/images/severity-high.svg'
 import criticalSeverity from '../../../../../resources/images/severity-critical.svg'
 import markdownIt from 'markdown-it'
 import hljs from 'highlight.js'
-import { parsePatch } from 'diff'
 import { CodeScanIssue } from '../../../models/model'
 
 const client = WebviewClientFactory.create<SecurityIssueWebview>()
@@ -344,28 +343,11 @@ export default defineComponent({
             if (!this.isFixAvailable) {
                 return
             }
-            const [parsedDiff] = parsePatch(this.suggestedFix)
-            const { oldStart } = parsedDiff.hunks[0]
-            const [referenceStart, referenceEnd] = this.referenceSpan
-            const htmlString = md.render(`
-\`\`\`${this.languageId} showLineNumbers startFrom=${oldStart} ${
-                referenceStart && referenceEnd
-                    ? `highlightStart=${referenceStart + 1} highlightEnd=${referenceEnd + 1}`
-                    : ''
-            }
-${this.fixedCode}
+            return md.render(`
+\`\`\`${this.languageId} 
+${this.suggestedFix.replaceAll('--- buggyCode\n', '').replaceAll('+++ fixCode\n', '')}
 \`\`\`
       `)
-            const parser = new DOMParser()
-            const doc = parser.parseFromString(htmlString, 'text/html')
-            const referenceTracker = doc.querySelector('.reference-tracker')
-            if (referenceTracker) {
-                const tooltip = doc.createElement('div')
-                tooltip.classList.add('tooltip')
-                tooltip.innerHTML = this.referenceText
-                referenceTracker.appendChild(tooltip)
-            }
-            return doc.body.innerHTML
         },
         scrollTo(refName: string) {
             this.$nextTick(() => this.$refs?.[refName]?.scrollIntoView({ behavior: 'smooth' }))