fix(amazonq): Crossfile query config not configured correctly (#5028)

Author: Will-ShaoHua

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

@@ -379,8 +379,12 @@ class DefaultCodeWhispererFileContextProvider(private val project: Project) : Fi
         }
     }
 
-    // takeLast(11) will extract 10 lines (exclusing current line) of left context as the query parameter
-    fun generateQuery(fileContext: FileContextInfo) = fileContext.caretContext.leftFileContext.split("\n").takeLast(11).joinToString("\n")
+    // takeLast NUMBER_OF_LINE_IN_CHUNK of lines (exclusing current line) in left context as the query
+    fun generateQuery(fileContext: FileContextInfo) = fileContext.caretContext.leftFileContext
+        .split("\n")
+        .dropLast(1)
+        .takeLast(CodeWhispererConstants.CrossFile.NUMBER_OF_LINE_IN_CHUNK)
+        .joinToString("\n")
 
     companion object {
         private val LOG = getLogger<DefaultCodeWhispererFileContextProvider>()

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

@@ -31,6 +31,7 @@ import org.mockito.kotlin.stub
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
+import software.aws.toolkits.core.utils.test.aStringWithLineCount
 import software.aws.toolkits.jetbrains.services.amazonq.CodeWhispererFeatureConfigService
 import software.aws.toolkits.jetbrains.services.amazonq.project.EncoderServer
 import software.aws.toolkits.jetbrains.services.amazonq.project.InlineBm25Chunk
@@ -47,6 +48,8 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererRuby
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererTsx
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererTypeScript
+import software.aws.toolkits.jetbrains.services.codewhisperer.model.CaretContext
+import software.aws.toolkits.jetbrains.services.codewhisperer.model.FileContextInfo
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CrossFileStrategy
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.DefaultCodeWhispererFileContextProvider
@@ -94,6 +97,44 @@ class CodeWhispererFileContextProviderTest {
         project.replaceService(ProjectContextController::class.java, mockProjectContext, disposableRule.disposable)
     }
 
+    @Test
+    fun `generateQuery should use last 50 lines (excluding the current line) of left context`() {
+        val fileContext = FileContextInfo(
+            CaretContext(
+                leftFileContext = aStringWithLineCount(100),
+                rightFileContext = "",
+                leftContextOnCurrentLine = ""
+            ),
+            "Foo.java",
+            CodeWhispererJava.INSTANCE,
+            ""
+        )
+
+        val actual = sut.generateQuery(fileContext)
+        val expected = aStringWithLineCount(lineCount = 50, start = 49)
+        assertThat(actual).isEqualTo(expected)
+        assertThat(actual.split("\n").size).isEqualTo(expected.split("\n").size)
+    }
+
+    @Test
+    fun `generateQuery should use last 50 lines (excluding the current line) of left context if current caret is at the beginning of the line`() {
+        val fileContext = FileContextInfo(
+            CaretContext(
+                leftFileContext = aStringWithLineCount(100) + "\n",
+                rightFileContext = "",
+                leftContextOnCurrentLine = ""
+            ),
+            "Foo.java",
+            CodeWhispererJava.INSTANCE,
+            ""
+        )
+
+        val actual = sut.generateQuery(fileContext)
+        val expected = aStringWithLineCount(lineCount = 50, start = 50)
+        assertThat(actual).isEqualTo(expected)
+        assertThat(actual.split("\n").size).isEqualTo(expected.split("\n").size)
+    }
+
     @Test
     fun `extractSupplementalFileContext should timeout 50ms`() = runTest {
         featureConfigService.stub { on { getInlineCompletion() } doReturn false }