Merge branch 'feature/q-lsp-chat' into actionCmds

leigaol · web-flow · commit 989a939a368a · 2025-05-08T17:09:20.000-07:00
diff --git a/.changes/3.70.json b/.changes/3.70.json
@@ -0,0 +1,20 @@
+{
+  "date" : "2025-05-08",
+  "version" : "3.70",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users"
+  }, {
+    "type" : "bugfix",
+    "description" : "Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window"
+  }, {
+    "type" : "bugfix",
+    "description" : "/dev: Fix missing Amazon Q feature dev auto build setting."
+  }, {
+    "type" : "bugfix",
+    "description" : "increase /review timeout"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix JavascriptLanguage not found on 2025.1+"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-54c0cf8a-9df5-4673-bf16-61a650434abc.json b/.changes/next-release/bugfix-54c0cf8a-9df5-4673-bf16-61a650434abc.json
diff --git a/.changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json b/.changes/next-release/bugfix-7920ece4-99d6-4828-931e-29b66994dc10.json
diff --git a/.changes/next-release/bugfix-7e09465d-6cb8-4180-9131-7ec6543db20c.json b/.changes/next-release/bugfix-7e09465d-6cb8-4180-9131-7ec6543db20c.json
diff --git a/.changes/next-release/bugfix-814bffb3-03aa-44ad-b639-008cf2929063.json b/.changes/next-release/bugfix-814bffb3-03aa-44ad-b639-008cf2929063.json
diff --git a/.changes/next-release/feature-ae7d15f4-ae07-4faf-963a-6d83a85852e4.json b/.changes/next-release/feature-ae7d15f4-ae07-4faf-963a-6d83a85852e4.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# _3.70_ (2025-05-08)
+- **(Feature)** Amazon Q: Support selecting customizations across all Q profiles with automatic profile switching for enterprise users
+- **(Bug Fix)** Do not always show 'Amazon Q Code Issues' tab when switching to the 'Problems' tool window
+- **(Bug Fix)** /dev: Fix missing Amazon Q feature dev auto build setting.
+- **(Bug Fix)** increase /review timeout
+- **(Bug Fix)** Fix JavascriptLanguage not found on 2025.1+
+
 # _3.69_ (2025-04-28)
 - **(Bug Fix)** Amazon Q: Fix issue where context menu items are not available after re-opening projects or restarting the IDE
 - **(Bug Fix)** Fix LinkageError while attempting to do Amazon Q inline suggestions in certain environments
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.70-SNAPSHOT
+toolkitVersion=3.71-SNAPSHOT
 
 # Publish Settings
 publishToken=
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/toolwindow/AmazonQPanel.kt
@@ -56,9 +56,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di
             AsyncChatUiListener.TOPIC,
             object : AsyncChatUiListener {
                 override fun onChange(message: String) {
-                    runInEdt {
-                        browser.get()?.postChat(message)
-                    }
+                    browser.get()?.postChat(message)
                 }
             }
         )
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
@@ -8,6 +8,7 @@ import com.google.gson.Gson
 import com.intellij.ide.BrowserUtil
 import com.intellij.ide.util.RunOnceUtil
 import com.intellij.openapi.application.runInEdt
+import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.project.Project
 import com.intellij.ui.jcef.JBCefJSQuery.Response
@@ -22,8 +23,7 @@ import kotlinx.coroutines.flow.merge
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.cef.browser.CefBrowser
-import org.eclipse.lsp4j.Position
-import org.eclipse.lsp4j.Range
+import org.eclipse.lsp4j.TextDocumentIdentifier
 import software.aws.toolkits.core.utils.error
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
@@ -34,7 +34,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.encryption.JwtEncryptionManager
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.AwsServerCapabilitiesProvider
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ChatCommunicationManager
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.getTextDocumentIdentifier
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.AUTH_FOLLOW_UP_CLICKED
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.AuthFollowUpClickNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickNotification
@@ -71,7 +70,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyC
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptNotification
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackNotification
@@ -107,6 +105,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TabBa
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TabBarActionRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TabEventParams
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TabEventRequest
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.amazonq.util.command
 import software.aws.toolkits.jetbrains.services.amazonq.util.tabType
 import software.aws.toolkits.jetbrains.services.amazonq.webview.theme.AmazonQTheme
