Skip to content

Commit e47fd89

Browse files
bryceitoc9bryceitoc9
authored
Merge branch 'main' into bryceito/reroute-chat
2 parents 2378c26 + f9f83b2 commit e47fd89

File tree

8 files changed

+269
-15
lines changed

8 files changed

+269
-15
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -768,13 +768,7 @@ fun buildDownloadFailureChatContent(downloadFailureReason: DownloadFailureReason
768768
return CodeTransformChatMessageContent(
769769
type = CodeTransformChatMessageType.FinalizedAnswer,
770770
message = "$message\n\n${message("codemodernizer.chat.message.validation.error.more_info", docLink)}",
771-
buttons = if (downloadFailureReason.artifactType == TransformationDownloadArtifactType.CLIENT_INSTRUCTIONS &&
772-
(downloadFailureReason is DownloadFailureReason.OTHER || downloadFailureReason is DownloadFailureReason.SSL_HANDSHAKE_ERROR)
773-
) {
774-
listOf(viewDiffButton, viewSummaryButton)
775-
} else {
776-
null
777-
},
771+
buttons = listOf(viewDiffButton, viewSummaryButton)
778772
)
779773
}
780774

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/model/CodeWhispererModel.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.intellij.openapi.util.Disposer
1414
import com.intellij.openapi.util.UserDataHolderBase
1515
import com.intellij.util.concurrency.annotations.RequiresEdt
1616
import kotlinx.coroutines.channels.Channel
17+
import software.amazon.awssdk.services.codewhispererruntime.model.IdeDiagnostic
1718
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
1819
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionItem
1920
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocument.InlineCompletionListWithReferences
@@ -244,6 +245,7 @@ data class InlineCompletionSessionContext(
244245
var sessionId: String = "",
245246
val triggerOffset: Int,
246247
var counter: Int = 0,
248+
val diagnostics: List<IdeDiagnostic>? = emptyList(),
247249
)
248250

249251
data class InlineCompletionItemContext(

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/popup/QInlineCompletionProvider.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
5959
import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
6060
import software.aws.toolkits.jetbrains.services.codewhisperer.toolwindow.CodeWhispererCodeReferenceManager
6161
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
62+
import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDocumentDiagnostics
6263
import software.aws.toolkits.jetbrains.utils.isQConnected
6364
import software.aws.toolkits.resources.message
6465
import software.aws.toolkits.telemetry.CodewhispererTriggerType
@@ -332,6 +333,7 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
332333
latencyContext,
333334
sessionContext,
334335
triggerSessionId,
336+
editor.document
335337
)
336338
activeTriggerSessions.remove(triggerSessionId)
337339
}
@@ -398,6 +400,7 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
398400
val triggerSessionId = triggerSessionId++
399401
val latencyContext = LatencyContext(codewhispererEndToEndStart = System.nanoTime())
400402
val triggerTypeInfo = getTriggerTypeInfo(request)
403+
val diagnostics = getDocumentDiagnostics(editor.document, project)
401404

402405
CodeWhispererInvocationStatus.getInstance().setIsInvokingQInline(session, true)
403406
Disposer.register(session) {
@@ -412,7 +415,7 @@ class QInlineCompletionProvider(private val cs: CoroutineScope) : InlineCompleti
412415
return InlineCompletionSuggestion.Empty
413416
}
414417

415-
val sessionContext = InlineCompletionSessionContext(triggerOffset = request.endOffset)
418+
val sessionContext = InlineCompletionSessionContext(triggerOffset = request.endOffset, diagnostics = diagnostics)
416419

417420
// Pagination workaround: Always return exactly 5 variants
418421
// Create channel placeholder for upcoming pagination results

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererTelemetryService.kt‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ package software.aws.toolkits.jetbrains.services.codewhisperer.telemetry
55

