Merge pull request #7347 from aws/autoMerge/feature/flare-mega

Merge master into feature/flare-mega

Author: opieter-aws

packages/amazonq/src/lsp/lspInstaller.ts

@@ -3,12 +3,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { fs, getNodeExecutableName, BaseLspInstaller, ResourcePaths } from 'aws-core-vscode/shared'
+import { fs, getNodeExecutableName, getRgExecutableName, BaseLspInstaller, ResourcePaths } from 'aws-core-vscode/shared'
 import path from 'path'
 import { ExtendedAmazonQLSPConfig, getAmazonQLspConfig } from './config'
 
 export interface AmazonQResourcePaths extends ResourcePaths {
     ui: string
+    /**
+     * Path to `rg` (or `rg.exe`) executable/binary.
+     * Example: `"<cachedir>/aws/toolkits/language-servers/AmazonQ/3.3.0/servers/rg"`
+     */
+    ripGrep: string
 }
 
 export class AmazonQLspInstaller extends BaseLspInstaller.BaseLspInstaller<
@@ -22,21 +27,27 @@ export class AmazonQLspInstaller extends BaseLspInstaller.BaseLspInstaller<
     protected override async postInstall(assetDirectory: string): Promise<void> {
         const resourcePaths = this.resourcePaths(assetDirectory)
         await fs.chmod(resourcePaths.node, 0o755)
+        if (await fs.exists(resourcePaths.ripGrep)) {
+            await fs.chmod(resourcePaths.ripGrep, 0o755)
+        }
     }
 
     protected override resourcePaths(assetDirectory?: string): AmazonQResourcePaths {
         if (!assetDirectory) {
             return {
                 lsp: this.config.path ?? '',
                 node: getNodeExecutableName(),
+                ripGrep: `ripgrep/${getRgExecutableName()}`,
                 ui: this.config.ui ?? '',
             }
         }
 
         const nodePath = path.join(assetDirectory, `servers/${getNodeExecutableName()}`)
+        const rgPath = path.join(assetDirectory, `servers/ripgrep/${getRgExecutableName()}`)
         return {
             lsp: path.join(assetDirectory, 'servers/aws-lsp-codewhisperer.js'),
             node: nodePath,
+            ripGrep: rgPath,
             ui: path.join(assetDirectory, 'clients/amazonq-ui.js'),
         }
     }

packages/core/src/codewhisperer/client/service-2.json

@@ -612,11 +612,20 @@
                 "filename": {
                     "shape": "FileContextFilenameString"
                 },
+                "fileUri": {
+                    "shape": "FileContextFileUriString"
+                },
                 "programmingLanguage": {
                     "shape": "ProgrammingLanguage"
                 }
             }
         },
+        "FileContextFileUriString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
         "FileContextFilenameString": {
             "type": "string",
             "max": 1024,

packages/core/src/codewhisperer/client/user-service-2.json

@@ -1852,9 +1852,16 @@
                 "leftFileContent": { "shape": "FileContextLeftFileContentString" },
                 "rightFileContent": { "shape": "FileContextRightFileContentString" },
                 "filename": { "shape": "FileContextFilenameString" },
+                "fileUri": { "shape": "FileContextFileUriString" },
                 "programmingLanguage": { "shape": "ProgrammingLanguage" }
             }
         },
+        "FileContextFileUriString": {
+            "type": "string",
+            "max": 1024,
+            "min": 1,
+            "sensitive": true
+        },
         "FileContextFilenameString": {
             "type": "string",
             "max": 1024,

packages/core/src/shared/lsp/utils/platform.ts

@@ -13,6 +13,10 @@ export function getNodeExecutableName(): string {
     return process.platform === 'win32' ? 'node.exe' : 'node'
 }
 
+export function getRgExecutableName(): string {
+    return process.platform === 'win32' ? 'rg.exe' : 'rg'
+}
+
 /**
  * Get a json payload that will be sent to the language server, who is waiting to know what the encryption key is.
  * Code reference: https://github.com/aws/language-servers/blob/7da212185a5da75a72ce49a1a7982983f438651a/client/vscode/src/credentialsActivation.ts#L77