Skip to content

fix(amazonq): make code fix's line number or file to be accurate #7023

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
Apr 11, 2025
Merged

fix(amazonq): make code fix's line number or file to be accurate #7023

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
010e665
fix(amazonq): make code fix's line number or file to be accurate
zuoyaofu Apr 11, 2025
a8b186f
Update securityIssueProvider.ts
zuoyaofu Apr 11, 2025
5929da6
change style and log
zuoyaofu Apr 11, 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/Bug Fix-42b2c2f0-e40e-4f97-842b-cb7ead1a010b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type": "Bug Fix",
"description": "fix bug where code fix line number or file was not accurate"
}
4 changes: 4 additions & 0 deletions packages/core/src/codewhisperer/commands/startCodeFixGeneration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { TelemetryHelper } from '../util/telemetryHelper'
import { tempDirPath } from '../../shared/filesystemUtilities'
import { CodeWhispererSettings } from '../util/codewhispererSettings'
import { AuthUtil } from '../util/authUtil'
import { saveDocumentIfDirty } from '../../shared/utilities/textDocumentUtilities'

export async function startCodeFixGeneration(
client: DefaultCodeWhispererClient,
Expand All @@ -44,6 +45,9 @@ export async function startCodeFixGeneration(
* Step 1: Generate zip
*/
throwIfCancelled()

// Save the file if it has unsaved changes to ensure the latest content is included in the zip
await saveDocumentIfDirty(filePath)
const admZip = new AdmZip()
admZip.addLocalFile(filePath)

Expand Down
13 changes: 7 additions & 6 deletions packages/core/src/codewhisperer/service/securityIssueProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,13 @@ export class SecurityIssueProvider {
...group,
issues: group.issues
.filter((issue) => {
const range = new vscode.Range(
issue.startLine,
event.document.lineAt(issue.startLine)?.range.start.character ?? 0,
issue.endLine,
event.document.lineAt(issue.endLine - 1)?.range.end.character ?? 0
)
let range
if (issue.startLine === issue.endLine) {
range = new vscode.Range(issue.startLine, 0, issue.endLine + 1, 0)
} else {
range = new vscode.Range(issue.startLine, 0, issue.endLine, 0)
}

const intersection = changedRange.intersection(range)
return !(intersection && (/\S/.test(changedText) || changedText === ''))
})
Expand Down
Loading