@@ -236,19 +236,9 @@ class BrowserConnector(
                     requestFromUi.params.prompt.escapedPrompt,
                     node.command
                 )
-                val textDocumentIdentifier = getTextDocumentIdentifier(project)
-                val cursorState = CursorState(
-                    Range(
-                        Position(
-                            0,
-                            0
-                        ),
-                        Position(
-                            1,
-                            1
-                        )
-                    )
-                )
+                val editor = FileEditorManager.getInstance(project).selectedTextEditor
+                val textDocumentIdentifier = editor?.let { TextDocumentIdentifier(toUriString(it.virtualFile)) }
+                val cursorState = editor?.let { LspEditorUtil.getCursorState(it) }
 
                 val chatParams = ChatParams(
                     requestFromUi.params.tabId,
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt
@@ -48,7 +48,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocume
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionListWithReferences
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionTriggerKind
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionWithReferencesParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.getCaretPosition
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererServiceNew.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererServiceNew.kt
@@ -46,7 +46,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocume
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionListWithReferences
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionTriggerKind
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionWithReferencesParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorManagerNew
 import software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorUtil.getCaretPosition
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererServiceTest.kt b/plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererServiceTest.kt
@@ -19,7 +19,7 @@ import org.mockito.kotlin.spy
 import org.mockito.kotlin.stub
 import org.mockito.kotlin.whenever
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionTriggerKind
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererJava
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/ModuleDependencyProvider.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/dependencies/ModuleDependencyProvider.kt
@@ -8,7 +8,7 @@ import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.vfs.VirtualFile
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.dependencies.DidChangeDependencyPathsParams
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 
 interface ModuleDependencyProvider {
     companion object {
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatEditorUtils.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/ChatEditorUtils.kt
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/CursorState.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/CursorState.kt
@@ -3,8 +3,15 @@
 
 package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
 
+import org.eclipse.lsp4j.Position
 import org.eclipse.lsp4j.Range
 
-data class CursorState(
+sealed interface CursorState
+
+data class CursorPosition(
+    val position: Position,
+) : CursorState
+
+data class CursorRange(
     val range: Range,
-)
+) : CursorState
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/SendChatPrompt.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/SendChatPrompt.kt
@@ -9,8 +9,8 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ContextCom
 data class ChatParams(
     val tabId: String,
     val prompt: ChatPrompt,
-    val textDocument: TextDocumentIdentifier,
-    val cursorState: CursorState,
+    val textDocument: TextDocumentIdentifier?,
+    val cursorState: CursorState?,
     val context: List<ContextCommand>?,
 )
 
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
@@ -27,7 +27,7 @@ import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.TextDocumentItem
 import org.eclipse.lsp4j.VersionedTextDocumentIdentifier
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 
 class TextDocumentServiceHandler(
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtil.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtil.kt
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/LspEditorUtil.kt
@@ -0,0 +1,75 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.amazonq.lsp.util
+
+import com.intellij.openapi.application.runReadAction
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.vfs.VfsUtilCore
+import com.intellij.openapi.vfs.VirtualFile
+import org.eclipse.lsp4j.Position
+import org.eclipse.lsp4j.Range
+import software.aws.toolkits.core.utils.getLogger
+import software.aws.toolkits.core.utils.warn
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorPosition
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorRange
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState
+import java.io.File
+import java.net.URI
+import java.net.URISyntaxException
+
+object LspEditorUtil {
+
+    fun toUriString(virtualFile: VirtualFile): String? {
+        val protocol = virtualFile.fileSystem.protocol
+        val uri = when (protocol) {
+            "jar" -> VfsUtilCore.convertToURL(virtualFile.url)?.toExternalForm()
+            "jrt" -> virtualFile.url
+            else -> toUri(VfsUtilCore.virtualToIoFile(virtualFile)).toASCIIString()
+        } ?: return null
+
+        return if (virtualFile.isDirectory) {
+            uri.trimEnd('/', '\\')
+        } else {
+            uri
+        }
+    }
+
+    private fun toUri(file: File): URI {
+        try {
+            // URI scheme specified by language server protocol
+            return URI("file", "", file.absoluteFile.toURI().path, null)
+        } catch (e: URISyntaxException) {
+            LOG.warn { "${e.localizedMessage}: $e" }
+            return file.absoluteFile.toURI()
+        }
+    }
+
+    /**
+     * Works but is divergent from [FocusAreaContextExtrator]
+     */
+    fun getCursorState(editor: Editor): CursorState =
+        runReadAction {
+            val selectionModel = editor.selectionModel
+            if (selectionModel.hasSelection()) {
+                val selectedStartPos = editor.offsetToLogicalPosition(selectionModel.selectionStart)
+                val selectedEndPos = editor.offsetToLogicalPosition(selectionModel.selectionEnd)
+
+                return@runReadAction CursorRange(
+                    Range(
+                        Position(selectedStartPos.line, selectedStartPos.column),
+                        Position(selectedEndPos.line, selectedEndPos.column)
+                    )
+                )
+            } else {
+                return@runReadAction CursorPosition(
+                    Position(
+                        editor.caretModel.primaryCaret.logicalPosition.line,
+                        editor.caretModel.primaryCaret.logicalPosition.column
+                    )
+                )
+            }
+        }
+
+    private val LOG = getLogger<LspEditorUtil>()
+}
diff --git a/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/WorkspaceFolderUtil.kt b/plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/WorkspaceFolderUtil.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.module.ModuleManager
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ModuleRootManager
 import org.eclipse.lsp4j.WorkspaceFolder
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 
 object WorkspaceFolderUtil {
     fun createWorkspaceFolders(project: Project): List<WorkspaceFolder> =
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
@@ -35,7 +35,7 @@ import org.eclipse.lsp4j.TextDocumentItem
 import org.eclipse.lsp4j.WorkspaceFolder
 import org.eclipse.lsp4j.WorkspaceFoldersChangeEvent
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil.toUriString
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.WorkspaceFolderUtil.createWorkspaceFolders
 import software.aws.toolkits.jetbrains.utils.pluginAwareExecuteOnPooledThread
 import java.nio.file.FileSystems
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
@@ -40,7 +40,7 @@ import org.junit.Rule
 import org.junit.Test
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLanguageServer
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
-import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.FileUriUtil
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
 import java.net.URI
 import java.nio.file.Path
 import java.util.concurrent.CompletableFuture
@@ -230,8 +230,8 @@ class TextDocumentServiceHandlerTest {
         val document = mockk<Document>()
         val file = createMockVirtualFile(URI.create(""))
 
-        mockkObject(FileUriUtil) {
-            every { FileUriUtil.toUriString(file) } returns null
+        mockkObject(LspEditorUtil) {
+            every { LspEditorUtil.toUriString(file) } returns null
 
             val fileDocumentManager = mockk<FileDocumentManager> {
                 every { getFile(document) } returns file
diff --git a/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt b/plugins/amazonq/shared/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/lsp/util/FileUriUtilTest.kt

Original file line number	Diff line number	Diff line change
`@@ -56,9 +56,7 @@ class AmazonQPanel(val project: Project, private val scope: CoroutineScope) : Di`
`56`	`56`	`AsyncChatUiListener.TOPIC,`
`57`	`57`	`object : AsyncChatUiListener {`
`58`	`58`	`override fun onChange(message: String) {`
`59`		`- runInEdt {`
`60`		`- browser.get()?.postChat(message)`
`61`		`- }`
	`59`	`+ browser.get()?.postChat(message)`
`62`	`60`	`}`
`63`	`61`	`}`
`64`	`62`	`)`