fix merge issue

Author: tomcat323

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

@@ -18,7 +18,6 @@ export class EditDecorationManager {
     private currentRemovedCodeDecorations: vscode.DecorationOptions[] = []
     private acceptHandler: (() => void) | undefined
     private rejectHandler: (() => void) | undefined
-    private disposables: vscode.Disposable[] = []
 
     constructor() {
         this.imageDecorationType = vscode.window.createTextEditorDecorationType({
@@ -28,6 +27,8 @@ export class EditDecorationManager {
         this.removedCodeDecorationType = vscode.window.createTextEditorDecorationType({
             backgroundColor: 'rgba(255, 0, 0, 0.2)',
         })
+
+        this.registerCommandHandlers()
     }
 
     /**
@@ -99,11 +100,9 @@ export class EditDecorationManager {
         onAccept: () => void,
         onReject: () => void,
         originalCode: string,
-        newCode: string,
-        removedHighlights?: vscode.DecorationOptions[]
+        newCode: string
     ): void {
         // Clear any existing decorations
-        this.registerCommandHandlers()
         this.clearDecorations(editor)
 
         // Set context to enable the Tab key handler
@@ -124,13 +123,8 @@ export class EditDecorationManager {
         // Apply image decoration
         editor.setDecorations(this.imageDecorationType, [this.currentImageDecoration])
 
-        // Highlight removed parts with red background - use provided highlights if available
-        if (removedHighlights && removedHighlights.length > 0) {
-            this.currentRemovedCodeDecorations = removedHighlights
-        } else {
-            // Fall back to line-level highlights if no char-level highlights provided
-            this.currentRemovedCodeDecorations = this.highlightRemovedLines(editor, originalCode, newCode)
-        }
+        // Highlight removed lines with red background
+        this.currentRemovedCodeDecorations = this.highlightRemovedLines(editor, originalCode, newCode)
         editor.setDecorations(this.removedCodeDecorationType, this.currentRemovedCodeDecorations)
     }
 
@@ -152,30 +146,24 @@ export class EditDecorationManager {
      */
     public registerCommandHandlers(): void {
         // Register Tab key handler for accepting suggestion
-        const acceptDisposable = vscode.commands.registerCommand('aws.amazonq.inline.acceptEdit', () => {
+        vscode.commands.registerCommand('aws.amazonq.inline.acceptEdit', () => {
             if (this.acceptHandler) {
                 this.acceptHandler()
             }
         })
-        this.disposables.push(acceptDisposable)
 
         // Register Esc key handler for rejecting suggestion
-        const rejectDisposable = vscode.commands.registerCommand('aws.amazonq.inline.rejectEdit', () => {
+        vscode.commands.registerCommand('aws.amazonq.inline.rejectEdit', () => {
             if (this.rejectHandler) {
                 this.rejectHandler()
             }
         })
-        this.disposables.push(rejectDisposable)
     }
 
     /**
      * Disposes resources
      */
     public dispose(): void {
-        for (const disposable of this.disposables) {
-            disposable.dispose()
-        }
-        this.disposables = []
         this.imageDecorationType.dispose()
         this.removedCodeDecorationType.dispose()
     }