Skip to content

Commit e98c7d8

Browse files
andrewyuqandrewyuq
committed
address comments and further remove no longer used logic
1 parent bcc005b commit e98c7d8

File tree

56 files changed

+40
-1534
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+40
-1534
lines changed

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeScan/controller/CodeScanChatHelper.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.CodeSca
1111
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.CodeScanChatMessageContent
1212
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.messages.UpdatePlaceholderMessage
1313
import software.aws.toolkits.jetbrains.services.amazonqCodeScan.storage.ChatSessionStorage
14-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
15-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
1614
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
1715
import java.util.UUID
1816

@@ -36,7 +34,6 @@ class CodeScanChatHelper(
3634
clearPreviousItemButtons: Boolean? = false,
3735
) {
3836
if (isInValidSession()) return
39-
broadcastQEvent(QFeatureEvent.INVOCATION)
4037
messagePublisher.publish(
4138
CodeScanChatMessage(
4239
tabId = activeCodeScanTabId as String,

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.messages.sendA
7676
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
7777
import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
7878
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
79-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
80-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
8179
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
8280
import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
8381
import software.aws.toolkits.jetbrains.services.cwc.ChatConstants
@@ -1314,7 +1312,6 @@ class CodeTestChatController(
13141312
"Processing message: $message " +
13151313
"tabId: $tabId"
13161314
}
1317-
broadcastQEvent(QFeatureEvent.INVOCATION)
13181315
when (session.conversationState) {
13191316
ConversationState.WAITING_FOR_BUILD_COMMAND_INPUT -> handleBuildCommandInput(session, message)
13201317
ConversationState.WAITING_FOR_REGENERATE_INPUT -> handleRegenerateInput(session, message)

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/controller/DocController.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Delete
7979
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.NewFileZipInfo
8080
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.SessionStatePhase
8181
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.CancellationTokenSource
82-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
83-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
8482
import software.aws.toolkits.resources.message
8583
import java.util.UUID
8684

@@ -768,7 +766,6 @@ class DocController(
768766
else -> emptyList()
769767
}
770768
sendDocGenerationTelemetry(filePaths, session, docGenerationTask)
771-
broadcastQEvent(QFeatureEvent.INVOCATION)
772769

773770
if (filePaths.isNotEmpty()) {
774771
processOpenDiff(

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/controller/FeatureDevController.kt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.session.Sessio
7575
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.storage.ChatSessionStorage
7676
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.InsertAction
7777
import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.util.getFollowUpOptions
78-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
79-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
8078
import software.aws.toolkits.jetbrains.services.codewhisperer.util.content
8179
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.FeedbackComment
8280
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
@@ -219,7 +217,6 @@ class FeatureDevController(
219217
logger.debug { "$FEATURE_NAME: Processing InsertCodeAtCursorPosition: $message" }
220218

221219
withContext(EDT) {
222-
broadcastQEvent(QFeatureEvent.STARTS_EDITING)
223220
val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
224221

225222
val caret: Caret = editor.caretModel.primaryCaret
@@ -231,7 +228,6 @@ class FeatureDevController(
231228
}
232229
editor.document.insertString(offset, message.code)
233230
}
234-
broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
235231
}
236232
}
237233

@@ -750,7 +746,6 @@ class FeatureDevController(
750746
}
751747

752748
session.preloader(messenger)
753-
broadcastQEvent(QFeatureEvent.INVOCATION)
754749

755750
when (session.sessionState.phase) {
756751
SessionStatePhase.CODEGEN -> onCodeGeneration(session, message, tabId)

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/ChatController.kt‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import com.intellij.openapi.editor.Caret
1919
import com.intellij.openapi.editor.Editor
2020
import com.intellij.openapi.fileEditor.FileEditorManager
2121
import com.intellij.openapi.options.ShowSettingsUtil
22-
import com.intellij.psi.PsiDocumentManager
2322
import kotlinx.coroutines.cancelChildren
2423
import kotlinx.coroutines.flow.catch
2524
import kotlinx.coroutines.flow.filter
@@ -46,9 +45,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPag
4645
import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextController
4746
import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
4847
import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
49-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererUserModificationTracker
50-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
51-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
5248
import software.aws.toolkits.jetbrains.services.cwc.InboundAppMessagesHandler
5349
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
5450
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
@@ -61,7 +57,6 @@ import software.aws.toolkits.jetbrains.services.cwc.commands.EditorContextComman
6157
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticPrompt
6258
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.StaticTextResponse
6359
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.messenger.ChatPromptHandler
64-
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.InsertedCodeModificationEntry
6560
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.TelemetryHelper
6661
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
6762
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.userIntent.UserIntentRecognizer
@@ -82,7 +77,6 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.QuickActionMessage
8277
import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionStorage
8378
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
8479
import software.aws.toolkits.telemetry.CwsprChatCommandType
85-
import java.time.Instant
8680
import java.util.UUID
8781

8882
data class TestCommandMessage(
@@ -207,7 +201,6 @@ class ChatController private constructor(
207201
}
208202

209203
override suspend fun processInsertCodeAtCursorPosition(message: IncomingCwcMessage.InsertCodeAtCursorPosition) {
210-
broadcastQEvent(QFeatureEvent.STARTS_EDITING)
211204
withContext(EDT) {
212205
val editor: Editor = FileEditorManager.getInstance(context.project).selectedTextEditor ?: return@withContext
213206

@@ -223,23 +216,10 @@ class ChatController private constructor(
223216
editor.document.insertString(offset, message.code)
224217

225218
ReferenceLogController.addReferenceLog(message.code, message.codeReference, editor, context.project, null)
226-
227-
CodeWhispererUserModificationTracker.getInstance(context.project).enqueue(
228-
InsertedCodeModificationEntry(
229-
telemetryHelper.getConversationId(message.tabId).orEmpty(),
230-
message.messageId,
231-
Instant.now(),
232-
PsiDocumentManager.getInstance(context.project).getPsiFile(editor.document)?.virtualFile,
233-
editor.document.createRangeMarker(caret.selectionStart, caret.selectionEnd, true),
234-
message.code,
235-
),
236-
)
237219
}
238220
}
239221
}
240222
telemetryHelper.recordInteractWithMessage(message)
241-
242-
broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
243223
}
244224

245225
override suspend fun processStopResponseMessage(message: IncomingCwcMessage.StopResponse) {
@@ -433,7 +413,6 @@ class ChatController private constructor(
433413
sessionInfo.history.add(requestData)
434414
telemetryHelper.recordEnterFocusConversation(tabId)
435415
telemetryHelper.recordStartConversation(tabId, requestData)
436-
broadcastQEvent(QFeatureEvent.INVOCATION)
437416
// Send the request to the API and publish the responses back to the UI.
438417
// This is launched in a scope attached to the sessionInfo so that the Job can be cancelled on a per-session basis.
439418
ChatPromptHandler(telemetryHelper).handle(tabId, triggerId, requestData, sessionInfo, shouldAddIndexInProgressMessage)

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/controller/chat/messenger/ChatPromptHandler.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import software.amazon.awssdk.awscore.exception.AwsServiceException
1313
import software.amazon.awssdk.services.codewhispererstreaming.model.CodeWhispererStreamingException
1414
import software.aws.toolkits.core.utils.convertMarkdownToHTML
1515
import software.aws.toolkits.core.utils.extractCodeBlockLanguage
16-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
17-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
1816
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
1917
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
2018
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatResponseEvent
@@ -117,8 +115,6 @@ class ChatPromptHandler(private val telemetryHelper: TelemetryHelper) {
117115
)
118116
telemetryHelper.recordAddMessage(data, response, responseText.length, statusCode, countTotalNumberOfCodeBlocks(responseText))
119117
emit(response)
120-
121-
broadcastQEvent(QFeatureEvent.INVOCATION)
122118
}
123119
.catch { exception ->
124120
val statusCode = if (exception is AwsServiceException) exception.statusCode() else 0

‎plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/inline/InlineChatController.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.profile.QRegionProfileSe
6060
import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AMAZON_Q_WINDOW_ID
6161
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
6262
import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
63-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
64-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
6563
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
6664
import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.TriggerType
6765
import software.aws.toolkits.jetbrains.services.cwc.controller.ReferenceLogController
@@ -545,7 +543,6 @@ class InlineChatController(
545543
private fun insertString(editor: Editor, offset: Int, text: String): RangeMarker {
546544
lateinit var rangeMarker: RangeMarker
547545

548-
broadcastQEvent(QFeatureEvent.STARTS_EDITING)
549546
ApplicationManager.getApplication().invokeAndWait {
550547
CommandProcessor.getInstance().runUndoTransparentAction {
551548
WriteCommandAction.runWriteCommandAction(project) {
@@ -555,20 +552,17 @@ class InlineChatController(
555552
highlightCodeWithBackgroundColor(editor, rangeMarker.startOffset, rangeMarker.endOffset, true)
556553
}
557554
}
558-
broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
559555
return rangeMarker
560556
}
561557

562558
private fun replaceString(document: Document, start: Int, end: Int, text: String) {
563-
broadcastQEvent(QFeatureEvent.STARTS_EDITING)
564559
ApplicationManager.getApplication().invokeAndWait {
565560
CommandProcessor.getInstance().runUndoTransparentAction {
566561
WriteCommandAction.runWriteCommandAction(project) {
567562
document.replaceString(start, end, text)
568563
}
569564
}
570565
}
571-
broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
572566
}
573567

574568
private fun highlightString(editor: Editor, start: Int, end: Int, isInsert: Boolean) {
@@ -725,8 +719,6 @@ class InlineChatController(
725719
canPopupAbort.set(true)
726720
undoChanges()
727721
}
728-
729-
broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
730722
return errorMessage
731723
}
732724

‎plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ import software.aws.toolkits.jetbrains.services.codemodernizer.utils.toVirtualFi
112112
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.tryGetJdk
113113
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.unzipFile
114114
import software.aws.toolkits.jetbrains.services.codemodernizer.utils.validateSctMetadata
115-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
116-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
117115
import software.aws.toolkits.jetbrains.services.cwc.messages.ChatMessageType
118116
import software.aws.toolkits.resources.message
119117
import software.aws.toolkits.telemetry.CodeTransformPreValidationError
@@ -140,7 +138,6 @@ class CodeTransformChatController(
140138
if (objective == "language upgrade" || objective == "sql conversion") {
141139
telemetry.submitSelection(objective)
142140
}
143-
broadcastQEvent(QFeatureEvent.INVOCATION)
144141
when (objective) {
145142
"language upgrade" -> this.handleLanguageUpgrade()
146143
"sql conversion" -> this.handleSQLConversion()

‎plugins/amazonq/codewhisperer/jetbrains-community/resources/META-INF/plugin-codewhisperer.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
/>
5959

6060
<typedHandler implementation="software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererTypedHandler"/>
61-
<editorFactoryListener implementation="software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEditorListener"/>
6261
<editorActionHandler action="EditorEnter" implementationClass="software.aws.toolkits.jetbrains.services.codewhisperer.editor.CodeWhispererEnterHandler"
6362
order="first, before editorEnter"/>
6463
<actionPromoter order="last" implementation="software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererActionPromoter"/>

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/utils/CodeWhispererCodeScanIssueUtils.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhisp
4040
import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
4141
import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
4242
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
43-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.QFeatureEvent
44-
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.broadcastQEvent
4543
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
4644
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
4745
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_ISSUE_TITLE_MAX_LENGTH
@@ -340,7 +338,6 @@ fun applySuggestedFix(project: Project, issue: CodeWhispererCodeScanIssue) {
340338
try {
341339
val manager = CodeWhispererCodeReferenceManager.getInstance(issue.project)
342340
WriteCommandAction.runWriteCommandAction(issue.project) {
343-
broadcastQEvent(QFeatureEvent.STARTS_EDITING)
344341
val document = FileDocumentManager.getInstance().getDocument(issue.file) ?: return@runWriteCommandAction
345342

346343
val documentContent = document.text
@@ -367,7 +364,6 @@ fun applySuggestedFix(project: Project, issue: CodeWhispererCodeScanIssue) {
367364
originalContent.split("\n")
368365
)
369366
}
370-
broadcastQEvent(QFeatureEvent.FINISHES_EDITING)
371367
}
372368
if (issue.suggestedFixes[0].references.isNotEmpty()) {
373369
manager.toolWindow?.show()

0 commit comments

Comments
 (0)