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 1 commit
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"
}
1 change: 1 addition & 0 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 @@ -371,6 +371,7 @@ class DocController(
}

override suspend fun processOpenDiff(message: IncomingDocMessage.OpenDiff) {
this.toolWindow?.activate(null)
Copy link
Contributor

@rli rli Jan 24, 2025

Choose a reason for hiding this comment

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

can you take a look at the /dev implementation of this?

aws-toolkit-jetbrains/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt

Lines 212 to 220 in 5ac379e

private fun putDiff(filePath: String, request: SimpleDiffRequest) {
// Close any existing diff and open a new diff, as the diff virtual file does not appear to allow replacing content directly:
val existingDiff = diffVirtualFiles[filePath]
if (existingDiff != null) {
FileEditorManager.getInstance(context.project).closeFile(existingDiff)
}
val newDiff = ChainDiffVirtualFile(SimpleDiffRequestChain(request), filePath)
DiffEditorTabFilesManager.getInstance(context.project).showDiffFile(newDiff, true)

Copy link
Contributor Author

@xiaox-chen xiaox-chen Jan 28, 2025

Choose a reason for hiding this comment

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

This works.
Thanks!!

val session = getSessionInfo(message.tabId)

val project = context.project
Expand Down
Loading