Merge remote-tracking branch 'origin/manodnyb/setupChatComponentsWithFlare' into manodnyb/setupChatComponentsWithFlare

manodnyab · manodnyab · commit e25907153e43 · 2025-04-09T13:47:10.000-07:00
diff --git a/.changes/3.62.json b/.changes/3.62.json
@@ -0,0 +1,20 @@
+{
+  "date" : "2025-04-03",
+  "version" : "3.62",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "/review: automatically generate fix without clicking Generate Fix button"
+  }, {
+    "type" : "bugfix",
+    "description" : "/transform: prompt user to re-authenticate if credentials expire during transformation"
+  }, {
+    "type" : "bugfix",
+    "description" : "Gracefully handle additional fields in Amazon Q /dev code generation result without throwing errors"
+  }, {
+    "type" : "bugfix",
+    "description" : "/review: set programmingLanguage to Plaintext if language is unknown"
+  }, {
+    "type" : "bugfix",
+    "description" : "/review: Respect user option to allow code suggestions with references"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-19118cf8-9378-4bd6-bf5e-7e57520181d0.json b/.changes/next-release/bugfix-19118cf8-9378-4bd6-bf5e-7e57520181d0.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /doc: close diff tab and open README file in preview mode after user accept changes"
+}
diff --git a/.changes/next-release/bugfix-29d1b3f1-b7e6-489d-b614-49f7d908f221.json b/.changes/next-release/bugfix-29d1b3f1-b7e6-489d-b614-49f7d908f221.json
diff --git a/.changes/next-release/bugfix-7ebf9104-80a4-452e-a07a-0966078fe077.json b/.changes/next-release/bugfix-7ebf9104-80a4-452e-a07a-0966078fe077.json
diff --git a/.changes/next-release/bugfix-a9690f2d-611f-45f6-82d1-c3a9e17a6b6b.json b/.changes/next-release/bugfix-a9690f2d-611f-45f6-82d1-c3a9e17a6b6b.json
diff --git a/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json b/.changes/next-release/feature-21a9e26b-edbf-4ad3-a5f4-2662420d4f0d.json
diff --git a/.changes/next-release/feature-4e0e76eb-a634-47e2-9e73-4e7dfde76160.json b/.changes/next-release/feature-4e0e76eb-a634-47e2-9e73-4e7dfde76160.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# _3.62_ (2025-04-03)
+- **(Feature)** /review: automatically generate fix without clicking Generate Fix button
+- **(Bug Fix)** /transform: prompt user to re-authenticate if credentials expire during transformation
+- **(Bug Fix)** Gracefully handle additional fields in Amazon Q /dev code generation result without throwing errors
+- **(Bug Fix)** /review: set programmingLanguage to Plaintext if language is unknown
+- **(Bug Fix)** /review: Respect user option to allow code suggestions with references
+
 # _3.61_ (2025-03-27)
 - **(Feature)** Amazon Q: Moved "Include suggestions with code references" setting to General
 - **(Feature)** Add support for 2025.1
diff --git a/buildspec/windowsTestsForToolkit.yml b/buildspec/windowsTestsForToolkit.yml
@@ -36,7 +36,7 @@ phases:
         }
 
          # Rider is very expensive (spikes our CI jobs to 50% CPU, so let it do the prep work in parallel, but run tests later
