Skip to content

fix: fix context transparency list to make it work #5678

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
merged 3 commits into from
May 7, 2025
Merged

fix: fix context transparency list to make it work #5678

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
79ea537
fix context transparency list to make it work
andrewyuq May 6, 2025
26728b9
make description fields nullable
andrewyuq May 6, 2025
7c38c98
Merge branch 'feature/q-lsp-chat' into q-lsp-chat
manodnyab May 6, 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
1 change: 1 addition & 0 deletions ...ommunity/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ class BrowserConnector(
chatPrompt,
textDocumentIdentifier,
cursorState,
context = requestFromUi.params.context
)

val tabId = requestFromUi.params.tabId
Expand Down
36 changes: 30 additions & 6 deletions ...re/aws/toolkits/jetbrains/services/amazonq/lsp/flareChat/AwsServerCapabilitiesProvider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.IconType

@Service(Service.Level.PROJECT)
class AwsServerCapabilitiesProvider {
Expand All @@ -25,8 +26,8 @@ class AwsServerCapabilitiesProvider {
listOf(
QuickActionsCommandGroups(
listOf(
Command("/help", "Learn more about Amazon Q then"),
Command("/clear", "Clear this session")
QuickActionCommand("/help", "Learn more about Amazon Q then"),
QuickActionCommand("/clear", "Clear this session")
)
)
)
Expand All @@ -52,10 +53,33 @@ data class QuickActions(
)

data class QuickActionsCommandGroups(
val commands: List<Command>,
val commands: List<QuickActionCommand>,
)

data class Command(
val command: String,
val description: String?,
open class QuickActionCommand(
open val command: String,
open val description: String,
open val placeholder: String? = null,
open val icon: IconType? = null,
)

data class ContextCommand(
val id: String?,
val route: List<String>?,
val label: String?,
val children: ContextCommandGroup?,
override val command: String,
override val description: String,
override val placeholder: String? = null,
override val icon: IconType? = null,
) : QuickActionCommand(
command = command,
description = description,
placeholder = placeholder,
icon = icon
)

data class ContextCommandGroup(
val groupName: String?,
val commands: List<ContextCommand>,
)
6 changes: 3 additions & 3 deletions ...ity/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/ChatPrompt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat

import com.fasterxml.jackson.annotation.JsonProperty
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.Command
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ContextCommand

data class ChatPrompt(
val prompt: String,
Expand All @@ -20,13 +20,13 @@ data class SendChatPromptRequest(
data class MidChatPrompt(
val prompt: InnerChatPrompt,
val tabId: String,
val context: List<Command>?,
val context: List<ContextCommand>?,
)

data class InnerChatPrompt(
val prompt: String,
val escapedPrompt: String,
val context: List<Command>? = null,
val context: List<ContextCommand>? = null,
val options: InnerChatOptions?,
)

Expand Down
2 changes: 2 additions & 0 deletions ...src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/SendChatPrompt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat

import org.eclipse.lsp4j.TextDocumentIdentifier
import software.aws.toolkits.jetbrains.services.amazonq.lsp.flareChat.ContextCommand

data class ChatParams(
val tabId: String,
val prompt: ChatPrompt,
val textDocument: TextDocumentIdentifier,
val cursorState: CursorState,
val context: List<ContextCommand>?,
)

data class EncryptedChatParams(
Expand Down
Loading