Revert "Merge remote-tracking branch 'origin/main' into feature/q-lsp-chat"

This reverts commit afc5bf5, reversing
changes made to 599df15.

Author: rli

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

@@ -20,7 +20,6 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.options.ShowSettingsUtil
 import kotlinx.coroutines.cancelChildren
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
@@ -36,7 +35,6 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.info
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.coroutines.EDT
-import software.aws.toolkits.jetbrains.core.credentials.sono.isInternalUser
 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
@@ -47,8 +45,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPag
 import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextController
 import software.aws.toolkits.jetbrains.services.amazonq.project.RelevantDocument
 import software.aws.toolkits.jetbrains.services.codewhisperer.settings.CodeWhispererConfigurable
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDiagnosticDifferences
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDocumentDiagnostics
 import software.aws.toolkits.jetbrains.services.cwc.InboundAppMessagesHandler
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.exceptions.ChatApiException
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
@@ -211,7 +207,6 @@ class ChatController private constructor(
             val caret: Caret = editor.caretModel.primaryCaret
             val offset: Int = caret.offset
 
-            val oldDiagnostics = getDocumentDiagnostics(editor.document, context.project)
             ApplicationManager.getApplication().runWriteAction {
                 WriteCommandAction.runWriteCommandAction(context.project) {
                     if (caret.hasSelection()) {
@@ -223,12 +218,6 @@ class ChatController private constructor(
                     ReferenceLogController.addReferenceLog(message.code, message.codeReference, editor, context.project, null)
                 }
             }
-            if (isInternalUser(getStartUrl(context.project))) {
-                // wait for the IDE itself to update its diagnostics for current file
-                delay(500)
-                val newDiagnostics = getDocumentDiagnostics(editor.document, context.project)
-                message.diagnosticsDifferences = getDiagnosticDifferences(oldDiagnostics, newDiagnostics)
-            }
         }
         telemetryHelper.recordInteractWithMessage(message)
     }

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

@@ -270,8 +270,6 @@ class TelemetryHelper(private val project: Project, private val sessionStorage:
                     acceptedCharacterCount(message.code.length)
                     acceptedLineCount(message.code.lines().size)
                     hasProjectLevelContext(getMessageHasProjectContext(message.messageId))
-                    addedIdeDiagnostics(message.diagnosticsDifferences?.added)
-                    removedIdeDiagnostics(message.diagnosticsDifferences?.removed)
                 }.build()
             }
 

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/messages/CwcMessage.kt

@@ -18,7 +18,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.auth.AuthFollowUpType
 import software.aws.toolkits.jetbrains.services.amazonq.messages.AmazonQMessage
 import software.aws.toolkits.jetbrains.services.amazonq.onboarding.OnboardingPageInteractionType
 import software.aws.toolkits.jetbrains.services.amazonq.util.HighlightCommand
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.DiagnosticDifferences
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.FollowUpType
 import java.time.Instant
 
@@ -96,7 +95,6 @@ sealed interface IncomingCwcMessage : CwcMessage {
         val codeBlockIndex: Int?,
         val totalCodeBlocks: Int?,
         val codeBlockLanguage: String?,
-        var diagnosticsDifferences: DiagnosticDifferences?,
     ) : IncomingCwcMessage, TabId, MessageId
 
     data class TriggerTabIdReceived(

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt

@@ -44,7 +44,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.apps.AmazonQAppInitConte
 import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererCustomization
 import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.DiagnosticDifferences
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.ChatSession
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.ChatRequestData
 import software.aws.toolkits.jetbrains.services.cwc.clients.chat.model.CodeNamesImpl
@@ -476,7 +475,6 @@ class TelemetryHelperTest {
         val inserTionTargetType = "insertionTargetType"
         val eventId = "eventId"
         val code = "println()"
-        val diagnosticDifferences = DiagnosticDifferences(emptyList(), emptyList())
 
         sut.recordInteractWithMessage(
             IncomingCwcMessage.InsertCodeAtCursorPosition(
@@ -489,8 +487,7 @@ class TelemetryHelperTest {
                 eventId,
                 codeBlockIndex,
                 totalCodeBlocks,
-                lang,
-                diagnosticDifferences
+                lang
             )
         )
 
@@ -506,8 +503,6 @@ class TelemetryHelperTest {
                     acceptedLineCount(code.lines().size)
                     customizationArn(customizationArn)
                     hasProjectLevelContext(false)
-                    addedIdeDiagnostics(emptyList())
-                    removedIdeDiagnostics(emptyList())
                 }.build()
             )
         )

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/service/CodeWhispererService.kt

@@ -30,7 +30,6 @@ import org.eclipse.lsp4j.TextDocumentIdentifier
 import org.eclipse.lsp4j.jsonrpc.JsonRpcException
 import org.eclipse.lsp4j.jsonrpc.messages.Either
 import software.amazon.awssdk.core.exception.SdkServiceException
-import software.amazon.awssdk.services.codewhispererruntime.model.IdeDiagnostic
 import software.amazon.awssdk.services.codewhispererruntime.model.ThrottlingException
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
@@ -72,7 +71,6 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.notifyErrorCodeWhispererUsageLimit
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.promptReAuth
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.FileContextProvider
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.getDocumentDiagnostics
 import software.aws.toolkits.jetbrains.utils.isInjectedText
 import software.aws.toolkits.jetbrains.utils.isQExpired
 import software.aws.toolkits.resources.message
@@ -471,7 +469,6 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         } catch (e: Exception) {
             LOG.warn { "Cannot get workspaceId from LSP'$e'" }
         }
-        val diagnostics = getDocumentDiagnostics(editor.document, project)
         return RequestContext(
             project,
             editor,
@@ -482,7 +479,6 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
             latencyContext,
             customizationArn,
             workspaceId,
-            diagnostics
         )
     }
 