66
import com.intellij.openapi.components.Service
77
import com.intellij.openapi.components.service
8+
import com.intellij.openapi.editor.Document
89
import com.intellij.openapi.project.Project
910
import kotlinx.coroutines.CoroutineScope
11+
import kotlinx.coroutines.delay
1012
import kotlinx.coroutines.launch
1113
import software.aws.toolkits.core.utils.debug
1214
import software.aws.toolkits.core.utils.getLogger
15+
import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
1316
import software.aws.toolkits.jetbrains.services.amazonq.lsp.AmazonQLspService
1417
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.InlineCompletionStates
1518
import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.LogInlineCompletionSessionResultsParams
@@ -24,6 +27,10 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.service.CodeWhispe
2427
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
2528
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getCodeWhispererStartUrl
2629
import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getConnectionStartUrl
30+
import software.aws.toolkits.jetbrains.services.codewhisperer.util.DiagnosticDifferences
31+
import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDiagnosticDifferences
32+
import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDocumentDiagnostics
33+
import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
2734
import software.aws.toolkits.jetbrains.settings.AwsSettings
2835
import software.aws.toolkits.telemetry.CodeFixAction
2936
import software.aws.toolkits.telemetry.CodewhispererCodeScanScope
@@ -75,6 +82,7 @@ class CodeWhispererTelemetryService(private val cs: CoroutineScope) {
7582
latencyContext: LatencyContext,
7683
sessionContext: InlineCompletionSessionContext,
7784
triggerSessionId: Int,
85+
document: Document,
7886
) {
7987
if (sessionContext.sessionId.isEmpty()) {
8088
QInlineCompletionProvider.logInline(triggerSessionId) {
@@ -96,6 +104,18 @@ class CodeWhispererTelemetryService(private val cs: CoroutineScope) {
96104
"total session display time: ${CodeWhispererInvocationStatus.getInstance().completionShownTime?.let { Duration.between(it, Instant.now()) }
97105
?.toMillis()?.toDouble()}"
98106
}
107+
var diffDiagnostics = DiagnosticDifferences(
108+
added = emptyList(),
109+
removed = emptyList()
110+
)
111+
112+
if (isInternalUser(getStartUrl(project))) {
113+
val oldDiagnostics = sessionContext.diagnostics.orEmpty()
114+
// wait for the IDE itself to update its diagnostics for current file
115+
delay(500)
116+
val newDiagnostics = getDocumentDiagnostics(document, project)
117+
diffDiagnostics = getDiagnosticDifferences(oldDiagnostics, newDiagnostics)
118+
}
99119
val params = LogInlineCompletionSessionResultsParams(
100120
sessionId = sessionContext.sessionId,
101121
completionSessionResult = sessionContext.itemContexts.filter { it.item != null }.associate {
@@ -110,7 +130,9 @@ class CodeWhispererTelemetryService(private val cs: CoroutineScope) {
110130
?.toMillis()?.toDouble(),
111131
// no userInput in JB inline completion API, every new char input will discard the previous trigger so
112132
// user input is always 0
113-
typeaheadLength = 0
133+
typeaheadLength = 0,
134+
addedDiagnostics = diffDiagnostics.added,
135+
removedDiagnostics = diffDiagnostics.removed,
114136
)
115137
AmazonQLspService.executeAsyncIfRunning(project) { server ->
116138
server.logInlineCompletionSessionResults(params)

‎plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
package software.aws.toolkits.jetbrains.services.codewhisperer.util
55

6+
import com.intellij.codeInsight.daemon.impl.HighlightInfo
67
import com.intellij.codeInsight.lookup.LookupManager
78
import com.intellij.ide.BrowserUtil
9+
import com.intellij.lang.annotation.HighlightSeverity
810
import com.intellij.notification.NotificationAction
911
import com.intellij.openapi.application.ApplicationManager
1012
import com.intellij.openapi.application.runInEdt
13+
import com.intellij.openapi.editor.Document
1114
import com.intellij.openapi.editor.Editor
15+
import com.intellij.openapi.editor.impl.DocumentMarkupModel
1216
import com.intellij.openapi.editor.impl.EditorImpl
1317
import com.intellij.openapi.project.Project
1418
import com.intellij.openapi.vfs.VfsUtil
@@ -21,7 +25,11 @@ import kotlinx.coroutines.Job
2125
import kotlinx.coroutines.delay
2226
import kotlinx.coroutines.launch
2327
import kotlinx.coroutines.yield
28+
import software.amazon.awssdk.services.codewhispererruntime.model.DiagnosticSeverity
29+
import software.amazon.awssdk.services.codewhispererruntime.model.IdeDiagnostic
2430
import software.amazon.awssdk.services.codewhispererruntime.model.OptOutPreference
31+
import software.amazon.awssdk.services.codewhispererruntime.model.Position
32+
import software.amazon.awssdk.services.codewhispererruntime.model.Range
2533
import software.aws.toolkits.core.utils.getLogger
2634
import software.aws.toolkits.core.utils.warn
2735
import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
@@ -347,3 +355,87 @@ object CodeWhispererUtil {
347355
enum class CaretMovement {
348356
NO_CHANGE, MOVE_FORWARD, MOVE_BACKWARD
349357
}
358+
359+
val diagnosticPatterns = mapOf(
360+
"TYPE_ERROR" to listOf("type", "cast"),
361+
"SYNTAX_ERROR" to listOf("expected", "indent", "syntax"),
362+
"REFERENCE_ERROR" to listOf("undefined", "not defined", "undeclared", "reference", "symbol"),
363+
"BEST_PRACTICE" to listOf("deprecated", "unused", "uninitialized", "not initialized"),
364+
"SECURITY" to listOf("security", "vulnerability")
365+
)
366+
367+
fun getDiagnosticsType(message: String): String {
368+
val lowercaseMessage = message.lowercase()
369+
return diagnosticPatterns
370+
.entries
371+
.firstOrNull { (_, keywords) ->
372+
keywords.any { lowercaseMessage.contains(it) }
373+
}
374+
?.key ?: "OTHER"
375+
}
376+
377+
fun convertSeverity(severity: HighlightSeverity): DiagnosticSeverity = when {
378+
severity == HighlightSeverity.ERROR -> DiagnosticSeverity.ERROR
379+
severity == HighlightSeverity.WARNING ||
380+
severity == HighlightSeverity.WEAK_WARNING -> DiagnosticSeverity.WARNING
381+
severity == HighlightSeverity.INFORMATION -> DiagnosticSeverity.INFORMATION
382+
severity == HighlightSeverity.TEXT_ATTRIBUTES -> DiagnosticSeverity.HINT
383+
severity == HighlightSeverity.INFO -> DiagnosticSeverity.INFORMATION
384+
// For severities that might indicate performance issues
385+
severity.toString().contains("PERFORMANCE", ignoreCase = true) -> DiagnosticSeverity.WARNING
386+
// For deprecation warnings
387+
severity.toString().contains("DEPRECATED", ignoreCase = true) -> DiagnosticSeverity.WARNING
388+
// Default case
389+
else -> DiagnosticSeverity.INFORMATION
390+
}
391+
392+
fun getDocumentDiagnostics(document: Document, project: Project): List<IdeDiagnostic> = runCatching {
393+
DocumentMarkupModel.forDocument(document, project, true)
394+
.allHighlighters
395+
.mapNotNull { it.errorStripeTooltip as? HighlightInfo }
396+
.filter { !it.description.isNullOrEmpty() }
397+
.map { info ->
398+
val startLine = document.getLineNumber(info.startOffset)
399+
val endLine = document.getLineNumber(info.endOffset)
400+
401+
IdeDiagnostic.builder()
402+
.ideDiagnosticType(getDiagnosticsType(info.description))
403+
.severity(convertSeverity(info.severity))
404+
.source(info.inspectionToolId)
405+
.range(
406+
Range.builder()
407+
.start(
408+
Position.builder()
409+
.line(startLine)
410+
.character(document.getLineStartOffset(startLine))
411+
.build()
412+
)
413+
.end(
414+
Position.builder()
415+
.line(endLine)
416+
.character(document.getLineStartOffset(endLine))
417+
.build()
418+
)
419+
.build()
420+
)
421+
.build()
422+
}
423+
}.getOrElse { e ->
424+
getLogger<CodeWhispererUtil>().warn { "Failed to get document diagnostics ${e.message}" }
425+
emptyList()
426+
}
427+
428+
data class DiagnosticDifferences(
429+
val added: List<IdeDiagnostic>,
430+
val removed: List<IdeDiagnostic>,
431+
)
432+
433+
fun serializeDiagnostics(diagnostic: IdeDiagnostic): String = "${diagnostic.source()}-${diagnostic.severity()}-${diagnostic.ideDiagnosticType()}"
434+
435+
fun getDiagnosticDifferences(oldDiagnostic: List<IdeDiagnostic>, newDiagnostic: List<IdeDiagnostic>): DiagnosticDifferences {
436+
val oldSet = oldDiagnostic.map { i -> serializeDiagnostics(i) }.toSet()
437+
val newSet = newDiagnostic.map { i -> serializeDiagnostics(i) }.toSet()
438+
val added = newDiagnostic.filter { i -> !oldSet.contains(serializeDiagnostics(i)) }.distinctBy { serializeDiagnostics(it) }
439+
val removed = oldDiagnostic.filter { i -> !newSet.contains(serializeDiagnostics(i)) }.distinctBy { serializeDiagnostics(it) }
440+
return DiagnosticDifferences(added, removed)
441+
}

0 commit comments

Comments
 (0)