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

Xiao Chen · Xiao Chen · commit 480bc6a6df51 · 2025-01-24T15:22:46.000-05:00
diff --git a/.changes/next-release/bugfix-1a28cd4b-54eb-46bb-b0c6-2f9abc8fa9e6.json b/.changes/next-release/bugfix-1a28cd4b-54eb-46bb-b0c6-2f9abc8fa9e6.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /doc: fix open diff in a tab when another modal is open"
+}
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt
@@ -342,6 +342,7 @@ class DocController(
     }
 
     override suspend fun processOpenDiff(message: IncomingDocMessage.OpenDiff) {
+        this.toolWindow?.activate(null)
         val session = getSessionInfo(message.tabId)
 
         val project = context.project
@@ -720,6 +721,7 @@ class DocController(
             }
 
             if (filePaths.isNotEmpty()) {
+                logger.error("xxxxxxxxxtesestestes")
                 processOpenDiff(
                     message = IncomingDocMessage.OpenDiff(tabId = tabId, filePath = filePaths[0].zipFilePath, deleted = false)
                 )
diff --git a/plugins/core/webview/package-lock.json b/plugins/core/webview/package-lock.json

-Original file 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"
 +}
Original file line number	Diff line number	Diff line change
`@@ -342,6 +342,7 @@ class DocController(`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`override suspend fun processOpenDiff(message: IncomingDocMessage.OpenDiff) {`
	`345`	`+ this.toolWindow?.activate(null)`
`345`	`346`	`val session = getSessionInfo(message.tabId)`
`346`	`347`
`347`	`348`	`val project = context.project`
`@@ -720,6 +721,7 @@ class DocController(`
`720`	`721`	`}`
`721`	`722`
`722`	`723`	`if (filePaths.isNotEmpty()) {`
	`724`	`+ logger.error("xxxxxxxxxtesestestes")`
`723`	`725`	`processOpenDiff(`
`724`	`726`	`message = IncomingDocMessage.OpenDiff(tabId = tabId, filePath = filePaths[0].zipFilePath, deleted = false)`
`725`	`727`	`)`