Merge branch 'feature/q-lsp-chat' into manodnyb/addEventsForRefreshingFiles

Author: manodnyab

.changes/next-release/feature-eeb9909f-8f63-4bd7-8161-df8ca27dd953.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add inline completion support for abap language"
+}

gradle/libs.versions.toml

@@ -28,7 +28,7 @@ mockitoKotlin = "5.4.0"
 mockk = "1.13.17"
 nimbus-jose-jwt = "9.40"
 node-gradle = "7.0.2"
-telemetryGenerator = "1.0.310"
+telemetryGenerator = "1.0.322"
 testLogger = "4.0.0"
 testRetry = "1.5.10"
 # test-only; platform provides slf4j transitively at runtime

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

@@ -82,6 +82,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SEND_
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.STOP_CHAT_RESPONSE
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.SendChatPromptRequest
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.StopResponseMessage
+import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.chat.TELEMETRY_EVENT
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil
 import software.aws.toolkits.jetbrains.services.amazonq.lsp.util.LspEditorUtil.toUriString
 import software.aws.toolkits.jetbrains.services.amazonq.util.command
@@ -439,6 +440,9 @@ class BrowserConnector(
                     ShowSettingsUtil.getInstance().showSettingsDialog(browser.project, CodeWhispererConfigurable::class.java)
                 }
             }
+            TELEMETRY_EVENT -> {
+                handleChat(AmazonQChatServer.telemetryEvent, node)
+            }
         }
     }
 

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/editor/CodeWhispererEditorManager.kt

@@ -12,6 +12,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.PsiDocumentManager
+import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretPosition
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.InvocationContext
 import software.aws.toolkits.jetbrains.services.codewhisperer.model.SessionContext
@@ -66,7 +67,9 @@ class CodeWhispererEditorManager {
         }
 
         // Display tab accept priority once when the first accept is made
