feat(amazonq): more programming languages for workspace index #5459

Author: leigaol

packages/amazonq/.changes/next-release/Feature-fe345557-1053-4096-a3f7-f1b11d982a49.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Support more programming languages for workspace index"
+}

packages/core/src/amazonq/lsp/lspController.ts

@@ -67,7 +67,7 @@ export interface Manifest {
 }
 const manifestUrl = 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json'
 // this LSP client in Q extension is only going to work with these LSP server versions
-const supportedLspServerVersions = ['0.1.3']
+const supportedLspServerVersions = ['0.1.4']
 
 const nodeBinName = process.platform === 'win32' ? 'node.exe' : 'node'
 /*

packages/core/src/shared/utilities/workspaceUtils.ts

@@ -559,7 +559,7 @@ export async function collectFilesForIndex(
 
     const isLanguageSupported = (filename: string) => {
         const k =
-            /\.(js|ts|java|py|rb|cpp|tsx|jsx|cc|c|h|html|json|css|md|php|swift|rs|scala|yaml|tf|sql|sh|go|yml|kt|smithy|config|kts|gradle|cfg|xml|vue)$/i
+            /\.(js|ts|java|py|rb|cpp|tsx|jsx|cc|c|cs|vb|pl|r|m|hs|mts|mjs|h|clj|dart|groovy|lua|rb|jl|ipynb|html|json|css|md|php|swift|rs|scala|yaml|tf|sql|sh|go|yml|kt|smithy|config|kts|gradle|cfg|xml|vue)$/i
         return k.test(filename) || filename.endsWith('Config')
     }
 

packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts

@@ -10,6 +10,7 @@ import * as vscode from 'vscode'
 import * as fs from 'fs'
 import {
     collectFiles,
+    collectFilesForIndex,
     findParentProjectFile,
     getWorkspaceFoldersByPrefixes,
     getWorkspaceRelativePath,
@@ -426,3 +427,75 @@ describe('getWorkspaceFoldersByPrefixes', function () {
         )
     })
 })
+
+describe('collectFilesForIndex', function () {
+    it('returns all files in the workspace not excluded by gitignore and is a supported programming language', async function () {
+        // these variables are a manual selection of settings for the test in order to test the collectFiles function
+        const fileAmount = 3
+        const fileNamePrefix = 'file'
+        const fileContent = 'test content'
+
+        const workspaceFolder = await createTestWorkspace(fileAmount, { fileNamePrefix, fileContent })
+
+        const writeFile = (pathParts: string[], fileContent: string) => {
+            return toFile(fileContent, workspaceFolder.uri.fsPath, ...pathParts)
+        }
+
+        sinon.stub(vscode.workspace, 'workspaceFolders').value([workspaceFolder])
+        const gitignoreContent = `file2
+            # different formats of prefixes
+            /build
+            node_modules
+
+            #some comment
+
+            range_file[0-5]
+            `
+        await writeFile(['.gitignore'], gitignoreContent)
+
+        await writeFile(['build', `ignored1`], fileContent)
+        await writeFile(['build', `ignored2`], fileContent)
+
+        await writeFile(['node_modules', `ignored1`], fileContent)
+        await writeFile(['node_modules', `ignored2`], fileContent)
+
+        await writeFile([`range_file0`], fileContent)
+        await writeFile([`range_file9`], fileContent)
+
+        const gitignore2 = 'folder1\n'
+        await writeFile(['src', '.gitignore'], gitignore2)
+        await writeFile(['src', 'folder2', 'a.js'], fileContent)
+        await writeFile(['src', 'folder2', 'b.cs'], fileContent)
+        await writeFile(['src', 'folder2', 'c.bin'], fileContent)
+        await writeFile(['src', 'folder2', 'd.pyc'], fileContent)
+
+        const gitignore3 = `negate_test*
+            !negate_test[0-5]`
+        await writeFile(['src', 'folder3', '.gitignore'], gitignore3)
+        await writeFile(['src', 'folder3', 'negate_test1'], fileContent)
+        await writeFile(['src', 'folder3', 'negate_test6'], fileContent)
+
+        const result = (await collectFilesForIndex([workspaceFolder.uri.fsPath], [workspaceFolder], true))
+            // for some reason, uri created inline differ in subfields, so skipping them from assertion
+            .map(({ fileUri, ...r }) => ({ ...r }))
+
+        result.sort((l, r) => l.relativeFilePath.localeCompare(r.relativeFilePath))
+
+        // non-posix filePath check here is important.
+        assert.deepStrictEqual(
+            [
+                {
+                    workspaceFolder,
+                    relativeFilePath: path.join('src', 'folder2', 'a.js'),
+                    fileSizeBytes: 12,
+                },
+                {
+                    workspaceFolder,
+                    relativeFilePath: path.join('src', 'folder2', 'b.cs'),
+                    fileSizeBytes: 12,
+                },
+            ] satisfies typeof result,
+            result
+        )
+    })
+})