Skip to content

Commit e2c667a

Browse files
manodnyabmanodnyab
committed
merge conflicts resolved
2 parents 3a46078 + 0aa199a commit e2c667a

File tree

5 files changed

+67
-6
lines changed

5 files changed

+67
-6
lines changed

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/webview/BrowserConnector.kt‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Butto
3737
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickResult
3838
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_BUTTON_CLICK
3939
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_COPY_CODE_TO_CLIPBOARD
40+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_CREATE_PROMPT
41+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_DISCLAIMER_ACKNOWLEDGED
4042
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FEEDBACK
43+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FILE_CLICK
4144
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FOLLOW_UP_CLICK
4245
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_GET_SERIALIZED_CHAT
4346
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
@@ -57,11 +60,15 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatP
5760
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ChatReadyNotification
5861
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardNotification
5962
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardParams
63+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptNotification
64+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptParams
6065
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CursorState
6166
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
6267
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
6368
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackNotification
6469
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackParams
70+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FileClickNotification
71+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FileClickParams
6572
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickNotification
6673
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickParams
6774
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatParams
@@ -111,7 +118,7 @@ class BrowserConnector(
111118
.onEach { json ->
112119
val node = serializer.toNode(json)
113120
when (node.command) {
114-
"disclaimer-acknowledged" -> {
121+
CHAT_DISCLAIMER_ACKNOWLEDGED -> {
115122
MeetQSettings.getInstance().disclaimerAcknowledged = true
116123
}
117124

@@ -293,33 +300,33 @@ class BrowserConnector(
293300
server.linkClick(params)
294301
}
295302
}
296-
297303
CHAT_INFO_LINK_CLICK -> {
298304
handleChatNotification<InfoLinkClickNotification, InfoLinkClickParams>(node) { server, params ->
299305
server.infoLinkClick(params)
300306
}
301307
}
302-
303308
CHAT_SOURCE_LINK_CLICK -> {
304309
handleChatNotification<SourceLinkClickNotification, SourceLinkClickParams>(node) { server, params ->
305310
server.sourceLinkClick(params)
306311
}
307312
}
308-
313+
CHAT_FILE_CLICK -> {
314+
handleChatNotification<FileClickNotification, FileClickParams>(node) { server, params ->
315+
server.fileClick(params)
316+
}
317+
}
309318
PROMPT_INPUT_OPTIONS_CHANGE -> {
310319
handleChatNotification<PromptInputOptionChangeNotification, PromptInputOptionChangeParams>(node) {
311320
server, params ->
312321
server.promptInputOptionsChange(params)
313322
}
314323
}
315-
316324
CHAT_PROMPT_OPTION_ACKNOWLEDGED -> {
317325
val acknowledgedMessage = node.get("params").get("messageId")
318326
if (acknowledgedMessage.asText() == "programmerModeCardId") {
319327
MeetQSettings.getInstance().amazonQChatPairProgramming = false
320328
}
321329
}
322-
323330
CHAT_FOLLOW_UP_CLICK -> {
324331
handleChatNotification<FollowUpClickNotification, FollowUpClickParams>(node) { server, params ->
325332
server.followUpClick(params)
@@ -354,6 +361,12 @@ class BrowserConnector(
354361
}
355362

356363
}
364+
CHAT_CREATE_PROMPT -> {
365+
handleChatNotification<CreatePromptNotification, CreatePromptParams>(node) {
366+
server, params ->
367+
server.createPrompt(params)
368+
}
369+
}
357370
}
358371
}
359372

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/AmazonQLanguageServer.kt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.Butto
1414
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.ButtonClickResult
1515
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_BUTTON_CLICK
1616
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_COPY_CODE_TO_CLIPBOARD_NOTIFICATION
17+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_CREATE_PROMPT
1718
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FEEDBACK
19+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FILE_CLICK
1820
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_FOLLOW_UP_CLICK
1921
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_GET_SERIALIZED_CHAT
2022
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_INFO_LINK_CLICK
@@ -28,9 +30,11 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_
2830
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_CHANGE
2931
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CHAT_TAB_REMOVE
3032
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CopyCodeToClipboardParams
33+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.CreatePromptParams
3134
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedChatParams
3235
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.EncryptedQuickActionChatParams
3336
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FeedbackParams
37+
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FileClickParams
3438
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.FollowUpClickParams
3539
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatParams
3640
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.GetSerializedChatRequest
@@ -111,6 +115,9 @@ interface AmazonQLanguageServer : LanguageServer {
111115
@JsonNotification(CHAT_FOLLOW_UP_CLICK)
112116
fun followUpClick(params: FollowUpClickParams): CompletableFuture<Unit>
113117

118+
@JsonNotification(CHAT_FILE_CLICK)
119+
fun fileClick(params: FileClickParams): CompletableFuture<Unit>
120+
114121
@JsonRequest(CHAT_BUTTON_CLICK)
115122
fun buttonClick(params: ButtonClickParams): CompletableFuture<ButtonClickResult>
116123

@@ -120,4 +127,7 @@ interface AmazonQLanguageServer : LanguageServer {
120127
@JsonRequest(CHAT_GET_SERIALIZED_CHAT)
121128
fun getSerializedActions(params: GetSerializedChatParams): CompletableFuture<GetSerializedChatResult>
122129

130+
@JsonNotification(CHAT_CREATE_PROMPT)
131+
fun createPrompt(params: CreatePromptParams): CompletableFuture<Unit>
132+
123133
}

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/CreatePromptParams.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
5+
6+
data class CreatePromptParams(
7+
val promptName: String,
8+
)
9+
10+
data class CreatePromptNotification(
11+
override val command: String,
12+
override val params: CreatePromptParams,
13+
) : ChatNotification<CreatePromptParams>

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FileClick.kt‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat
5+
6+
data class FileClickNotification(
7+
override val command: String,
8+
override val params: FileClickParams,
9+
) : ChatNotification<FileClickParams>
10+
11+
data class FileClickParams(
12+
val tabId: String,
13+
val filePath: String,
14+
val action: FileAction? = null,
15+
val messageId: String? = null,
16+
val fullPath: String? = null,
17+
)
18+
19+
enum class FileAction {
20+
ACCEPT_CHANGE,
21+
REJECT_CHANGE,
22+
}

‎plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/lsp/model/aws/chat/FlareChatCommands.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,17 @@ const val PROMPT_INPUT_OPTIONS_CHANGE = "aws/chat/promptInputOptionChange"
1313
const val CHAT_PROMPT_OPTION_ACKNOWLEDGED = "chatPromptOptionAcknowledged"
1414
const val CHAT_FEEDBACK = "aws/chat/feedback"
1515
const val CHAT_FOLLOW_UP_CLICK = "aws/chat/followUpClick"
16+
const val CHAT_FILE_CLICK = "aws/chat/fileClick"
1617
const val CHAT_TAB_ADD = "aws/chat/tabAdd"
1718
const val CHAT_TAB_CHANGE = "aws/chat/tabChange"
1819
const val CHAT_TAB_REMOVE = "aws/chat/tabRemove"
1920
const val CHAT_OPEN_TAB = "aws/chat/openTab"
2021
const val CHAT_BUTTON_CLICK = "aws/chat/buttonClick"
22+
const val CHAT_DISCLAIMER_ACKNOWLEDGED = "disclaimerAcknowledged"
2123
const val CHAT_COPY_CODE_TO_CLIPBOARD = "copyToClipboard"
2224
const val CHAT_COPY_CODE_TO_CLIPBOARD_NOTIFICATION = "aws/chat/copyCodeToClipboard"
2325
const val CHAT_INSERT_TO_CURSOR = "insertToCursorPosition"
2426
const val CHAT_INSERT_TO_CURSOR_NOTIFICATION = "aws/chat/insertToCursorPosition"
2527
const val CHAT_GET_SERIALIZED_CHAT="aws/chat/getSerializedChat"
2628
const val CHAT_TAB_BAR_ACTIONS="aws/chat/tabBarAction"
29+
const val CHAT_CREATE_PROMPT = "aws/chat/createPrompt"

0 commit comments

Comments
 (0)