Merge branch 'main' into jurredr/update-help-message

Author: Jurredr

.changes/3.49.json

@@ -0,0 +1,8 @@
+{
+  "date" : "2025-01-17",
+  "version" : "3.49",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "/review: Improved success rate of code reviews for certain workspace configurations"
+  } ]
+}

CHANGELOG.md

@@ -1,3 +1,6 @@
+# _3.49_ (2025-01-17)
+- **(Bug Fix)** /review: Improved success rate of code reviews for certain workspace configurations
+
 # _3.48_ (2025-01-16)
 - **(Feature)** Enhance Q inline completion context fetching for better suggestion quality
 - **(Feature)** /doc: Add error message if updated README is too large

gradle.properties

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

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 40k characters
+        // Adjust the start and end offsets if necessary to ensure a total of 10k 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 = 40000
+        const val MAX_LENGTH = 10000
     }
 }
 

plugins/amazonq/codetransform/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/controller/CodeTransformChatController.kt

@@ -686,6 +686,8 @@ class CodeTransformChatController(
             is CodeModernizerJobCompletedResult.Stopped, CodeModernizerJobCompletedResult.JobAbortedBeforeStarting -> handleCodeTransformStoppedByUser()
             is CodeModernizerJobCompletedResult.JobFailed -> handleCodeTransformJobFailed(result.failureReason)
             is CodeModernizerJobCompletedResult.JobFailedInitialBuild -> handleCodeTransformJobFailedPreBuild(result)
+            is CodeModernizerJobCompletedResult.RetryableFailure -> handleCodeTransformJobFailed(result.failureReason)
+            is CodeModernizerJobCompletedResult.UnableToCreateJob -> handleCodeTransformJobFailed(result.failureReason)
             else -> {
                 if (result is CodeModernizerJobCompletedResult.ZipUploadFailed && result.failureReason is UploadFailureReason.CREDENTIALS_EXPIRED) {
                     return

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt

@@ -36,8 +36,9 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CodeAnalysisScope
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.EXPRESS_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCAN_PAYLOAD_SIZE_LIMIT_IN_BYTES
-import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCAN_TIMEOUT_IN_SECONDS
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
 import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodewhispererLanguage
 import java.io.File
@@ -67,9 +68,11 @@ class CodeScanSessionConfig(
     /**
      * Timeout for the overall job - "Run Security Scan".
      */
-    fun overallJobTimeoutInSeconds(): Long = when (scope) {
-        CodeAnalysisScope.FILE -> FILE_SCAN_TIMEOUT_IN_SECONDS
-        else -> DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
+    fun overallJobTimeoutInSeconds(): Long {
+        if (scope == CodeAnalysisScope.FILE && !initiatedByChat) {
+            return EXPRESS_SCAN_TIMEOUT_IN_SECONDS
+        }
+        return DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
     }
 
     fun getPayloadLimitInBytes(): Long = when (scope) {
@@ -106,7 +109,7 @@ class CodeScanSessionConfig(
                 null -> getProjectPayloadMetadata()
                 else -> when (scope) {
                     CodeAnalysisScope.PROJECT -> getProjectPayloadMetadata()
-                    CodeAnalysisScope.FILE -> if (selectedFile.path.startsWith(projectRoot.path)) {
+                    CodeAnalysisScope.FILE -> if (selectedFile.isWithin(projectRoot)) {
                         getFilePayloadMetadata(selectedFile, true)
                     } else {
                         projectRoot = selectedFile.parent

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

@@ -76,7 +76,7 @@ object CodeWhispererConstants {
     const val FILE_SCAN_INITIAL_POLLING_INTERVAL_IN_SECONDS: Long = 10
     const val PROJECT_SCAN_INITIAL_POLLING_INTERVAL_IN_SECONDS: Long = 30
     const val CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS: Long = 10
-    const val FILE_SCAN_TIMEOUT_IN_SECONDS: Long = 60 * 10 // 10 minutes
+    const val EXPRESS_SCAN_TIMEOUT_IN_SECONDS: Long = 60
     const val FILE_SCAN_PAYLOAD_SIZE_LIMIT_IN_BYTES: Long = 1024 * 200 // 200KB
     const val AUTO_SCAN_DEBOUNCE_DELAY_IN_SECONDS: Long = 30
     const val CODE_FIX_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS: Long = 10

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

@@ -12,6 +12,7 @@ import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.impl.EditorImpl
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.vfs.VfsUtil
+import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.wm.WindowManager
 import com.intellij.ui.ComponentUtil
@@ -152,6 +153,8 @@ fun VirtualFile.toCodeChunk(path: String): Sequence<Chunk> = sequence {
     }
 }
 
+fun VirtualFile.isWithin(ancestor: VirtualFile): Boolean = VfsUtilCore.isAncestor(ancestor, this, false)
+
 object CodeWhispererUtil {
     fun getCompletionType(completion: Completion): CodewhispererCompletionType {
         val content = completion.content()

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

@@ -24,6 +24,7 @@ import software.aws.toolkits.jetbrains.core.region.MockRegionProviderRule
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getCompletionType
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getTelemetryOptOutPreference
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getUnmodifiedAcceptedCharsCount
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.runIfIdcConnectionOrTelemetryEnabled
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.toCodeChunk
 import software.aws.toolkits.jetbrains.settings.AwsSettings
@@ -237,4 +238,25 @@ class CodeWhispererUtilTest {
         unmodifiedCharsCount = getUnmodifiedAcceptedCharsCount(originalRecommendation, modifiedRecommendation)
         assertThat(unmodifiedCharsCount).isEqualTo(originalRecommendation.length)
     }
+
+    @Test
+    fun `test isWithin() returns true if file is within the given directory`() {
+        val projectRoot = fixture.tempDirFixture.findOrCreateDir("workspace/projectA")
+        val file = fixture.addFileToProject("workspace/projectA/src/Sample.java", "").virtualFile
+        assertThat(file.isWithin(projectRoot)).isTrue()
+    }
+
+    @Test
+    fun `test isWithin() returns false if file is not within the given directory`() {
+        val projectRoot = fixture.tempDirFixture.findOrCreateDir("workspace/projectA")
+        val file = fixture.addFileToProject("workspace/projectB/src/Sample.java", "").virtualFile
+        assertThat(file.isWithin(projectRoot)).isFalse()
+    }
+
+    @Test
+    fun `test isWithin() returns false if file is not within the given directory but has the same prefix`() {
+        val projectRoot = fixture.tempDirFixture.findOrCreateDir("workspace/projectA")
+        val file = fixture.addFileToProject("workspace/projectA1/src/Sample.java", "").virtualFile
+        assertThat(file.isWithin(projectRoot)).isFalse()
+    }
 }