Skip to content

Commit 7363959

Browse files
authored
fix(amazonq): open diff in a new tab when another modal is open (#5289)
1 parent f9547e8 commit 7363959

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Amazon Q /doc: fix open diff in a tab when another modal is open"
4+
}

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
package software.aws.toolkits.jetbrains.services.amazonqDoc.controller
55

66
import com.intellij.diff.DiffContentFactory
7-
import com.intellij.diff.DiffManager
7+
import com.intellij.diff.chains.SimpleDiffRequestChain
88
import com.intellij.diff.contents.EmptyContent
9+
import com.intellij.diff.editor.ChainDiffVirtualFile
10+
import com.intellij.diff.editor.DiffEditorTabFilesManager
911
import com.intellij.diff.requests.SimpleDiffRequest
1012
import com.intellij.diff.util.DiffUserDataKeys
1113
import com.intellij.ide.BrowserUtil
@@ -398,7 +400,8 @@ class DocController(
398400
val request = SimpleDiffRequest(message.filePath, leftDiffContent, rightDiffContent, null, null)
399401
request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true)
400402

401-
DiffManager.getInstance().showDiff(project, request)
403+
val newDiff = ChainDiffVirtualFile(SimpleDiffRequestChain(request), message.filePath)
404+
DiffEditorTabFilesManager.getInstance(context.project).showDiffFile(newDiff, true)
402405
}
403406
}
404407

0 commit comments

Comments
 (0)