feat(amazonq): send relative file path for inline completion

Author: Jiatong Li

server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.test.ts

@@ -41,10 +41,12 @@ import {
     SINGLE_LINE_FILE_CUTOFF_INDEX,
     SOME_CLOSED_FILE,
     SOME_FILE,
+    SOME_FILE_UNDER_WORKSPACE_FOLDER,
     SOME_FILE_WITH_ALT_CASED_LANGUAGE_ID,
     SOME_FILE_WITH_EXTENSION,
     SOME_SINGLE_LINE_FILE,
     SOME_UNSUPPORTED_FILE,
+    SOME_WORKSPACE_FOLDER,
     SPECIAL_CHARACTER_HELLO_WORLD,
     stubCodeWhispererService,
 } from '../../shared/testUtils'
@@ -55,6 +57,7 @@ import { LocalProjectContextController } from '../../shared/localProjectContextC
 import { URI } from 'vscode-uri'
 import { INVALID_TOKEN } from '../../shared/constants'
 import { AmazonQError, AmazonQServiceConnectionExpiredError } from '../../shared/amazonQServiceManager/errors'
+import * as path from 'path'
 
 const updateConfiguration = async (
     features: TestFeatures,
@@ -148,6 +151,7 @@ describe('CodeWhisperer Server', () => {
                 .openDocument(SOME_UNSUPPORTED_FILE)
                 .openDocument(SOME_FILE_WITH_EXTENSION)
                 .openDocument(SOME_SINGLE_LINE_FILE)
+                .openDocument(SOME_FILE_UNDER_WORKSPACE_FOLDER)
         })
 
         afterEach(() => {
@@ -245,6 +249,35 @@ describe('CodeWhisperer Server', () => {
             )
         })
 
+        it('should correctly get filename', async () => {
+            features.workspace.getWorkspaceFolder
+                .withArgs(SOME_FILE_UNDER_WORKSPACE_FOLDER.uri)
+                .returns(SOME_WORKSPACE_FOLDER)
+            const result = await features.doInlineCompletionWithReferences(
+                {
+                    textDocument: { uri: SOME_FILE_UNDER_WORKSPACE_FOLDER.uri },
+                    position: { line: 0, character: 0 },
+                    context: { triggerKind: InlineCompletionTriggerKind.Invoked },
+                },
+                CancellationToken.None
+            )
+
+            // Check the completion result
+            assert.deepEqual(result, EXPECTED_RESULT)
+
+            const expectedGenerateSuggestionsRequest = {
+                fileContext: {
+                    fileUri: SOME_FILE_UNDER_WORKSPACE_FOLDER.uri,
+                    filename: path.relative(SOME_WORKSPACE_FOLDER.uri, SOME_FILE_UNDER_WORKSPACE_FOLDER.uri),
+                    programmingLanguage: { languageName: 'csharp' },
+                    leftFileContent: '',
+                    rightFileContent: HELLO_WORLD_IN_CSHARP,
+                },
+                maxResults: 5,
+            }
+            sinon.assert.calledOnceWithExactly(service.generateSuggestions, expectedGenerateSuggestionsRequest)
+        })
+
         it('should return recommendations when using a different languageId casing', async () => {
             const result = await features.doInlineCompletionWithReferences(
                 {

server/aws-lsp-codewhisperer/src/language-server/inline-completion/codeWhispererServer.ts

@@ -13,6 +13,7 @@ import {
     TextDocument,
     ResponseError,
     LSPErrorCodes,
+    WorkspaceFolder,
 } from '@aws/language-server-runtimes/server-interface'
 import { AWSError } from 'aws-sdk'
 import { autoTrigger, triggerType } from './auto-trigger/autoTrigger'
@@ -56,13 +57,15 @@ import { UserWrittenCodeTracker } from '../../shared/userWrittenCodeTracker'
 
 const EMPTY_RESULT = { sessionId: '', items: [] }
 export const FILE_URI_CHARS_LIMIT = 1024
+export const FILENAME_CHARS_LIMIT = 1024
 export const CONTEXT_CHARACTERS_LIMIT = 10240
 
 // Both clients (token, sigv4) define their own types, this return value needs to match both of them.
 const getFileContext = (params: {
     textDocument: TextDocument
     position: Position
     inferredLanguageId: CodewhispererLanguage
+    workspaceFolder: WorkspaceFolder | null | undefined
 }): {
     fileUri: string
     filename: string
@@ -81,18 +84,13 @@ const getFileContext = (params: {
         end: params.textDocument.positionAt(params.textDocument.getText().length),
     })
 
-    let relativeFileName = params.textDocument.uri
-    relativeFileName = path.basename(params.textDocument.uri)
-    // const workspaceFolder = WorkspaceFolderManager.getInstance()?.getWorkspaceFolder(params.textDocument.uri)
-    // if (workspaceFolder) {
-    // relativeFileName = getRelativePath(workspaceFolder, params.textDocument.uri)
-    // } else {
-    // relativeFileName = path.basename(params.textDocument.uri)
-    // }
+    const relativeFilePath = params.workspaceFolder
+        ? getRelativePath(params.workspaceFolder, params.textDocument.uri)
+        : path.basename(params.textDocument.uri)
 
     return {
         fileUri: params.textDocument.uri.substring(0, FILE_URI_CHARS_LIMIT),
-        filename: relativeFileName,
+        filename: relativeFilePath.substring(0, FILENAME_CHARS_LIMIT),
         programmingLanguage: {
             languageName: getRuntimeLanguage(params.inferredLanguageId),
         },
@@ -346,7 +344,12 @@ export const CodewhispererServerFactory =
                         params.context.triggerKind == InlineCompletionTriggerKind.Automatic
                     const maxResults = isAutomaticLspTriggerKind ? 1 : 5
                     const selectionRange = params.context.selectedCompletionInfo?.range
-                    const fileContext = getFileContext({ textDocument, inferredLanguageId, position: params.position })
+                    const fileContext = getFileContext({
+                        textDocument,
+                        inferredLanguageId,
+                        position: params.position,
+                        workspaceFolder: workspace.getWorkspaceFolder(textDocument.uri),
+                    })
                     const workspaceState = WorkspaceFolderManager.getInstance()?.getWorkspaceState()
                     const workspaceId = workspaceState?.webSocketClient?.isConnected()
                         ? workspaceState.workspaceId

server/aws-lsp-codewhisperer/src/shared/testUtils.ts

@@ -5,6 +5,7 @@ import { SsoConnectionType } from './utils'
 import { stubInterface } from 'ts-sinon'
 import { StreamingClientServiceBase } from './streamingClientService'
 import { SessionData } from '../language-server/inline-completion/session/sessionManager'
+import { WorkspaceFolder } from '@aws/language-server-runtimes/protocol'
 
 export const HELLO_WORLD_IN_CSHARP = `class HelloWorld
 {
@@ -34,6 +35,16 @@ export const SOME_UNSUPPORTED_FILE = TextDocument.create(
     'INPUT HELLO ; OUTPUT WORLD'
 )
 export const SOME_FILE_WITH_EXTENSION = TextDocument.create('file:///missing.hpp', '', 1, HELLO_WORLD_IN_CSHARP)
+export const SOME_WORKSPACE_FOLDER: WorkspaceFolder = {
+    uri: 'file:///tmp/workspaceFolderTest',
+    name: 'workspaceFolderTest',
+}
+export const SOME_FILE_UNDER_WORKSPACE_FOLDER = TextDocument.create(
+    `${SOME_WORKSPACE_FOLDER.uri}/relativePath/test.cs`,
+    'csharp',
+    1,
+    HELLO_WORLD_IN_CSHARP
+)
 
 export const SAMPLE_FILE_OF_60_LINES_IN_JAVA = `import java.util.List;
 // we need this comment on purpose because chunk will be trimed right, adding this to avoid trimRight and make assertion easier