test: add tests for a few edge cases

Author: Hweinstock

packages/amazonq/src/app/inline/completion.ts

@@ -8,7 +8,6 @@ import {
     InlineCompletionContext,
     InlineCompletionItem,
     InlineCompletionItemProvider,
-    InlineCompletionList,
     Position,
     TextDocument,
     commands,
@@ -214,7 +213,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
         position: Position,
         context: InlineCompletionContext,
         token: CancellationToken
-    ): Promise<InlineCompletionItem[] | InlineCompletionList> {
+    ): Promise<InlineCompletionItem[]> {
         try {
             vsCodeState.isRecommendationsActive = true
             if (this.isNewSession) {
@@ -246,8 +245,7 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                 return []
             }
 
-            const start = document.validatePosition(editor.selection.active)
-            const end = position
+            const cursorPosition = document.validatePosition(position)
             for (const item of items) {
                 item.command = {
                     command: 'aws.amazonq.acceptInline',
@@ -257,17 +255,18 @@ export class AmazonQInlineCompletionItemProvider implements InlineCompletionItem
                         item,
                         editor,
                         session.requestStartTime,
-                        position.line,
+                        cursorPosition.line,
                         session.firstCompletionDisplayLatency,
                     ],
                 }
-                item.range = new Range(start, end)
+                item.range = new Range(cursorPosition, cursorPosition)
+                item.insertText = typeof item.insertText === 'string' ? item.insertText : item.insertText.value
                 ReferenceInlineProvider.instance.setInlineReference(
-                    position.line,
-                    item.insertText as string,
+                    cursorPosition.line,
+                    item.insertText,
                     item.references
                 )
-                ImportAdderProvider.instance.onShowRecommendation(document, position.line, item)
+                ImportAdderProvider.instance.onShowRecommendation(document, cursorPosition.line, item)
             }
             return items as InlineCompletionItem[]
         } catch (e) {

packages/amazonq/src/app/inline/recommendationService.ts

@@ -48,7 +48,7 @@ export class RecommendationService {
 
             // Handle first request
             const firstResult: InlineCompletionListWithReferences = await languageClient.sendRequest(
-                inlineCompletionWithReferencesRequestType as any,
+                inlineCompletionWithReferencesRequestType.method,
                 request,
                 token
             )
@@ -98,7 +98,7 @@ export class RecommendationService {
         while (nextToken) {
             const request = { ...initialRequest, partialResultToken: nextToken }
             const result: InlineCompletionListWithReferences = await languageClient.sendRequest(
-                inlineCompletionWithReferencesRequestType as any,
+                inlineCompletionWithReferencesRequestType.method,
                 request,
                 token
             )

packages/amazonq/test/unit/amazonq/apps/inline/completion.test.ts

@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import sinon from 'sinon'
-import { CancellationToken, commands, InlineCompletionItem, languages, Position, window } from 'vscode'
+import { CancellationToken, commands, InlineCompletionItem, languages, Position, window, Range } from 'vscode'
 import assert from 'assert'
 import { LanguageClient } from 'vscode-languageclient'
+import { StringValue } from 'vscode-languageserver-types'
 import { AmazonQInlineCompletionItemProvider, InlineCompletionManager } from '../../../../../src/app/inline/completion'
 import { RecommendationService } from '../../../../../src/app/inline/recommendationService'
 import { SessionManager } from '../../../../../src/app/inline/sessionManager'
@@ -344,6 +345,61 @@ describe('InlineCompletionManager', () => {
                         )
                     )
                 }),
+                it('should add a range to the completion item when missing', async function () {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        true
+                    )
+                    getActiveRecommendationStub.returns([
+                        {
+                            insertText: 'testText',
+                            itemId: 'itemId',
+                        },
+                        {
+                            insertText: 'testText2',
+                            itemId: 'itemId2',
+                            range: undefined,
+                        },
+                    ])
+                    const cursorPosition = new Position(5, 6)
+                    const result = await provider.provideInlineCompletionItems(
+                        mockDocument,
+                        cursorPosition,
+                        mockContext,
+                        mockToken
+                    )
+
+                    for (const item of result) {
+                        assert.deepStrictEqual(item.range, new Range(cursorPosition, cursorPosition))
+                    }
+                }),
+                it('should handle StringValue instead of strings', async function () {
+                    provider = new AmazonQInlineCompletionItemProvider(
+                        languageClient,
+                        recommendationService,
+                        mockSessionManager,
+                        inlineTutorialAnnotation,
+                        true
+                    )
+                    const expectedText = 'this is my text'
+                    getActiveRecommendationStub.returns([
+                        {
+                            insertText: { kind: 'snippet', value: 'this is my text' } satisfies StringValue,
+                            itemId: 'itemId',
+                        },
+                    ])
+                    const result = await provider.provideInlineCompletionItems(
+                        mockDocument,
+                        mockPosition,
+                        mockContext,
+                        mockToken
+                    )
+
+                    assert.strictEqual(result[0].insertText, expectedText)
+                }),
                 describe('debounce behavior', function () {
                     let clock: ReturnType<typeof installFakeClock>