-        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin --info --console plain --continue
+        ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin -x :plugin-toolkit:jetbrains-rider:check --info --console plain --continue
         if ($LastExitCode -ne 0) {
           Write-Host "Command failed with exit code $LastExitCode"
           exit -1
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.62-SNAPSHOT
+toolkitVersion=3.63-SNAPSHOT
 
 # Publish Settings
 publishToken=
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
@@ -13,6 +13,8 @@ import com.intellij.diff.util.DiffUserDataKeys
 import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.fileEditor.TextEditorWithPreview
+import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.openapi.vfs.VfsUtil
 import com.intellij.openapi.wm.ToolWindowManager
 import com.intellij.testFramework.LightVirtualFile
@@ -298,8 +300,11 @@ class DocController(
         messenger.sendChatInputEnabledMessage(message.tabId, false)
     }
 
+    private val diffVirtualFiles = mutableMapOf<String, ChainDiffVirtualFile>()
+
     private suspend fun acceptChanges(message: IncomingDocMessage.FollowupClicked) {
         insertCode(message.tabId)
+        previewReadmeFile(message.tabId)
     }
 
     private suspend fun promptForDocTarget(tabId: String) {
@@ -420,6 +425,8 @@ class DocController(
                 request.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true)
 
                 val newDiff = ChainDiffVirtualFile(SimpleDiffRequestChain(request), message.filePath)
+
+                diffVirtualFiles[message.filePath] = newDiff
                 DiffEditorTabFilesManager.getInstance(context.project).showDiffFile(newDiff, true)
             }
         }
@@ -1047,6 +1054,34 @@ class DocController(
         session.sendDocTelemetryEvent(null, docAcceptanceEvent)
     }
 
+    private fun previewReadmeFile(tabId: String) {
+        val session = getSessionInfo(tabId)
+        var filePaths: List<NewFileZipInfo> = emptyList()
+
+        when (val state = session.sessionState) {
+            is PrepareDocGenerationState -> {
+                filePaths = state.filePaths
+            }
+        }
+
+        if (filePaths.isNotEmpty()) {
+            val filePath = filePaths[0].zipFilePath
+            val existingDiff = diffVirtualFiles[filePath]
+
+            val newFilePath = session.context.addressableRoot.toNioPath().resolve(filePath)
+            val readmeVirtualFile = LocalFileSystem.getInstance().refreshAndFindFileByPath(newFilePath.toString())
+
+            runInEdt {
+                if (existingDiff != null) {
+                    FileEditorManager.getInstance(getProject()).closeFile(existingDiff)
+                }
+                if (readmeVirtualFile != null) {
+                    TextEditorWithPreview.openPreviewForFile(getProject(), readmeVirtualFile)
+                }
+            }
+        }
+    }
+
     fun getProject() = context.project
 
     private fun getSessionInfo(tabId: String) = chatSessionStorage.getSession(tabId, context.project)
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/settings/CodeWhispererConfigurable.kt
@@ -151,7 +151,7 @@ class CodeWhispererConfigurable(private val project: Project) :
                     enabled(invoke)
                     bindSelected(codeWhispererSettings::isWorkspaceContextEnabled, codeWhispererSettings::toggleWorkspaceContextEnabled)
                 }.comment(message("aws.settings.codewhisperer.workspace_context.tooltip"))
