Skip to content

fix(amazonq): open diff in a new tab when another modal is open #5289

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 2 commits into from
Jan 28, 2025
Merged

fix(amazonq): open diff in a new tab when another modal is open #5289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1632f
fix(amazonq): open diff in a new tab when another modal is open
Jan 22, 2025
88b133c
fix(amazonq): open diff in a new tab when another modal is open
Jan 22, 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 .changes/next-release/bugfix-1a28cd4b-54eb-46bb-b0c6-2f9abc8fa9e6.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Amazon Q /doc: fix open diff in a tab when another modal is open"
}
7 changes: 5 additions & 2 deletions ...unity/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
package software.aws.toolkits.jetbrains.services.amazonqDoc.controller

import com.intellij.diff.DiffContentFactory
import com.intellij.diff.DiffManager
import com.intellij.diff.chains.SimpleDiffRequestChain
import com.intellij.diff.contents.EmptyContent
import com.intellij.diff.editor.ChainDiffVirtualFile
import com.intellij.diff.editor.DiffEditorTabFilesManager
import com.intellij.diff.requests.SimpleDiffRequest
import com.intellij.diff.util.DiffUserDataKeys
import com.intellij.ide.BrowserUtil
Expand Down Expand Up @@ -398,7 +400,8 @@ class DocController(
val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null)
request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true)

DiffManager.getInstance().showDiff(project, request)
val newDiff = ChainDiffVirtualFile(SimpleDiffRequestChain(request), message.filePath)
DiffEditorTabFilesManager.getInstance(context.project).showDiffFile(newDiff, true)
}
}

Expand Down
Loading