fix(CodeWhisperer): cloud9 bugs #2725

leigaol · web-flow · commit 33192874bbdd · 2022-06-28T10:51:19.000-07:00
diff --git a/src/codewhisperer/commands/basicCommands.ts b/src/codewhisperer/commands/basicCommands.ts
@@ -47,6 +47,7 @@ export const enterAccessToken = Commands.declare(
         const setToken = async (token: string) => {
             set(CodeWhispererConstants.accessToken, token, context)
             await vscode.commands.executeCommand('aws.codeWhisperer.refresh')
+            await vscode.commands.executeCommand('aws.codeWhisperer.enableCodeSuggestions')
         }
         await showAccessTokenPrompt(client, setToken)
     }
diff --git a/src/codewhisperer/commands/invokeRecommendation.ts b/src/codewhisperer/commands/invokeRecommendation.ts
@@ -6,13 +6,11 @@
 import * as vscode from 'vscode'
 import { vsCodeState, ConfigurationEntry } from '../models/model'
 import { resetIntelliSenseState } from '../util/globalStateUtil'
-import { showTimedMessage } from '../../shared/utilities/messages'
 import { DefaultCodeWhispererClient } from '../client/codewhisperer'
 import { InlineCompletion } from '../service/inlineCompletion'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import { RecommendationHandler } from '../service/recommendationHandler'
 import { KeyStrokeHandler } from '../service/keyStrokeHandler'
-import { CodeWhispererConstants } from '../models/constants'
 
 /**
  * This function is for manual trigger CodeWhisperer
@@ -52,7 +50,10 @@ export async function invokeRecommendation(
         }
         KeyStrokeHandler.instance.keyStrokeCount = 0
         if (isCloud9()) {
-            if (!vsCodeState.isIntelliSenseActive) {
+            if (RecommendationHandler.instance.isGenerateRecommendationInProgress) return
+            vsCodeState.isIntelliSenseActive = false
+            RecommendationHandler.instance.isGenerateRecommendationInProgress = true
+            try {
                 RecommendationHandler.instance.clearRecommendations()
                 await RecommendationHandler.instance.getRecommendations(
                     client,
@@ -62,17 +63,13 @@ export async function invokeRecommendation(
                     undefined,
                     false
                 )
-                if (RecommendationHandler.instance.isValidResponse()) {
-                    vscode.commands.executeCommand('editor.action.triggerSuggest').then(() => {
+                if (RecommendationHandler.instance.canShowRecommendationInIntelliSense(editor, true)) {
+                    await vscode.commands.executeCommand('editor.action.triggerSuggest').then(() => {
                         vsCodeState.isIntelliSenseActive = true
                     })
-                } else {
-                    if (RecommendationHandler.instance.errorMessagePrompt !== '') {
-                        showTimedMessage(RecommendationHandler.instance.errorMessagePrompt, 2000)
-                    } else {
-                        showTimedMessage(CodeWhispererConstants.noSuggestions, 2000)
-                    }
                 }
+            } finally {
+                RecommendationHandler.instance.isGenerateRecommendationInProgress = false
             }
         } else {
             if (
diff --git a/src/codewhisperer/service/completionProvider.ts b/src/codewhisperer/service/completionProvider.ts
@@ -16,9 +16,8 @@ import { RecommendationHandler } from './recommendationHandler'
 export function getCompletionItems(document: vscode.TextDocument, position: vscode.Position) {
     const completionItems: vscode.CompletionItem[] = []
     RecommendationHandler.instance.recommendations.forEach((recommendation, index) => {
-        if (recommendation.content.length > 0) {
-            completionItems.push(getCompletionItem(document, position, recommendation, index))
-        }
+        completionItems.push(getCompletionItem(document, position, recommendation, index))
+        RecommendationHandler.instance.recommendationSuggestionState.set(index, 'Showed')
     })
     return completionItems
 }
@@ -29,7 +28,7 @@ export function getCompletionItem(
     recommendationDetail: Recommendation,
     recommendationIndex: number
 ) {
-    const start = document.lineAt(position.line).range.start
+    const start = RecommendationHandler.instance.startPos
     const range = new vscode.Range(start, start)
     const recommendation = recommendationDetail.content
     const completionItem = new vscode.CompletionItem(recommendation)
@@ -41,6 +40,7 @@ export function getCompletionItem(
     completionItem.label = getLabel(recommendation)
     completionItem.preselect = true
     completionItem.sortText = String(recommendationIndex + 1).padStart(10, '0')
+    completionItem.range = new vscode.Range(start, position)
     let languageId = document.languageId
     languageId = languageId === CodeWhispererConstants.typescript ? CodeWhispererConstants.javascript : languageId
     const languageContext = runtimeLanguageContext.getLanguageContext(languageId)
diff --git a/src/codewhisperer/service/keyStrokeHandler.ts b/src/codewhisperer/service/keyStrokeHandler.ts
@@ -10,7 +10,6 @@ import * as EditorContext from '../util/editorContext'
 import { CodeWhispererConstants } from '../models/constants'
 import { vsCodeState, ConfigurationEntry } from '../models/model'
 import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
-import { TelemetryHelper } from '../util/telemetryHelper'
 import { getLogger } from '../../shared/logger'
 import { InlineCompletion } from './inlineCompletion'
 import { CodeWhispererCodeCoverageTracker } from '../tracker/codewhispererCodeCoverageTracker'
@@ -149,17 +148,8 @@ export class KeyStrokeHandler {
         }
         /**
          * Pause automated trigger when typed input matches recommendation prefix
-         * for both intelliSense and inline
+         * for inline suggestion
          */