-        if (!CodeWhispererSettings.getInstance().isTabAcceptPriorityNotificationShownOnce()) {
+        if (!CodeWhispererSettings.getInstance().isTabAcceptPriorityNotificationShownOnce() &&
+            CodeWhispererFeatureConfigService.getInstance().getNewAutoTriggerUX()
+        ) {
             notifyInfo(
                 "Amazon Q",
                 message("codewhisperer.inline.settings.tab_priority.notification.text"),

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/CodeWhispererLanguageManager.kt

@@ -7,6 +7,7 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.service
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiFile
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererAbap
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererC
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererCpp
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererCsharp
@@ -147,6 +148,7 @@ class CodeWhispererLanguageManager {
             listOf("vue") to CodeWhispererVue.INSTANCE,
             listOf("ps1", "psm1") to CodeWhispererPowershell.INSTANCE,
             listOf("r") to CodeWhispererR.INSTANCE,
+            listOf("abap", "acds") to CodeWhispererAbap.INSTANCE,
         ).map {
             val exts = it.first
             val lang = it.second

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererAbap.kt

@@ -0,0 +1,21 @@
+// Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.services.codewhisperer.language.languages
+
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.telemetry.CodewhispererLanguage
+
+class CodeWhispererAbap private constructor() : CodeWhispererProgrammingLanguage() {
+    override val languageId: String = ID
+
+    override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.Abap
+
+    override fun isCodeCompletionSupported(): Boolean = true
+
+    companion object {
+        const val ID = "abap"
+
+        val INSTANCE = CodeWhispererAbap()
+    }
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/language/languages/CodeWhispererR.kt

@@ -12,7 +12,6 @@ class CodeWhispererR private constructor() : CodeWhispererProgrammingLanguage()
     override fun toTelemetryType(): CodewhispererLanguage = CodewhispererLanguage.R
 
     companion object {
-        // TODO: confirm with service team language id
         const val ID = "r"
 
         val INSTANCE = CodeWhispererR()

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

@@ -22,7 +22,6 @@ import com.intellij.util.concurrency.annotations.RequiresEdt
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.future.await
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.eclipse.lsp4j.Position
@@ -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.coroutines.disposableCoroutineScope
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineBgContext
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
 import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnectionManager
@@ -181,15 +179,9 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
             }
         }
 
-        // When popup is disposed we will cancel this coroutine. The only places popup can get disposed should be
-        // from CodeWhispererPopupManager.cancelPopup() and CodeWhispererPopupManager.closePopup().
-        // It's possible and ok that coroutine will keep running until the next time we check it's state.
-        // As long as we don't show to the user extra info we are good.
-        val coroutineScope = disposableCoroutineScope(popup)
-
         var states: InvocationContext? = null
 
-        val job = coroutineScope.launch {
+        val job = cs.launch {
             try {
                 var startTime = System.nanoTime()
                 CodeWhispererInvocationStatus.getInstance().setInvocationStart()
@@ -211,13 +203,11 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
                     runInEdt {
                         states = processCodeWhispererUI(workerContext, states)
                     }
-                    if (!isActive) {
-                        // If job is cancelled before we do another request, don't bother making
-                        // another API call to save resources
+                    if (popup.isDisposed) {
                         LOG.debug { "Skipping sending remaining requests on CodeWhisperer session exit" }
                         return@launch
                     }
-                } while (nextToken != null)
+                } while (nextToken != null && nextToken.left.isNotEmpty())
             } catch (e: Exception) {
                 // TODO flare: flare doesn't return exceptions
                 val sessionId = ""
@@ -302,7 +292,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
             return null
         }
 
-        if (completions.partialResultToken == null) {
+        if (completions.partialResultToken?.left.isNullOrEmpty()) {
             CodeWhispererInvocationStatus.getInstance().finishInvocation()
         }
 
@@ -336,7 +326,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
         // If there are no recommendations at all in this session, we need to manually send the user decision event here
         // since it won't be sent automatically later
         if (!hasAtLeastOneValid) {
-            if (completions.partialResultToken == null) {
+            if (completions.partialResultToken?.left.isNullOrEmpty()) {
                 LOG.debug { "None of the recommendations are valid, exiting CodeWhisperer session" }
                 CodeWhispererPopupManager.getInstance().cancelPopup(popup)
                 return null
@@ -531,7 +521,7 @@ class CodeWhispererService(private val cs: CoroutineScope) : Disposable {
                     editor.caretModel.primaryCaret.logicalPosition.column
                 )
                 if (nextToken != null) {
-                    workDoneToken = nextToken
+                    partialResultToken = nextToken
                 }
             }
         }

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

@@ -16,6 +16,7 @@ import software.aws.toolkits.jetbrains.services.amazonq.lsp.model.aws.textDocume
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.javaFileName
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.javaResponse
 import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.javaTestContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.CodeWhispererTestUtil.testNextToken
 import software.aws.toolkits.jetbrains.services.codewhisperer.actions.CodeWhispererActionPromoter
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.QInlineActionId.qInlineAcceptActionId
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.QInlineActionId.qInlineForceAcceptActionId
@@ -89,7 +90,7 @@ class CodeWhispererAcceptTest : CodeWhispererTestBase() {
                     )
                 ),
                 sessionId = "sessionId",
-                partialResultToken = null
+                partialResultToken = testNextToken
             )
         )
 

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

@@ -16,6 +16,7 @@ import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererLanguageManager
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
+import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererAbap
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererC
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererCpp
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererCsharp
@@ -136,6 +137,7 @@ class CodeWhispererLanguageManagerTest {
         testGetProgrammingLanguageUtil<CodeWhispererSwift>(listOf("foo"), listOf("swift"))
         testGetProgrammingLanguageUtil<CodeWhispererSystemVerilog>(listOf("foo"), listOf("sv", "svh", "vh"))
         testGetProgrammingLanguageUtil<CodeWhispererVue>(listOf("foo"), listOf("vue"))
+        testGetProgrammingLanguageUtil<CodeWhispererAbap>(listOf("foo"), listOf("abap", "acds"))
     }
 
     @Test