-            }
+            }.visible(false)
             row {
                 checkBox(message("aws.settings.codewhisperer.project_context")).apply {
                     connect.subscribe(
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandler.kt
@@ -68,6 +68,8 @@ class TextDocumentServiceHandler(
                         textDocument = TextDocumentItem().apply {
                             this.uri = uri
                             text = file.inputStream.readAllBytes().decodeToString()
+                            languageId = file.fileType.name.lowercase()
+                            version = file.modificationStamp.toInt()
                         }
                     }
                 )
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandler.kt
@@ -156,6 +156,8 @@ class WorkspaceServiceHandler(
                                     textDocument = TextDocumentItem().apply {
                                         this.uri = uri
                                         text = renamedFile.inputStream.readAllBytes().decodeToString()
+                                        languageId = renamedFile.fileType.name.lowercase()
+                                        version = renamedFile.modificationStamp.toInt()
                                     }
                                 }
                             )
diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/textdocument/TextDocumentServiceHandlerTest.kt
@@ -10,6 +10,7 @@ import com.intellij.openapi.components.serviceIfCreated
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.fileEditor.FileDocumentManager
 import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.newvfs.events.VFileContentChangeEvent
@@ -149,27 +150,27 @@ class TextDocumentServiceHandlerTest {
         with(paramsSlot.captured.textDocument) {
             assertThat(this.uri).isEqualTo(normalizeFileUri(uri.toString()))
             assertThat(text).isEqualTo(content)
+            assertThat(languageId).isEqualTo("java")
+            assertThat(version).isEqualTo(1)
         }
     }
 
     @Test
     fun `didOpen runs on fileOpened`() = runTest {
-        // Create test file
         val uri = URI.create("file:///test/path/file.txt")
         val content = "test content"
-
         val file = createMockVirtualFile(uri, content)
 
-        // Call the handler method
         sut.fileOpened(mockk(), file)
 
-        // Verify the correct LSP method was called with matching parameters
         val paramsSlot = slot<DidOpenTextDocumentParams>()
         verify { mockTextDocumentService.didOpen(capture(paramsSlot)) }
 
         with(paramsSlot.captured.textDocument) {
             assertThat(this.uri).isEqualTo(normalizeFileUri(uri.toString()))
             assertThat(text).isEqualTo(content)
+            assertThat(languageId).isEqualTo("java")
+            assertThat(version).isEqualTo(1)
         }
     }
 
@@ -297,11 +298,21 @@ class TextDocumentServiceHandlerTest {
         }
     }
 
