Merge remote-tracking branch 'upstream/main' into lsp-client

Author: Will-ShaoHua

plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonq/workspace/context/ProjectContextProviderTest.kt

@@ -109,6 +109,7 @@ class ProjectContextProviderTest {
     fun `Lsp endpoint correctness`() {
         assertThat(LspMessage.Initialize.endpoint).isEqualTo("initialize")
         assertThat(LspMessage.Index.endpoint).isEqualTo("buildIndex")
+        assertThat(LspMessage.Index.endpoint).isEqualTo("indexFiles")
         assertThat(LspMessage.UpdateIndex.endpoint).isEqualTo("updateIndexV2")
         assertThat(LspMessage.QueryChat.endpoint).isEqualTo("query")
         assertThat(LspMessage.QueryInlineCompletion.endpoint).isEqualTo("queryInlineProjectContext")
@@ -141,29 +142,13 @@ class ProjectContextProviderTest {
         )
     }
 
-    @Test
-    fun `updateIndex will not send message to lsp if index is not complete`() {
-        sut.isIndexComplete.set(false)
-
-        sut.updateIndex(listOf("foo.java"), ProjectContextProvider.IndexUpdateMode.UPDATE)
-
-        assertThat(wireMock.allServeEvents).isEmpty()
-        wireMock.verify(
-            0,
-            postRequestedFor(urlPathEqualTo("/updateIndexV2"))
-                .withHeader("Content-Type", equalTo("text/plain"))
-        )
-    }
-
     @Test
     fun `updateIndex should send correct encrypted request to lsp`() {
-        sut.isIndexComplete.set(true)
-
         sut.updateIndex(listOf("foo.java"), ProjectContextProvider.IndexUpdateMode.UPDATE)
         val request = UpdateIndexRequest(listOf("foo.java"), ProjectContextProvider.IndexUpdateMode.UPDATE.value)
         val requestJson = mapper.writeValueAsString(request)
 
-        assertThat(mapper.readTree(requestJson)).isEqualTo(mapper.readTree("""{ "filePaths": ["foo.java"], "mode": "update" }"""))
+        assertThat(mapper.readTree(requestJson)).isEqualTo(mapper.readTree("""{ "filePath": "foo.java" }"""))
 
         val encryptedRequest = encoderServer.encrypt(requestJson)
 
@@ -349,6 +334,7 @@ class ProjectContextProviderTest {
     private fun createMockServer() = WireMockRule(wireMockConfig().dynamicPort())
 }
 
+// language=JSON
 val validQueryInlineResponse = """
                             [
                                 {
@@ -369,6 +355,7 @@ val validQueryInlineResponse = """
                             ]    
 """.trimIndent()
 
+// language=JSON
 val validQueryChatResponse = """
                             [
                                 {
@@ -406,9 +393,10 @@ val validQueryChatResponse = """
                             ]
 """.trimIndent()
 
+// language=JSON
 val validGetUsageResponse = """
                                 {
-                                "memoryUsage":123,
-                                "cpuUsage":456
+                                  "memoryUsage":123,
+                                  "cpuUsage":456
                                 } 
 """.trimIndent()

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

@@ -84,19 +84,24 @@ abstract class CodeWhispererFileCrawler : FileCrawler {
     }.orEmpty()
 
     override fun listCrossFileCandidate(target: PsiFile): List<VirtualFile> {
-        val targetFile = target.viewProvider.virtualFile
+        /**
+         * [PsiFile.getVirtualFile]
+         * PsiFile.virtualFile will return the virtual file, or null if the file exists only in memory
+         * If you want to get a non-null virtual file consider using FileViewProvider. getVirtualFile()
+         */
+        val targetVirtualFile = target.virtualFile ?: target.viewProvider.virtualFile
 
         val openedFiles = runReadAction {
             FileEditorManager.getInstance(target.project).openFiles.toList().filter {
-                it.name != targetFile.name &&
+                it.name != targetVirtualFile.name &&
                     isSameDialect(it.extension) &&
                     !isTestFile(it, target.project)
             }
         }
 
         val fileToFileDistanceList = runReadAction {
             openedFiles.map {
-                return@map it to CodeWhispererFileCrawler.getFileDistance(fileA = targetFile, fileB = it)
+                return@map it to CodeWhispererFileCrawler.getFileDistance(fileA = targetVirtualFile, fileB = it)
             }
         }
 

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

@@ -375,19 +375,6 @@ class CodeWhispererFileContextProviderTest {
         )
     }
 
-    /**
-     * - src/
-     *     - java/
-     *          - Main.java
-     *          - Util.java
-     *          - controllers/
-     *              -MyApiController.java
-     * - tst/
-     *     - java/
-     *          - MainTest.java
-     *
-     */
-    // TODO: fix this test, in test env, psiFile.virtualFile == null @psiGist.getFileData(psiFile) { psiFile -> ... }
     @Test
     fun `extractSupplementalFileContext from src file should extract src`() = runTest {
         val queryPsi = fixture.addFileToProject("Query.java", SampleCase.query)
@@ -418,6 +405,11 @@ class CodeWhispererFileContextProviderTest {
         val fileContext = readAction { sut.extractFileContext(fixture.editor, queryPsi) }
         val supplementalContext = sut.extractSupplementalFileContext(queryPsi, fileContext, timeout = 50)
 
+        assertThat(supplementalContext?.contents)
+            .isNotNull
+            .isNotEmpty
+            .hasSize(3)
+
         assertThat(supplementalContext?.contents)
             .isNotNull
             .isNotEmpty

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

@@ -10,7 +10,6 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.project.BaseProjectDirectories.Companion.getBaseDirectories
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.vfs.VirtualFileVisitor
@@ -133,7 +132,7 @@ class ProjectContextProvider(val project: Project, private val encoderServer: En
     }
 
     fun index(): Boolean {
-        val projectRoot = project.guessProjectDir()?.path ?: return false
+        val projectRoot = project.basePath ?: return false
 
         val indexStartTime = System.currentTimeMillis()
         val filesResult = collectFiles()