Skip to content

feat(amazonq): show code diff instead of only code fix for fix preview #6742

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 3 commits into from
Mar 11, 2025
Merged

feat(amazonq): show code diff instead of only code fix for fix preview #6742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc4d758
/review: show diff for fix preview
atonaamz Mar 6, 2025
c08f762
remove unused lines
atonaamz Mar 7, 2025
7f90db4
remove unnecessary lines for hover component
atonaamz Mar 7, 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
4 changes: 4 additions & 0 deletions packages/amazonq/.changes/next-release/Feature-6192cfc5-c6cb-4302-bfcf-ec90cac95b72.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Feature",
"description": "/review: show code diff for fix preview"
}
6 changes: 5 additions & 1 deletion packages/core/src/codewhisperer/service/securityIssueHoverProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))

Expand Down
24 changes: 3 additions & 21 deletions packages/core/src/codewhisperer/views/securityIssue/vue/root.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>()
Expand Down Expand Up @@ -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')
Copy link
Contributor

@ctlai95 ctlai95 Mar 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we will need this soon, but it probably won't work with the diff view.

Copy link
Contributor Author

@atonaamz atonaamz Mar 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we can add it back once it is needed.

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' }))
Expand Down
Loading