@@ -635,7 +631,6 @@ data class RequestContext(
     val latencyContext: LatencyContext,
     val customizationArn: String?,
     val workspaceId: String?,
-    val diagnostics: List<IdeDiagnostic>?,
 )
 
 data class ResponseContext(

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

@@ -3,16 +3,12 @@
 
 package software.aws.toolkits.jetbrains.services.codewhisperer.util
 
-import com.intellij.codeInsight.daemon.impl.HighlightInfo
 import com.intellij.codeInsight.lookup.LookupManager
 import com.intellij.ide.BrowserUtil
-import com.intellij.lang.annotation.HighlightSeverity
 import com.intellij.notification.NotificationAction
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.application.runInEdt
-import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
-import com.intellij.openapi.editor.impl.DocumentMarkupModel
 import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
@@ -25,10 +21,7 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.yield
-import software.amazon.awssdk.services.codewhispererruntime.model.IdeDiagnostic
 import software.amazon.awssdk.services.codewhispererruntime.model.OptOutPreference
-import software.amazon.awssdk.services.codewhispererruntime.model.Position
-import software.amazon.awssdk.services.codewhispererruntime.model.Range
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.credentials.AwsBearerTokenConnection
@@ -354,88 +347,3 @@ object CodeWhispererUtil {
 enum class CaretMovement {
     NO_CHANGE, MOVE_FORWARD, MOVE_BACKWARD
 }
-
-fun getDiagnosticsType(message: String): String {
-    val lowercaseMessage = message.lowercase()
-
-    val diagnosticPatterns = mapOf(
-        "TYPE_ERROR" to listOf("type", "cast"),
-        "SYNTAX_ERROR" to listOf("expected", "indent", "syntax"),
-        "REFERENCE_ERROR" to listOf("undefined", "not defined", "undeclared", "reference", "symbol"),
-        "BEST_PRACTICE" to listOf("deprecated", "unused", "uninitialized", "not initialized"),
-        "SECURITY" to listOf("security", "vulnerability")
-    )
-
-    return diagnosticPatterns
-        .entries
-        .firstOrNull { (_, keywords) ->
-            keywords.any { lowercaseMessage.contains(it) }
-        }
-        ?.key ?: "OTHER"
-}
-
-fun convertSeverity(severity: HighlightSeverity): String = when {
-    severity == HighlightSeverity.ERROR -> "ERROR"
-    severity == HighlightSeverity.WARNING ||
-        severity == HighlightSeverity.WEAK_WARNING -> "WARNING"
-    severity == HighlightSeverity.INFORMATION -> "INFORMATION"
-    severity.toString().contains("TEXT", ignoreCase = true) -> "HINT"
-    severity == HighlightSeverity.INFO -> "INFORMATION"
-    // For severities that might indicate performance issues
-    severity.toString().contains("PERFORMANCE", ignoreCase = true) -> "WARNING"
-    // For deprecation warnings
-    severity.toString().contains("DEPRECATED", ignoreCase = true) -> "WARNING"
-    // Default case
-    else -> "INFORMATION"
-}
-
-fun getDocumentDiagnostics(document: Document, project: Project): List<IdeDiagnostic> = runCatching {
-    DocumentMarkupModel.forDocument(document, project, true)
-        .allHighlighters
-        .mapNotNull { it.errorStripeTooltip as? HighlightInfo }
-        .filter { !it.description.isNullOrEmpty() }
-        .map { info ->
-            val startLine = document.getLineNumber(info.startOffset)
-            val endLine = document.getLineNumber(info.endOffset)
-
-            IdeDiagnostic.builder()
-                .ideDiagnosticType(getDiagnosticsType(info.description))
-                .severity(convertSeverity(info.severity))
-                .source(info.inspectionToolId)
-                .range(
-                    Range.builder()
-                        .start(
-                            Position.builder()
-                                .line(startLine)
-                                .character(document.getLineStartOffset(startLine))
-                                .build()
-                        )
-                        .end(
-                            Position.builder()
-                                .line(endLine)
-                                .character(document.getLineStartOffset(endLine))
-                                .build()
-                        )
-                        .build()
-                )
-                .build()
-        }
-}.getOrElse { e ->
-    getLogger<CodeWhispererUtil>().warn { "Failed to get document diagnostics ${e.message}" }
-    emptyList()
-}
-
-data class DiagnosticDifferences(
-    val added: List<IdeDiagnostic>,
-    val removed: List<IdeDiagnostic>,
-)
-
-fun serializeDiagnostics(diagnostic: IdeDiagnostic): String = "${diagnostic.source()}-${diagnostic.severity()}-${diagnostic.ideDiagnosticType()}"
-
-fun getDiagnosticDifferences(oldDiagnostic: List<IdeDiagnostic>, newDiagnostic: List<IdeDiagnostic>): DiagnosticDifferences {
-    val oldSet = oldDiagnostic.map { i -> serializeDiagnostics(i) }.toSet()
-    val newSet = newDiagnostic.map { i -> serializeDiagnostics(i) }.toSet()
-    val added = newDiagnostic.filter { i -> !oldSet.contains(serializeDiagnostics(i)) }.distinctBy { serializeDiagnostics(it) }
-    val removed = oldDiagnostic.filter { i -> !newSet.contains(serializeDiagnostics(i)) }.distinctBy { serializeDiagnostics(it) }
-    return DiagnosticDifferences(added, removed)
-}

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/CodeWhispererTestUtil.kt

@@ -163,7 +163,6 @@ fun aRequestContext(
         ),
         customizationArn = null,
         workspaceId = null,
-        diagnostics = emptyList(),
     )
 }