Merge pull request #6563 from aws/autoMerge/feature/amazonqLSP

Merge master into feature/amazonqLSP

Author: jpinkney-aws

.github/workflows/filterDuplicates.js

@@ -111,6 +111,9 @@ async function run() {
     console.log('%s duplicates found', filteredDuplicates.length)
     if (filteredDuplicates.length > 0) {
         console.log(formatDuplicates(filteredDuplicates, commitHash, repoName))
+        console.log(
+            '* Hint: if these duplicates appear unrelated to the changes, rebase onto the latest target branch.'
+        )
         process.exit(1)
     }
 }

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/review: Code review starts automatically when invoked from menu"
+}

packages/amazonq/.changes/next-release/Bug Fix-e9cfb8e0-540c-45ec-b3b7-313ac07c87a7.json

@@ -0,0 +1,4 @@
+{
+	"type": "Removal",
+	"description": "Reverted prefetch logic to enable more stable inline completion"
+}

packages/amazonq/.changes/next-release/Removal-319fc7c8-22e0-44f1-a636-2f4040689b32.json

@@ -25,7 +25,6 @@ export function init(appContext: AmazonQAppInitContext) {
         authClicked: new vscode.EventEmitter<any>(),
         tabOpened: new vscode.EventEmitter<any>(),
         tabClosed: new vscode.EventEmitter<any>(),
-        runScan: new vscode.EventEmitter<any>(),
         formActionClicked: new vscode.EventEmitter<any>(),
         errorThrown: new vscode.EventEmitter<any>(),
         showSecurityScan: new vscode.EventEmitter<any>(),
@@ -35,6 +34,7 @@ export function init(appContext: AmazonQAppInitContext) {
         processResponseBodyLinkClick: new vscode.EventEmitter<any>(),
         fileClicked: new vscode.EventEmitter<any>(),
         scanCancelled: new vscode.EventEmitter<any>(),
+        processChatItemVotedMessage: new vscode.EventEmitter<any>(),
     }
     const dispatcher = new AppToWebViewMessageDispatcher(appContext.getAppsToWebViewMessagePublisher())
     const messenger = new Messenger(dispatcher)

packages/amazonq/src/app/amazonqScan/app.ts

@@ -32,6 +32,7 @@ import {
     scanSummaryMessage,
 } from '../../models/constants'
 import path from 'path'
+import { telemetry } from 'aws-core-vscode/telemetry'
 
 export class ScanController {
     private readonly messenger: Messenger
@@ -48,7 +49,7 @@ export class ScanController {
         this.authController = new AuthController()
 
         this.chatControllerMessageListeners.tabOpened.event((data) => {
-            return this.tabOpened(data)
+            return this.tabOpened(data).then(() => this.scanInitiated(data))
         })
 
         this.chatControllerMessageListeners.tabClosed.event((data) => {
@@ -59,10 +60,6 @@ export class ScanController {
             this.authClicked(data)
         })
 
-        this.chatControllerMessageListeners.runScan.event((data) => {
-            return this.scanInitiated(data)
-        })
-
         this.chatControllerMessageListeners.formActionClicked.event((data) => {
             return this.formActionClicked(data)
         })
@@ -98,6 +95,15 @@ export class ScanController {
         this.chatControllerMessageListeners.scanCancelled.event((data) => {
             return this.handleScanCancelled(data)
         })
+
+        this.chatControllerMessageListeners.processChatItemVotedMessage.event((data) => {
+            telemetry.amazonq_feedback.emit({
+                featureId: 'amazonQReview',
+                amazonqConversationId: this.sessionStorage.getSession().scanUuid,
+                credentialStartUrl: AuthUtil.instance.startUrl,
+                interactionType: data.vote,
+            })
+        })
     }
 
     private async tabOpened(message: any) {

packages/amazonq/src/app/amazonqScan/chat/controller/controller.ts

@@ -40,9 +40,6 @@ export class UIMessageListener {
             case 'auth-follow-up-was-clicked':
                 this.authClicked(msg)
                 break
-            case 'review':
-                this.scan(msg)
-                break
             case 'form-action-click':
                 this.formActionClicked(msg)
                 break
@@ -55,15 +52,12 @@ export class UIMessageListener {
             case 'file-click':
                 this.processFileClick(msg)
                 break
+            case 'chat-item-voted':
+                this.chatItemVoted(msg)
+                break
         }
     }
 
-    private scan(msg: UIMessage) {
-        this.scanControllerEventsEmitters?.runScan.fire({
-            tabID: msg.tabID,
-        })
-    }
-
     private formActionClicked(msg: UIMessage) {
         this.scanControllerEventsEmitters?.formActionClicked.fire({
             ...msg,
@@ -112,4 +106,12 @@ export class UIMessageListener {
             filePath: msg.filePath,
         })
     }
+
+    private chatItemVoted(msg: any) {
+        this.scanControllerEventsEmitters?.processChatItemVotedMessage.fire({
+            tabID: msg.tabID,
+            command: msg.command,
+            vote: msg.vote,
+        })
+    }
 }

packages/amazonq/src/app/amazonqScan/chat/views/actions/uiMessageListener.ts

@@ -9,21 +9,19 @@ import * as sinon from 'sinon'
 import {
     onAcceptance,
     AcceptedSuggestionEntry,
-    CodeWhispererSessionState,
+    session,
     CodeWhispererTracker,
     RecommendationHandler,
     AuthUtil,
-    CodeWhispererSession,
 } from 'aws-core-vscode/codewhisperer'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
 
 describe('onAcceptance', function () {
-    let session: CodeWhispererSession
     describe('onAcceptance', function () {
         beforeEach(async function () {
-            session = CodeWhispererSessionState.instance.getSession()
             await resetCodeWhispererGlobalVariables()
+            session.reset()
         })
 
         afterEach(function () {

packages/amazonq/test/unit/codewhisperer/commands/onAcceptance.test.ts

@@ -8,22 +8,15 @@ import * as vscode from 'vscode'
 import * as sinon from 'sinon'
 import { resetCodeWhispererGlobalVariables, createMockTextEditor } from 'aws-core-vscode/test'
 import { assertTelemetryCurried } from 'aws-core-vscode/test'
-import {
-    onInlineAcceptance,
-    RecommendationHandler,
-    AuthUtil,
-    CodeWhispererSessionState,
-    CodeWhispererSession,
-} from 'aws-core-vscode/codewhisperer'
+import { onInlineAcceptance, RecommendationHandler, AuthUtil, session } from 'aws-core-vscode/codewhisperer'
 import { globals } from 'aws-core-vscode/shared'
 import { extensionVersion } from 'aws-core-vscode/shared'
 
 describe('onInlineAcceptance', function () {
-    let session: CodeWhispererSession
     describe('onInlineAcceptance', function () {
         beforeEach(async function () {
-            session = CodeWhispererSessionState.instance.getSession()
             await resetCodeWhispererGlobalVariables()
+            session.reset()
         })
 
         afterEach(function () {

packages/amazonq/test/unit/codewhisperer/commands/onInlineAcceptance.test.ts

@@ -12,7 +12,7 @@ import {
     getLabel,
     Recommendation,
     RecommendationHandler,
-    CodeWhispererSessionState,
+    session,
 } from 'aws-core-vscode/codewhisperer'
 import { createMockDocument, resetCodeWhispererGlobalVariables } from 'aws-core-vscode/test'
 
@@ -39,7 +39,6 @@ describe('completionProviderService', function () {
 
     describe('getCompletionItem', function () {
         it('should return targetCompletionItem given input', function () {
-            const session = CodeWhispererSessionState.instance.getSession()
             session.startPos = new vscode.Position(0, 0)
             RecommendationHandler.instance.requestId = 'mock_requestId_getCompletionItem'
             session.sessionId = 'mock_sessionId_getCompletionItem'
@@ -96,7 +95,6 @@ describe('completionProviderService', function () {
 
     describe('getCompletionItems', function () {
         it('should return completion items for each non-empty recommendation', async function () {
-            const session = CodeWhispererSessionState.instance.getSession()
             session.recommendations = [
                 { content: "\n\t\tconsole.log('Hello world!');\n\t}" },
                 { content: '\nvar a = 10' },
@@ -108,7 +106,6 @@ describe('completionProviderService', function () {
         })
 
         it('should return empty completion items when recommendation is empty', async function () {
-            const session = CodeWhispererSessionState.instance.getSession()
             session.recommendations = []
             const mockPosition = new vscode.Position(14, 83)
             const mockDocument = createMockDocument()