feat(amazonq): switch to relative path for inline Completion API field (#5543)

Author: leigaol

packages/amazonq/test/unit/codewhisperer/util/editorContext.test.ts

@@ -2,16 +2,23 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 import assert from 'assert'
 import * as codewhispererClient from 'aws-core-vscode/codewhisperer'
 import * as EditorContext from 'aws-core-vscode/codewhisperer'
-import { createMockTextEditor, createMockClientRequest, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
+import {
+    createMockTextEditor,
+    createMockClientRequest,
+    resetCodeWhispererGlobalVariables,
+    openATextEditorWithText,
+    createTestWorkspaceFolder,
+    closeAllEditors,
+} from 'aws-core-vscode/test'
 import { globals } from 'aws-core-vscode/shared'
 import { GenerateCompletionsRequest } from 'aws-core-vscode/codewhisperer'
 
 describe('editorContext', function () {
     let telemetryEnabledDefault: boolean
+    let tempFolder: string
 
     beforeEach(async function () {
         await resetCodeWhispererGlobalVariables()
@@ -66,15 +73,19 @@ describe('editorContext', function () {
             assert.strictEqual(actual, expected)
         })
 
-        it('Should return expected filename for a long filename', function () {
+        it('Should return expected filename for a long filename', async function () {
             const editor = createMockTextEditor('', 'a'.repeat(1500), 'python', 1, 17)
             const actual = EditorContext.getFileName(editor)
             const expected = 'a'.repeat(1024)
             assert.strictEqual(actual, expected)
         })
     })
 
-    describe('getfileNameForRequest', function () {
+    describe('getFileRelativePath', function () {
+        this.beforeEach(async function () {
+            tempFolder = (await createTestWorkspaceFolder()).uri.fsPath
+        })
+
         it('Should return a new filename with correct extension given a .ipynb file', function () {
             const languageToExtension = new Map<string, string>([
                 ['python', 'py'],
@@ -86,11 +97,22 @@ describe('editorContext', function () {
 
             languageToExtension.forEach((extension, language) => {
                 const editor = createMockTextEditor('', 'test.ipynb', language, 1, 17)
-                const actual = EditorContext.getFileNameForRequest(editor)
+                const actual = EditorContext.getFileRelativePath(editor)
                 const expected = 'test.' + extension
                 assert.strictEqual(actual, expected)
             })
         })
+
+        it('Should return relative path', async function () {
+            const editor = await openATextEditorWithText('tttt', 'test.py', tempFolder)
+            const actual = EditorContext.getFileRelativePath(editor)
+            const expected = 'test.py'
+            assert.strictEqual(actual, expected)
+        })
+
+        afterEach(async function () {
+            await closeAllEditors()
+        })
     })
 
     describe('validateRequest', function () {

packages/core/src/codewhisperer/util/editorContext.ts

@@ -38,33 +38,15 @@ export function extractContextForCodeWhisperer(editor: vscode.TextEditor): codew
             document.positionAt(offset + CodeWhispererConstants.charactersLimit)
         )
     )
-    if (checkLeftContextKeywordsForJsonAndYaml(caretLeftFileContext, editor.document.languageId)) {
-        return {
-            filename: getFileNameForRequest(editor),
-            programmingLanguage: {
-                languageName: 'plaintext',
-            },
-            leftFileContent: caretLeftFileContext,
-            rightFileContent: caretRightFileContext,
-        } as codewhispererClient.FileContext
-    }
-
-    if (checkLeftContextKeywordsForJsonAndYaml(caretLeftFileContext, editor.document.languageId)) {
-        return {
-            filename: getFileNameForRequest(editor),
-            programmingLanguage: {
-                languageName: 'plaintext',
-            },
-            leftFileContent: caretLeftFileContext,
-            rightFileContent: caretRightFileContext,
-        } as codewhispererClient.FileContext
+    let languageName = 'plaintext'
+    if (!checkLeftContextKeywordsForJsonAndYaml(caretLeftFileContext, editor.document.languageId)) {
+        languageName =
+            runtimeLanguageContext.normalizeLanguage(editor.document.languageId) ?? editor.document.languageId
     }
-
     return {
-        filename: getFileNameForRequest(editor),
+        filename: getFileRelativePath(editor),
         programmingLanguage: {
-            languageName:
-                runtimeLanguageContext.normalizeLanguage(editor.document.languageId) ?? editor.document.languageId,
+            languageName: languageName,
         },
         leftFileContent: caretLeftFileContext,
         rightFileContent: caretRightFileContext,
@@ -76,19 +58,27 @@ export function getFileName(editor: vscode.TextEditor): string {
     return fileName.substring(0, CodeWhispererConstants.filenameCharsLimit)
 }
 
-export function getFileNameForRequest(editor: vscode.TextEditor): string {
+export function getFileRelativePath(editor: vscode.TextEditor): string {
     const fileName = path.basename(editor.document.fileName)
-
+    let relativePath = ''
+    const workspaceFolder = vscode.workspace.getWorkspaceFolder(editor.document.uri)
+    if (!workspaceFolder) {
+        relativePath = fileName
+    } else {
+        const workspacePath = workspaceFolder.uri.fsPath
+        const filePath = editor.document.uri.fsPath
+        relativePath = path.relative(workspacePath, filePath)
+    }
     // For notebook files, we want to use the programming language for each cell for the code suggestions, so change
     // the filename sent in the request to reflect that language
-    if (fileName.endsWith('.ipynb')) {
+    if (relativePath.endsWith('.ipynb')) {
         const fileExtension = runtimeLanguageContext.getLanguageExtensionForNotebook(editor.document.languageId)
         if (fileExtension !== undefined) {
-            const filenameWithNewExtension = fileName.substring(0, fileName.length - 5) + fileExtension
+            const filenameWithNewExtension = relativePath.substring(0, relativePath.length - 5) + fileExtension
             return filenameWithNewExtension.substring(0, CodeWhispererConstants.filenameCharsLimit)
         }
     }
-    return fileName.substring(0, CodeWhispererConstants.filenameCharsLimit)
+    return relativePath.substring(0, CodeWhispererConstants.filenameCharsLimit)
 }
 
 export async function buildListRecommendationRequest(