perf: remove edit completion retry mechanism on document change (aws#2124)

Author: Will-ShaoHua

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

@@ -633,7 +633,9 @@ export const CodewhispererServerFactory =
             }
 
             if (session.state !== 'ACTIVE') {
-                logging.log(`ERROR: Trying to record trigger decision for not-active session ${sessionId}`)
+                logging.log(
+                    `ERROR: Trying to record trigger decision for not-active session ${sessionId} with wrong state ${session.state}`
+                )
                 return
             }
 

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

@@ -3,7 +3,6 @@ export const FILENAME_CHARS_LIMIT = 1024
 export const CONTEXT_CHARACTERS_LIMIT = 10240
 export const EMPTY_RESULT = { sessionId: '', items: [] }
 export const EDIT_DEBOUNCE_INTERVAL_MS = 500
-export const EDIT_STALE_RETRY_COUNT = 3
 // ABAP ADT extensions commonly used with Eclipse
 export const ABAP_EXTENSIONS = new Set([
     'asprog',

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

@@ -16,7 +16,6 @@ import {
     GenerateSuggestionsRequest,
     GenerateSuggestionsResponse,
     getFileContext,
-    SuggestionType,
 } from '../../shared/codeWhispererService'
 import { CodeWhispererSession, SessionManager } from './session/sessionManager'
 import { CursorTracker } from './tracker/cursorTracker'
@@ -36,7 +35,7 @@ import { RejectedEditTracker } from './tracker/rejectedEditTracker'
 import { getErrorMessage, hasConnectionExpired } from '../../shared/utils'
 import { AmazonQError, AmazonQServiceConnectionExpiredError } from '../../shared/amazonQServiceManager/errors'
 import { DocumentChangedListener } from './documentChangedListener'
-import { EMPTY_RESULT, EDIT_DEBOUNCE_INTERVAL_MS, EDIT_STALE_RETRY_COUNT } from './constants'
+import { EMPTY_RESULT, EDIT_DEBOUNCE_INTERVAL_MS } from './constants'
 
 export class EditCompletionHandler {
     private readonly editsEnabled: boolean
@@ -74,22 +73,19 @@ export class EditCompletionHandler {
      */
     documentChanged() {
         if (this.debounceTimeout) {
-            this.logging.info('[NEP] refresh timeout')
-            this.debounceTimeout.refresh()
-        }
-
-        if (this.isWaiting) {
-            this.hasDocumentChangedSinceInvocation = true
+            if (this.isWaiting) {
+                this.hasDocumentChangedSinceInvocation = true
+            } else {
+                this.logging.info(`refresh and debounce edits suggestion for another ${EDIT_DEBOUNCE_INTERVAL_MS}`)
+                this.debounceTimeout.refresh()
+            }
         }
     }
 
     async onEditCompletion(
         params: InlineCompletionWithReferencesParams,
         token: CancellationToken
     ): Promise<InlineCompletionListWithReferences> {
-        this.hasDocumentChangedSinceInvocation = false
-        this.debounceTimeout = undefined
-
         // On every new completion request close current inflight session.
         const currentSession = this.sessionManager.getCurrentSession()
         if (currentSession && currentSession.state == 'REQUESTING' && !params.partialResultToken) {
@@ -156,46 +152,37 @@ export class EditCompletionHandler {
             }
         }
 
-        // TODO: telemetry, discarded suggestions
-        // The other easy way to do this is simply not return any suggestion (which is used when retry > 3)
-        const invokeWithRetry = async (attempt: number = 0): Promise<InlineCompletionListWithReferences> => {
-            return new Promise(async resolve => {
-                this.debounceTimeout = setTimeout(async () => {
-                    try {
-                        this.isWaiting = true
-                        const result = await this._invoke(
-                            params,
-                            token,
-                            textDocument,
-                            inferredLanguageId,
-                            currentSession
-                        ).finally(() => {
-                            this.isWaiting = false
+        return new Promise(async resolve => {
+            this.debounceTimeout = setTimeout(async () => {
+                try {
+                    this.isWaiting = true
+                    const result = await this._invoke(
+                        params,
+                        token,
+                        textDocument,
+                        inferredLanguageId,
+                        currentSession
+                    ).finally(() => {
+                        this.isWaiting = false
+                    })
+                    if (this.hasDocumentChangedSinceInvocation) {
+                        this.logging.info(
+                            'EditCompletionHandler - Document changed during execution, resolving empty result'
+                        )
+                        resolve({
+                            sessionId: SessionManager.getInstance('EDITS').getActiveSession()?.id ?? '',
+                            items: [],
                         })
-                        if (this.hasDocumentChangedSinceInvocation) {
-                            if (attempt < EDIT_STALE_RETRY_COUNT) {
-                                this.logging.info(
-                                    `EditCompletionHandler - Document changed during execution, retrying (attempt ${attempt + 1})`
-                                )
-                                this.hasDocumentChangedSinceInvocation = false
-                                const retryResult = await invokeWithRetry(attempt + 1)
-                                resolve(retryResult)
-                            } else {
-                                this.logging.info('EditCompletionHandler - Max retries reached, returning empty result')
-                                resolve(EMPTY_RESULT)
-                            }
-                        } else {
-                            this.logging.info('EditCompletionHandler - No document changes, resolving result')
-                            resolve(result)
-                        }
-                    } finally {
-                        this.debounceTimeout = undefined
+                    } else {
+                        this.logging.info('EditCompletionHandler - No document changes, resolving result')
+                        resolve(result)
                     }
-                }, EDIT_DEBOUNCE_INTERVAL_MS)
-            })
-        }
-
-        return invokeWithRetry()
+                } finally {
+                    this.debounceTimeout = undefined
+                    this.hasDocumentChangedSinceInvocation = false
+                }
+            }, EDIT_DEBOUNCE_INTERVAL_MS)
+        })
     }
 
     async _invoke(

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

@@ -14,7 +14,6 @@ import {
 } from '../../../shared/codeWhispererService'
 import { CodewhispererLanguage } from '../../../shared/languageDetection'
 import { CodeWhispererSupplementalContext } from '../../../shared/models/model'
-import { Logging } from '@aws/language-server-runtimes/server-interface'
 
 type SessionState = 'REQUESTING' | 'ACTIVE' | 'CLOSED' | 'ERROR' | 'DISCARD'
 export type UserDecision = 'Empty' | 'Filter' | 'Discard' | 'Accept' | 'Ignore' | 'Reject' | 'Unseen'
@@ -45,7 +44,13 @@ export class CodeWhispererSession {
     startTime: number
     // Time when Session was closed and final state of user decisions is recorded in suggestionsStates
     closeTime?: number = 0
-    state: SessionState
+    private _state: SessionState
+    get state(): SessionState {
+        return this._state
+    }
+    private set state(newState: SessionState) {
+        this._state = newState
+    }
     codewhispererSessionId?: string
     startPosition: Position = {
         line: 0,
@@ -96,7 +101,8 @@ export class CodeWhispererSession {
         this.classifierThreshold = data.classifierThreshold
         this.customizationArn = data.customizationArn
         this.supplementalMetadata = data.supplementalMetadata
-        this.state = 'REQUESTING'
+        this._state = 'REQUESTING'
+
         this.startTime = new Date().getTime()
     }