wip

Author: Will-ShaoHua

packages/amazonq/src/app/inline/EditRendering/imageRenderer.ts

@@ -26,10 +26,10 @@ export class EditsSuggestionSvg {
     // TODO:
     // private readonly cursorChangedListener: vscode.Disposable
 
-    private readonly updatedItem: InlineCompletionItemWithReferences[] = []
+    private readonly updatedSuggestions: InlineCompletionItemWithReferences[] = []
 
     constructor(
-        private item: InlineCompletionItemWithReferences,
+        private suggestion: InlineCompletionItemWithReferences,
         private readonly editor: vscode.TextEditor,
         private readonly languageClient: LanguageClient,
         private readonly session: CodeWhispererSession,
@@ -45,14 +45,17 @@ export class EditsSuggestionSvg {
             return
         }
 
-        const item = this.updatedItem.length > 0 ? this.updatedItem[this.updatedItem.length - 1] : this.item
+        const item =
+            this.updatedSuggestions.length > 0
+                ? this.updatedSuggestions[this.updatedSuggestions.length - 1]
+                : this.suggestion
 
         try {
             const svgGenerationService = new SvgGenerationService()
             // Generate your SVG image with the file contents
             const currentFile = this.editor.document.uri.fsPath
             const { svgImage, startLine, newCode, originalCodeHighlightRange } =
-                await svgGenerationService.generateDiffSvg(currentFile, this.item.insertText as string)
+                await svgGenerationService.generateDiffSvg(currentFile, this.suggestion.insertText as string)
 
             // TODO: To investigate why it fails and patch [generateDiffSvg]
             if (newCode.length === 0) {
@@ -103,7 +106,7 @@ export class EditsSuggestionSvg {
          */
 
         const originalCode = this.session.fileContent
-        const appliedToOriginal = applyPatch(originalCode, this.item.insertText as string)
+        const appliedToOriginal = applyPatch(originalCode, this.suggestion.insertText as string)
         try {
             if (appliedToOriginal) {
                 const updatedPatch = createPatch(
@@ -112,7 +115,11 @@ export class EditsSuggestionSvg {
                     appliedToOriginal
                 )
                 // show updatedPatch
-                this.setItem(updatedPatch)
+                this.updateSuggestion(updatedPatch)
+
+                if (this.updatedSuggestions.length > 5) {
+                    this.autoReject()
+                }
 
                 // TODO: await
                 this.show()
@@ -121,18 +128,21 @@ export class EditsSuggestionSvg {
                     })
                     .catch((e) => {})
             } else {
-                // TODO:
-                logSuggestionFailure('REJECT', 'Invalid patch due to document change', this.item.insertText as string)
-                void vscode.commands.executeCommand('aws.amazonq.inline.rejectEdit')
+                this.autoReject()
             }
         } catch (e) {
             this.logger.info('123')
         }
     }
 
-    private setItem(content: string) {
+    private autoReject() {
+        logSuggestionFailure('REJECT', 'Invalid patch due to document change', this.suggestion.insertText as string)
+        void vscode.commands.executeCommand('aws.amazonq.inline.rejectEdit')
+    }
+
+    private updateSuggestion(content: string) {
         this.logger.info(`update edit suggestion\n ${content}`)
-        const updated: InlineCompletionItemWithReferences = { ...this.item, insertText: content }
-        this.updatedItem.push(updated)
+        const updated: InlineCompletionItemWithReferences = { ...this.suggestion, insertText: content }
+        this.updatedSuggestions.push(updated)
     }
 }