Merge branch 'feature/q-lsp' into samgst/lsp-fileUtil

Author: samgst-amazon

.changes/next-release/bugfix-1a22ff93-2d99-4527-a73b-26dba66c4f71.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix suggestion not visible in remote for 2024.3"
+}

.changes/next-release/bugfix-2d7fabbf-8b6b-4a9d-8764-fb0286a5ea23.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/test: update capability card text"
+}

.changes/next-release/bugfix-8878216c-a256-4459-80de-8334711c8d53.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /doc: Fix uploading file method throwing incorrect workspace too large error message"
+}

.changes/next-release/bugfix-ce55123f-2437-4740-b9c8-c1069856e316.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/transform: skip running tests locally when user chooses to do so"
+}

buildspec/windowsTests.yml

@@ -8,6 +8,12 @@ env:
 phases:
   install:
     commands:
+      # force install java21 while we work throuh path issues
+      - |
+        $javaName = "C:\Program Files\Amazon Corretto" | ForEach-Object {
+          ls $_ | Where-Object {$_ -Like "jdk*"} | Sort-Object -Descending -Property Name | Select-Object -first 1 -expandproperty Name
+        }
+        $JAVA_HOME = "C:\Program Files\Amazon Corretto\$javaName"
       - |
         if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
             [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
@@ -21,6 +27,8 @@ phases:
         # See https://github.com/NuGet/NuGet.Client/pull/4259
         $Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000"
 
+        $Env:JAVA_HOME = $JAVA_HOME
+
         if ($Env:CODEARTIFACT_DOMAIN_NAME -and $Env:CODEARTIFACT_REPO_NAME) {
           $Env:CODEARTIFACT_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format maven --query repositoryEndpoint --output text
           # $Env:CODEARTIFACT_NUGET_URL=aws codeartifact get-repository-endpoint --domain $Env:CODEARTIFACT_DOMAIN_NAME --repository $Env:CODEARTIFACT_REPO_NAME --format nuget --query repositoryEndpoint --output text

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/common/util/AmazonQCodeGenService.kt

@@ -20,6 +20,7 @@ import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.common.clients.AmazonQCodeGenerateClient
 import software.aws.toolkits.jetbrains.common.session.Intent
+import software.aws.toolkits.jetbrains.services.amazonqDoc.docServiceError
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.DocGenerationStreamResult
 import software.aws.toolkits.jetbrains.services.amazonqDoc.session.ExportDocTaskAssistResultArchiveStreamResult
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.CodeIterationLimitException
@@ -31,6 +32,7 @@ import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.FeatureDevOper
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.MonthlyConversationLimitError
 import software.aws.toolkits.jetbrains.services.amazonqFeatureDev.ZipFileCorruptedException
 import software.aws.toolkits.jetbrains.services.cwc.controller.chat.telemetry.getStartUrl
+import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.AmazonqTelemetry
 import software.aws.toolkits.telemetry.MetricResult
 
@@ -82,7 +84,7 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
         }
     }
 
-    fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String):
+    fun createUploadUrl(conversationId: String, contentChecksumSha256: String, contentLength: Long, uploadId: String, featureName: String? = null):
         CreateUploadUrlResponse {
         try {
             logger.debug { "Executing createUploadUrl with conversationId $conversationId" }
@@ -104,6 +106,9 @@ class AmazonQCodeGenService(val proxyClient: AmazonQCodeGenerateClient, val proj
                 logger.warn(e) { "Create UploadUrl failed for request: ${e.requestId()}" }
 
                 if (e is ValidationException && e.message?.contains("Invalid contentLength") == true) {
+                    if (featureName?.equals("docGeneration") == true) {
+                        throw docServiceError(message("amazonqDoc.exception.content_length_error"))
+                    }
                     throw ContentLengthException(operation = FeatureDevOperation.CreateUploadUrl.toString(), desc = null, cause = e.cause)
                 }
             }

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqDoc/session/PrepareDocGenerationState.kt

@@ -48,7 +48,8 @@ class PrepareDocGenerationState(
                 config.conversationId,
                 zipFileChecksum,
                 zipFileLength,
-                uploadId
+                uploadId,
+                "docGeneration"
             )
 
             uploadArtifactToS3(

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

@@ -32,12 +32,10 @@ import kotlinx.coroutines.job
 import kotlinx.coroutines.withContext
 import migration.software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
 import software.amazon.awssdk.services.codewhispererstreaming.model.UserIntent
-import software.aws.toolkits.core.utils.debug
 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.services.amazonq.CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT
 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
@@ -140,7 +138,6 @@ class ChatController private constructor(
         val triggerId = UUID.randomUUID().toString()
         var shouldAddIndexInProgressMessage: Boolean = false
         var shouldUseWorkspaceContext: Boolean = false
-        val startUrl = getStartUrl(context.project)
 
         if (prompt.contains("@workspace")) {
             if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
@@ -153,13 +150,6 @@ class ChatController private constructor(
             } else {
                 sendOpenSettingsMessage(message.tabId)
             }
-        } else if (CodeWhispererSettings.getInstance().isProjectContextEnabled()) {
-            if (ProjectContextController.getInstance(context.project).getProjectContextIndexComplete()) {
-                val projectContextController = ProjectContextController.getInstance(context.project)
-                queryResult = projectContextController.queryChat(prompt, timeout = CHAT_IMPLICIT_PROJECT_CONTEXT_TIMEOUT)
-            } else {
-                logger.debug { "skipping implicit workspace context as index is not ready" }
-            }
         }
 
         handleChat(

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/cwc/editor/context/focusArea/FocusAreaContextExtractor.kt

@@ -180,7 +180,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
         val startOffset = 0.coerceAtLeast(offset - halfMaxCharacters)
         val endOffset = fileText.length.coerceAtMost(offset + halfMaxCharacters)
 
-        // Adjust the start and end offsets if necessary to ensure a total of 10k characters
+        // Adjust the start and end offsets if necessary to ensure a total of 40k characters
         val excessCharacters = maxCharacters - (endOffset - startOffset)
         val adjustedStartOffset = 0.coerceAtLeast(startOffset - excessCharacters)
         val adjustedEndOffset = fileText.length.coerceAtMost(endOffset + excessCharacters)
@@ -198,7 +198,7 @@ class FocusAreaContextExtractor(private val fqnWebviewAdapter: FqnWebviewAdapter
     }
 
     companion object {
-        const val MAX_LENGTH = 10000
+        const val MAX_LENGTH = 40000
     }
 }
 

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

@@ -204,14 +204,14 @@ private val selectSkipTestsFlagFormItem = FormItem(
     title = message("codemodernizer.chat.form.user_selection.item.choose_skip_tests_option"),
     mandatory = true,
     options = listOf(
+        FormItemOption(
+            label = message("codemodernizer.chat.message.skip_tests_form.skip"),
+            value = message("codemodernizer.chat.message.skip_tests_form.skip"),
+        ),
         FormItemOption(
             label = message("codemodernizer.chat.message.skip_tests_form.run_tests"),
             value = message("codemodernizer.chat.message.skip_tests_form.run_tests"),
         ),
-        FormItemOption(
-            label = message("codemodernizer.chat.message.skip_tests_form.skip"),
-            value = message("codemodernizer.chat.message.skip_tests_form.skip"),
-        )
     )
 )