Skip to content

fix(amazonq): Fix Generate unit tests from right click context menu #5705

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
Parent: feat(amazonq): Agentic coding experience
merged 5 commits into from
May 12, 2025
Merged

fix(amazonq): Fix Generate unit tests from right click context menu #5705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e94681a
initial changes
manodnyab May 9, 2025
0c844c1
merge conflicts resolved
manodnyab May 9, 2025
47bcef1
fix gen unit tests
manodnyab May 11, 2025
9498142
Merge branch 'feature/q-lsp-chat' into manodnyb/fixGenerateUnitTests
manodnyab May 11, 2025
d12ed3f
Merge branch 'feature/q-lsp-chat' into manodnyb/fixGenerateUnitTests
manodnyab May 12, 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
7 changes: 7 additions & 0 deletions ...ware/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReference
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionReferencePosition
import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileManager
import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
import software.aws.toolkits.jetbrains.services.amazonqCodeTest.CodeWhispererUTGChatManager
Expand Down Expand Up @@ -110,6 +111,12 @@
import software.amazon.awssdk.services.codewhispererstreaming.model.Position as StreamingPosition
import software.amazon.awssdk.services.codewhispererstreaming.model.Range as StreamingRange

data class TestCommandMessage(
val sender: String = "codetest",
val command: String = "test",
val type: String = "addAnswer",
) : AmazonQMessage

Check warning on line 118 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt#L114-L118 

Added lines #L114 - L118 were not covered by tests

class CodeTestChatController(
private val context: AmazonQAppInitContext,
private val chatSessionStorage: ChatSessionStorage,
Expand Down
7 changes: 4 additions & 3 deletions ...ns-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ActionRegistrar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
// Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

@file:Suppress("BannedImports")
package software.aws.toolkits.jetbrains.services.cwc.commands

import com.google.gson.Gson
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.project.Project
import kotlinx.coroutines.flow.MutableSharedFlow
Expand All @@ -14,6 +15,7 @@
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendToPromptParams
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TriggerType
import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
import software.aws.toolkits.jetbrains.services.amazonqCodeTest.controller.TestCommandMessage
import software.aws.toolkits.jetbrains.services.cwc.editor.context.ActiveFileContextExtractor
import software.aws.toolkits.jetbrains.services.cwc.editor.context.ExtractionTriggerType

Expand All @@ -25,8 +27,7 @@

fun reportMessageClick(command: EditorContextCommand, project: Project) {
if (command == EditorContextCommand.GenerateUnitTests) {
// pre-existing old chat code path
_messages.tryEmit(ContextMenuActionMessage(command, project))
AsyncChatUiListener.notifyPartialMessageUpdate(Gson().toJson(TestCommandMessage()))

Check warning on line 30 in plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ActionRegistrar.kt

View check run for this annotation

Codecov / codecov/patch

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/commands/ActionRegistrar.kt#L30 

Added line #L30 was not covered by tests
} else {
// new agentic chat route
ApplicationManager.getApplication().executeOnPooledThread {
Expand Down
19 changes: 1 addition & 18 deletions ...s-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import software.aws.toolkits.jetbrains.core.coroutines.EDT
import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitContext
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthController
import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthNeededState
import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
import software.aws.toolkits.jetbrains.services.amazonq.messages.MessagePublisher
import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteraction
import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteractionType
Expand All @@ -52,7 +51,6 @@ import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerTy
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.v1.ChatSessionFactoryV1
import software.aws.toolkits.jetbrains.services.cwc.commands.CodeScanIssueActionMessage
import software.aws.toolkits.jetbrains.services.cwc.commands.ContextMenuActionMessage
import software.aws.toolkits.jetbrains.services.cwc.commands.EditorContextCommand
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticPrompt
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticTextResponse
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.messenger.ChatPromptHandler
Expand All @@ -76,12 +74,6 @@ import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionStorage
import software.aws.toolkits.telemetry.CwsprChatCommandType
import java.util.UUID

data class TestCommandMessage(
val sender: String = "codetest",
val command: String = "test",
val type: String = "addAnswer",
) : AmazonQMessage

class ChatController private constructor(
private val context: AmazonQAppInitContext,
private val chatSessionStorage: ChatSessionStorage,
Expand Down Expand Up @@ -285,16 +277,7 @@ class ChatController private constructor(

// JB specific (not in vscode)
override suspend fun processContextMenuCommand(message: ContextMenuActionMessage) {
// Extract context
if (message.project != context.project) {
return
}

if (message.command == EditorContextCommand.GenerateUnitTests) {
// Publish an event to "codetest" tab with command as "test" and type as "addAnswer"
val messageToPublish = TestCommandMessage()
context.messagesFromAppToUi.publish(messageToPublish)
}
// No-op since context commands are handled elsewhere. This function will be deprecated once we remove this class
}

private suspend fun processPromptActions(
Expand Down
11 changes: 9 additions & 2 deletions plugins/amazonq/mynah-ui/src/mynah-ui/ui/quickActions/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ private handleDocCommand(chatPrompt: ChatPrompt, tabID: string, taskName: string
this.showScanInTab(affectedTabId)
}

private handleCodeTestCommand(chatPrompt: ChatPrompt, tabID: string, eventId: string | undefined) {
private handleCodeTestCommand(chatPrompt: ChatPrompt, tabID: string | undefined, eventId: string | undefined) {
if (!this.isCodeTestEnabled) {
return
}
Expand All @@ -343,10 +343,17 @@ private handleDocCommand(chatPrompt: ChatPrompt, tabID: string, taskName: string
this.connector.startTestGen(testTabId, realPromptText)
return
}
/**
* right click -> generate test has no tab id
* we have to manually create one if a testgen tab
* wasn't previously created
Copy link
Contributor

@samgst-amazon samgst-amazon May 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Does this mean users can have only one Test tab open at a single time?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, users will be able to have only one test tab open which is the preexisting behavior

*/
if (!tabID) {
tabID = this.mynahUI?.updateStore('', {})
}
const affectedTabId: string | undefined = this.addTab(tabID)

// if there is no test tab, open a new one

if (affectedTabId === undefined) {
this.mynahUI?.notify({
content: uiComponentsTexts.noMoreTabsTooltip,
Expand Down
Loading