Merge branch 'main' into feature/stop-generation

Author: tverney

.changes/3.34.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2024-10-22",
+  "version" : "3.34",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Fix issue where the plugin can't read SSO tokens from disk / always returns 'Unable to load client registration'"
+  } ]
+}

CHANGELOG.md

@@ -1,3 +1,6 @@
+# _3.34_ (2024-10-22)
+- **(Bug Fix)** Fix issue where the plugin can't read SSO tokens from disk / always returns 'Unable to load client registration'
+
 # _3.33_ (2024-10-17)
 - **(Feature)** Add support for 2024.3
 - **(Bug Fix)** `@workspace` cannot properly locate certain folders for certain project setup

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -35,10 +35,6 @@ configurations {
         // IDE provides Kotlin
         exclude(group = "org.jetbrains.kotlin")
         exclude(group = "org.jetbrains.kotlinx")
-
-        exclude(group = "com.fasterxml.jackson.core")
-        exclude(group = "com.fasterxml.jackson.module", "jackson-module-kotlin")
-        exclude(group = "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
     }
 
     configureEach {

buildSrc/src/main/kotlin/toolkit-publish-root-conventions.gradle.kts

@@ -20,7 +20,7 @@ tasks.withType<PatchPluginXmlTask>().configureEach {
 intellijPlatform {
     instrumentCode = false
 
-    verifyPlugin {
+    pluginVerification {
         ides {
             // recommended() appears to resolve latest EAP for a product?
             ide(provider { IntelliJPlatformType.IntellijIdeaCommunity }, toolkitIntelliJ.version())
@@ -65,14 +65,6 @@ dependencies {
     }
 }
 
-configurations {
-    runtimeClasspath {
-        exclude(group = "com.fasterxml.jackson.core")
-        exclude(group = "com.fasterxml.jackson.module", "jackson-module-kotlin")
-        exclude(group = "com.fasterxml.jackson.dataformat", "jackson-dataformat-yaml")
-    }
-}
-
 tasks.runIde {
     systemProperty("aws.toolkit.developerMode", true)
     systemProperty("ide.plugins.snapshot.on.unload.fail", true)

gradle.properties

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.34-SNAPSHOT
+toolkitVersion=3.35-SNAPSHOT
 
 # Publish Settings
 publishToken=

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/startup/AmazonQStartupActivity.kt

@@ -19,7 +19,6 @@ import software.aws.toolkits.jetbrains.services.amazonq.project.ProjectContextCo
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindow
 import software.aws.toolkits.jetbrains.services.amazonq.toolwindow.AmazonQToolWindowFactory
 import software.aws.toolkits.jetbrains.services.codewhisperer.explorer.CodeWhispererExplorerActionManager
-import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
 import java.lang.management.ManagementFactory
 import java.time.Duration
 import java.util.concurrent.atomic.AtomicBoolean
@@ -50,26 +49,24 @@ class AmazonQStartupActivity : ProjectActivity {
         // Automatically start the project context LSP after some delay when average CPU load is below 30%.
         // The CPU load requirement is to avoid competing with native JetBrains indexing and other CPU expensive OS processes
         // In the future we will decouple LSP start and indexing start to let LSP perform other tasks.
-        if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
-            val startLspIndexingDuration = Duration.ofMinutes(30)
-            project.waitForSmartMode()
-            try {
-                withTimeout(startLspIndexingDuration) {
-                    while (true) {
-                        val cpuUsage = ManagementFactory.getOperatingSystemMXBean().systemLoadAverage
-                        if (cpuUsage > 0 && cpuUsage < 30) {
-                            ProjectContextController.getInstance(project = project)
-                            break
-                        } else {
-                            delay(60_000) // Wait for 60 seconds
-                        }
+        val startLspIndexingDuration = Duration.ofMinutes(30)
+        project.waitForSmartMode()
+        try {
+            withTimeout(startLspIndexingDuration) {
+                while (true) {
+                    val cpuUsage = ManagementFactory.getOperatingSystemMXBean().systemLoadAverage
+                    if (cpuUsage > 0 && cpuUsage < 30) {
+                        ProjectContextController.getInstance(project = project)
+                        break
+                    } else {
+                        delay(60_000) // Wait for 60 seconds
                     }
                 }
-            } catch (e: TimeoutCancellationException) {
-                LOG.warn { "Failed to start LSP server due to time out" }
-            } catch (e: Exception) {
-                LOG.warn { "Failed to start LSP server" }
             }
+        } catch (e: TimeoutCancellationException) {
+            LOG.warn { "Failed to start LSP server due to time out" }
+        } catch (e: Exception) {
+            LOG.warn { "Failed to start LSP server" }
         }
     }
 

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/CodeWhispererFeatureConfigService.kt

@@ -108,6 +108,9 @@ class CodeWhispererFeatureConfigService {
 
     fun getNewAutoTriggerUX(): Boolean = getFeatureValueForKey(NEW_AUTO_TRIGGER_UX).stringValue() == "TREATMENT"
 
+    @Suppress("UNUSED")
+    fun getInlineCompletion(): Boolean = getFeatureValueForKey(INLINE_COMPLETION).stringValue() == "TREATMENT"
+
     // Get the feature value for the given key.
     // In case of a misconfiguration, it will return a default feature value of Boolean false.
     private fun getFeatureValueForKey(name: String): FeatureValue =
@@ -117,6 +120,7 @@ class CodeWhispererFeatureConfigService {
     companion object {
         fun getInstance(): CodeWhispererFeatureConfigService = service()
         private const val TEST_FEATURE_NAME = "testFeature"
+        private const val INLINE_COMPLETION = "ProjectContextV2"
         private const val DATA_COLLECTION_FEATURE = "IDEProjectContextDataCollection"
         const val CUSTOMIZATION_ARN_OVERRIDE_NAME = "customizationArnOverride"
         private const val NEW_AUTO_TRIGGER_UX = "newAutoTriggerUX"
@@ -141,6 +145,11 @@ class CodeWhispererFeatureConfigService {
                 "CONTROL",
                 FeatureValue.builder().stringValue("CONTROL").build()
             ),
+            INLINE_COMPLETION to FeatureContext(
+                INLINE_COMPLETION,
+                "CONTROL",
+                FeatureValue.builder().stringValue("CONTROL").build()
+            )
         )
     }
 }

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/project/ProjectContextProvider.kt

@@ -38,18 +38,17 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
     private val retryCount = AtomicInteger(0)
     val isIndexComplete = AtomicBoolean(false)
     private val mapper = jacksonObjectMapper()
+
     init {
         cs.launch {
-            if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
-                while (true) {
-                    if (encoderServer.isNodeProcessRunning()) {
-                        // TODO: need better solution for this
-                        delay(10000)
-                        initAndIndex()
-                        break
-                    } else {
-                        yield()
-                    }
+            while (true) {
+                if (encoderServer.isNodeProcessRunning()) {
+                    // TODO: need better solution for this
+                    delay(10000)
+                    initAndIndex()
+                    break
+                } else {
+                    yield()
                 }
             }
         }
@@ -102,9 +101,11 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
                     if (isInitSuccess) {
                         logger.info { "project context index starting" }
                         delay(300)
-                        val isIndexSuccess = index()
-                        if (isIndexSuccess) isIndexComplete.set(true)
-                        return@launch
+                        if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
+                            val isIndexSuccess = index()
+                            if (isIndexSuccess) isIndexComplete.set(true)
+                            return@launch
+                        }
                     }
                 } catch (e: Exception) {
                     if (e.stackTraceToString().contains("Connection refused")) {