-    private fun createMockVirtualFile(uri: URI, content: String = ""): VirtualFile {
+    private fun createMockVirtualFile(
+        uri: URI,
+        content: String = "",
+        fileTypeName: String = "JAVA",
+        modificationStamp: Long = 1L,
+    ): VirtualFile {
         val path = mockk<Path> {
             every { toUri() } returns uri
         }
         val inputStream = content.byteInputStream()
+
+        val mockFileType = mockk<FileType> {
+            every { name } returns fileTypeName
+        }
+
         return mockk<VirtualFile> {
             every { url } returns uri.path
             every { toNioPath() } returns path
@@ -310,6 +321,8 @@ class TextDocumentServiceHandlerTest {
                 every { protocol } returns "file"
             }
             every { this@mockk.inputStream } returns inputStream
+            every { fileType } returns mockFileType
+            every { this@mockk.modificationStamp } returns modificationStamp
         }
     }
 
diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/workspace/WorkspaceServiceHandlerTest.kt
@@ -7,6 +7,7 @@ import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.Application
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.components.serviceIfCreated
+import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.newvfs.events.VFileCopyEvent
@@ -394,6 +395,8 @@ class WorkspaceServiceHandlerTest {
             oldName = oldName,
             newName = newName,
             isDirectory = false,
+            fileTypeName = "JAVA",
+            modificationStamp = 123L
         )
 
         // Act
@@ -405,8 +408,12 @@ class WorkspaceServiceHandlerTest {
 
         val openParams = slot<DidOpenTextDocumentParams>()
         verify { mockTextDocumentService.didOpen(capture(openParams)) }
-        assertThat(openParams.captured.textDocument.uri).isEqualTo(normalizeFileUri("file:///testDir/$newName"))
-        assertThat(openParams.captured.textDocument.text).isEqualTo(normalizeFileUri("content"))
+        with(openParams.captured.textDocument) {
+            assertThat(uri).isEqualTo(normalizeFileUri("file:///testDir/$newName"))
+            assertThat(text).isEqualTo("content")
+            assertThat(languageId).isEqualTo("java")
+            assertThat(version).isEqualTo(123)
+        }
 
         // Assert
         val paramsSlot = slot<RenameFilesParams>()
@@ -464,10 +471,14 @@ class WorkspaceServiceHandlerTest {
         val event1 = createMockPropertyChangeEvent(
             oldName = "old1.java",
             newName = "new1.java",
+            fileTypeName = "JAVA",
+            modificationStamp = 123L
         )
         val event2 = createMockPropertyChangeEvent(
             oldName = "old2.py",
             newName = "new2.py",
+            fileTypeName = "Python",
+            modificationStamp = 456L
         )
 
         // Act
@@ -477,6 +488,17 @@ class WorkspaceServiceHandlerTest {
         val paramsSlot = slot<RenameFilesParams>()
         verify { mockWorkspaceService.didRenameFiles(capture(paramsSlot)) }
         assertThat(paramsSlot.captured.files).hasSize(2)
+
+        // Verify didClose and didOpen for both files
+        verify(exactly = 2) { mockTextDocumentService.didClose(any()) }
+
+        val openParamsSlot = mutableListOf<DidOpenTextDocumentParams>()
+        verify(exactly = 2) { mockTextDocumentService.didOpen(capture(openParamsSlot)) }
+
+        assertThat(openParamsSlot[0].textDocument.languageId).isEqualTo("java")
+        assertThat(openParamsSlot[0].textDocument.version).isEqualTo(123)
+        assertThat(openParamsSlot[1].textDocument.languageId).isEqualTo("python")
+        assertThat(openParamsSlot[1].textDocument.version).isEqualTo(456)
     }
 
     @Test
@@ -635,10 +657,19 @@ class WorkspaceServiceHandlerTest {
         assertThat(paramsSlot.captured.event.removed[0].name).isEqualTo("folder2")
     }
 
-    private fun createMockVirtualFile(uri: URI, fileName: String, isDirectory: Boolean = false): VirtualFile {
+    private fun createMockVirtualFile(
+        uri: URI,
+        fileName: String,
+        isDirectory: Boolean = false,
+        fileTypeName: String = "PLAIN_TEXT",
+        modificationStamp: Long = 1L,
+    ): VirtualFile {
         val nioPath = mockk<Path> {
             every { toUri() } returns uri
         }
+        val mockFileType = mockk<FileType> {
+            every { name } returns fileTypeName
+        }
         return mockk<VirtualFile> {
             every { this@mockk.isDirectory } returns isDirectory
             every { toNioPath() } returns nioPath
@@ -648,6 +679,8 @@ class WorkspaceServiceHandlerTest {
                 every { protocol } returns "file"
             }
             every { this@mockk.inputStream } returns "content".byteInputStream()
+            every { fileType } returns mockFileType
+            every { this@mockk.modificationStamp } returns modificationStamp
         }
     }
 
@@ -671,10 +704,12 @@ class WorkspaceServiceHandlerTest {
         oldName: String,
         newName: String,
         isDirectory: Boolean = false,
+        fileTypeName: String = "PLAIN_TEXT",
+        modificationStamp: Long = 1L,
     ): VFilePropertyChangeEvent {
         val parent = createMockVirtualFile(URI("file:///testDir/"), "testDir", true)
         val newUri = URI("file:///testDir/$newName")
-        val file = createMockVirtualFile(newUri, newName, isDirectory)
+        val file = createMockVirtualFile(newUri, newName, isDirectory, fileTypeName, modificationStamp)
         every { file.parent } returns parent
 
         return mockk<VFilePropertyChangeEvent>().apply {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "type" : "bugfix",
 +  "description" : "Amazon Q /doc: close diff tab and open README file in preview mode after user accept changes"
 +}
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ phases:`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`# Rider is very expensive (spikes our CI jobs to 50% CPU, so let it do the prep work in parallel, but run tests later`
`39`		`- ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin --info --console plain --continue`
	`39`	`+ ./gradlew -PideProfileName="$Env:ALTERNATIVE_IDE_PROFILE_NAME" :plugin-toolkit:intellij-standalone:check :plugin-toolkit:jetbrains-rider:compileTestKotlin -x :plugin-toolkit:jetbrains-rider:check --info --console plain --continue`
`40`	`40`	`if ($LastExitCode -ne 0) {`
`41`	`41`	`Write-Host "Command failed with exit code $LastExitCode"`
`42`	`42`	`exit -1`