fix(codewhisperer): right context merge #4275

fix unexpected right context merge due to right context trim()

Author: Will-ShaoHua

.changes/next-release/Bug Fix-3f2c34ab-615e-4501-b697-75b38a7f4c39.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "CodeWhisperer suggestions may be trimmed under certain criteria"
+}

src/codewhisperer/service/inlineCompletionItemProvider.ts

@@ -75,7 +75,7 @@ export class CWInlineCompletionItemProvider implements vscode.InlineCompletionIt
         const trimmedSuggestion = suggestion.trim()
         // limit of 5000 for right context matching
         const rightContext = document.getText(new vscode.Range(pos, document.positionAt(document.offsetAt(pos) + 5000)))
-        const overlap = getPrefixSuffixOverlap(trimmedSuggestion, rightContext.trim())
+        const overlap = getPrefixSuffixOverlap(trimmedSuggestion, rightContext)
         const overlapIndex = suggestion.lastIndexOf(overlap)
         if (overlapIndex >= 0) {
             const truncated = suggestion.slice(0, overlapIndex)

src/test/codewhisperer/service/inlineCompletionService.test.ts

@@ -141,15 +141,6 @@ describe('inlineCompletionService', function () {
             const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
             assert.strictEqual(result, '')
         })
-
-        it('ignores the space at the start of right context', async function () {
-            const testRightContext = '\n\n\n\nreturn target'
-            const mockEditor = createMockTextEditor(`${doc}${testRightContext}`, fileName, language)
-            const mockSuggestion = 'return target\n'
-            const cursorPosition = new vscode.Position(2, 0)
-            const result = provider.truncateOverlapWithRightContext(mockEditor.document, mockSuggestion, cursorPosition)
-            assert.strictEqual(result, '')
-        })
     })
 })