Skip to content

fix(amazonq): fix for path parsing for windows for editable diff view #8047

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
Sep 16, 2025
Merged

fix(amazonq): fix for path parsing for windows for editable diff view #8047

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9a9fd5
fix(amazonq): fix for path parsing for windows for editable diff view
ashishrp-aws Sep 15, 2025
491239b
fix: fix for windows
ashishrp-aws Sep 16, 2025
f89b968
Merge branch 'master' into fix/amazonq-windows-path-parsing
ashishrp-aws Sep 16, 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
11 changes: 10 additions & 1 deletion packages/amazonq/src/lsp/chat/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,16 @@ export function registerMessageListeners(
)

languageClient.onNotification(openFileDiffNotificationType.method, async (params: OpenFileDiffParams) => {
const currentFileUri = vscode.Uri.parse(params.originalFileUri)
// Handle both file:// URIs and raw file paths, ensuring proper Windows path handling
let currentFileUri: vscode.Uri
try {
// Try parsing as URI first
currentFileUri = vscode.Uri.parse(params.originalFileUri, true)
} catch {
// If parsing fails, treat as file path and create URI
currentFileUri = vscode.Uri.file(params.originalFileUri)
}

const originalContent = params.originalFileContent ?? ''
const fileName = path.basename(currentFileUri.fsPath)

Expand Down
Loading