fix(amazonq): zip entry contains invalid characters (aws#5274)

* fix(amazonq): zip entry contains invalid characters

* refactor

Author: ctlai95

.changes/next-release/bugfix-02a84512-83ae-4fbe-a527-292ba072e3e0.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/review: Improved success rate of code reviews for certain workspace configurations"
+}

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

@@ -38,6 +38,7 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhisperer
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
 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
@@ -106,7 +107,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/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()
+    }
 }