-        TelemetryHelper.instance.updatePrefixMatchArray(
-            RecommendationHandler.instance.recommendations,
-            RecommendationHandler.instance.startPos,
-            true,
-            editor
-        )
-        if (vsCodeState.isIntelliSenseActive && TelemetryHelper.instance.isPrefixMatched.length > 0) {
-            return ''
-        }
         if (InlineCompletion.instance.isTypeaheadInProgress) {
             return ''
         }
@@ -181,11 +171,13 @@ export class KeyStrokeHandler {
         client: DefaultCodeWhispererClient,
         config: ConfigurationEntry
     ): Promise<void> {
-        if (isCloud9()) vsCodeState.isIntelliSenseActive = false
         if (editor) {
             this.keyStrokeCount = 0
             if (isCloud9()) {
-                if (!vsCodeState.isIntelliSenseActive) {
+                if (RecommendationHandler.instance.isGenerateRecommendationInProgress) return
+                vsCodeState.isIntelliSenseActive = false
+                RecommendationHandler.instance.isGenerateRecommendationInProgress = true
+                try {
                     RecommendationHandler.instance.clearRecommendations()
                     await RecommendationHandler.instance.getRecommendations(
                         client,
@@ -195,11 +187,13 @@ export class KeyStrokeHandler {
                         autoTriggerType,
                         false
                     )
-                    if (RecommendationHandler.instance.isValidResponse()) {
-                        vscode.commands.executeCommand('editor.action.triggerSuggest').then(() => {
+                    if (RecommendationHandler.instance.canShowRecommendationInIntelliSense(editor, false)) {
+                        await vscode.commands.executeCommand('editor.action.triggerSuggest').then(() => {
                             vsCodeState.isIntelliSenseActive = true
                         })
                     }
+                } finally {
+                    RecommendationHandler.instance.isGenerateRecommendationInProgress = false
                 }
             } else {
                 if (!vsCodeState.isCodeWhispererEditing && !InlineCompletion.instance.isPaginationRunning()) {
diff --git a/src/codewhisperer/service/recommendationHandler.ts b/src/codewhisperer/service/recommendationHandler.ts
@@ -17,6 +17,7 @@ import { getLogger } from '../../shared/logger'
 import { isCloud9 } from '../../shared/extensionUtilities'
 import { asyncCallWithTimeout, isAwsError } from '../util/commonUtil'
 import * as codewhispererClient from '../client/codewhisperer'
+import { showTimedMessage } from '../../shared/utilities/messages'
 
 /**
  * This class is for getRecommendation/listRecommendation API calls and its states
@@ -36,6 +37,7 @@ export class RecommendationHandler {
     public startPos: vscode.Position
     private cancellationToken: vscode.CancellationTokenSource
     public errorMessagePrompt: string
+    public isGenerateRecommendationInProgress: boolean
 
     constructor() {
         this.requestId = ''
@@ -48,6 +50,7 @@ export class RecommendationHandler {
         this.cancellationToken = new vscode.CancellationTokenSource()
         this.errorMessagePrompt = ''
         this.recommendationSuggestionState = new Map<number, string>()
+        this.isGenerateRecommendationInProgress = false
     }
 
     static #instance: RecommendationHandler
@@ -245,7 +248,9 @@ export class RecommendationHandler {
                 }
             }
         }
-        if (recommendation.length > 0) this.recommendations = this.recommendations.concat(recommendation)
+        if (recommendation.length > 0) {
+            this.recommendations = isCloud9() ? recommendation : this.recommendations.concat(recommendation)
+        }
         this.requestId = requestId
         this.sessionId = sessionId
         this.nextToken = nextToken
@@ -299,4 +304,41 @@ export class RecommendationHandler {
     hasNextToken(): boolean {
         return this.nextToken !== ''
     }
+
+    canShowRecommendationInIntelliSense(editor: vscode.TextEditor, showPrompt: boolean = false): boolean {
+        const reject = () => {
+            this.reportUserDecisionOfCurrentRecommendation(editor, -1)
+            this.clearRecommendations()
+        }
+        if (!this.isValidResponse()) {
+            if (showPrompt) {
+                showTimedMessage(
+                    this.errorMessagePrompt === '' ? CodeWhispererConstants.noSuggestions : this.errorMessagePrompt,
+                    3000
+                )
+            }
+            reject()
+            return false
+        }
+        // do not show recommendation if cursor is before invocation position
+        if (editor.selection.active.isBefore(this.startPos)) {
+            reject()
+            return false
+        }
+
+        // do not show recommendation if typeahead does not match
+        const typedPrefix = editor.document.getText(
+            new vscode.Range(
+                this.startPos.line,
+                this.startPos.character,
+                editor.selection.active.line,
+                editor.selection.active.character
+            )
+        )
+        if (!this.recommendations[0].content.startsWith(typedPrefix.trimStart())) {
+            reject()
+            return false
+        }
+        return true
+    }
 }
diff --git a/src/test/codewhisperer/service/completionProvider.test.ts b/src/test/codewhisperer/service/completionProvider.test.ts
@@ -34,7 +34,8 @@ describe('completionProviderService', function () {
 
     describe('getCompletionItem', function () {
         it('should return targetCompletionItem given input', function () {
-            const mockPosition = new vscode.Position(0, 83)
+            RecommendationHandler.instance.startPos = new vscode.Position(0, 0)
+            const mockPosition = new vscode.Position(0, 1)
             const mockRecommendationDetail: Recommendation = {
                 content: "\n\t\tconsole.log('Hello world!');\n\t}",
             }
@@ -89,12 +90,12 @@ describe('completionProviderService', function () {
         it('should return completion items for each non-empty recommendation', async function () {
             RecommendationHandler.instance.recommendations = [
                 { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
-                { content: '' },
+                { content: '\nvar a = 10' },
             ]
             const mockPosition = new vscode.Position(0, 0)
             const mockDocument = createMockDocument('', 'test.ts', 'typescript')
             const actual = getCompletionItems(mockDocument, mockPosition)
-            assert.strictEqual(actual.length, 1)
+            assert.strictEqual(actual.length, 2)
         })
 
         it('should return empty completion items when recommendation is empty', async function () {

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ export const enterAccessToken = Commands.declare(`
`47`	`47`	`const setToken = async (token: string) => {`
`48`	`48`	`set(CodeWhispererConstants.accessToken, token, context)`
`49`	`49`	`await vscode.commands.executeCommand('aws.codeWhisperer.refresh')`
	`50`	`+ await vscode.commands.executeCommand('aws.codeWhisperer.enableCodeSuggestions')`
`50`	`51`	`}`
`51`	`52`	`await showAccessTokenPrompt(client, setToken)`
`52`	`53`	`}`