fix merge issues

Author: tomcat323

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

@@ -283,23 +283,6 @@ export async function displaySvgDecoration(
                 deletedCharacterCount: deletedCharacterCount,
             }
             languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
-            decorationManager.dispose()
-            const params: LogInlineCompletionSessionResultsParams = {
-                sessionId: session.sessionId,
-                completionSessionResult: {
-                    [item.itemId]: {
-                        seen: true,
-                        accepted: true,
-                        discarded: false,
-                    },
-                },
-                totalSessionDisplayTime: Date.now() - session.requestStartTime,
-                firstCompletionDisplayLatency: session.firstCompletionDisplayLatency,
-                // TODO: Update LogInlineCompletionSessionResultsParams interface to include these properties
-                // addedCharacterCount: addedCharacterCount,
-                // deletedCharacterCount: deletedCharacterCount,
-            }
-            languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         },
         () => {
             // Handle reject
@@ -318,21 +301,6 @@ export async function displaySvgDecoration(
                 deletedCharacterCount: deletedCharacterCount,
             }
             languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
-            decorationManager.dispose()
-            const params: LogInlineCompletionSessionResultsParams = {
-                sessionId: session.sessionId,
-                completionSessionResult: {
-                    [item.itemId]: {
-                        seen: true,
-                        accepted: false,
-                        discarded: false,
-                    },
-                },
-                // TODO: Update LogInlineCompletionSessionResultsParams interface to include these properties
-                // addedCharacterCount: addedCharacterCount,
-                // deletedCharacterCount: deletedCharacterCount,
-            }
-            languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
         },
         originalCode,
         newCode

packages/amazonq/test/unit/amazonq/apps/inline/recommendationService.test.ts

@@ -275,7 +275,7 @@ describe('RecommendationService', () => {
             const options = { showUi: true }
 
             // Stub the UI methods to avoid errors
-            sandbox.stub(activeStateController, 'showGenerating').resolves()
+            // const showGeneratingStub = sandbox.stub(activeStateController, 'showGenerating').resolves()
             const hideGeneratingStub = sandbox.stub(activeStateController, 'hideGenerating')
 
             // Temporarily replace console.error with a no-op function to prevent test failure