Merge remote-tracking branch 'upstream/master' into chat-custom

Author: Will-ShaoHua

docs/TESTPLAN.md

@@ -104,7 +104,7 @@ Checking the state works well if user interactions are not required by the code
 To handle this, test code can register event handler that listen for when a certain type of UI element is shown. For example, if we wanted to always accept the first item of a quick pick we can do this:
 
 ```ts
-getTestWindow().onDidShowQuickPick(async picker => {
+getTestWindow().onDidShowQuickPick(async (picker) => {
     // Some pickers load items asychronously
     // Wait until the picker is not busy before accepting an item
     await picker.untilReady()
@@ -121,3 +121,9 @@ const secondPicker = await pickers.next()
 ```
 
 Exceptions thrown within one of these handlers will cause the current test to fail. This allows you to make assertions within the callback without worrying about causing the test to hang.
+
+## Common issues
+
+### Stubbing VSCode outside of core
+
+-   Stubbing VSCode imports (like executeCommand) does not work outside of core. For now you will need to put any tests that require spying/stubbing VSCode imports in core until we move more source files into the amazon q package

packages/amazonq/test/unit/codewhisperer/util/authUtil.test.ts

@@ -278,6 +278,26 @@ describe('AuthUtil', async function () {
         assert.strictEqual(authUtil.reformatStartUrl(expected + '/#/'), expected)
         assert.strictEqual(authUtil.reformatStartUrl(expected + '####'), expected)
     })
+
+    it(`clearExtraConnections()`, async function () {
+        const conn1 = await auth.createConnection(createBuilderIdProfile())
+        const conn2 = await auth.createConnection(createSsoProfile({ startUrl: enterpriseSsoStartUrl }))
+        const conn3 = await auth.createConnection(createSsoProfile({ startUrl: enterpriseSsoStartUrl + 1 }))
+        // validate listConnections shows all connections
+        assert.deepStrictEqual(
+            (await authUtil.auth.listConnections()).map((conn) => conn.id).sort((a, b) => a.localeCompare(b)),
+            [conn1, conn2, conn3].map((conn) => conn.id).sort((a, b) => a.localeCompare(b))
+        )
+        await authUtil.secondaryAuth.useNewConnection(conn3)
+
+        await authUtil.clearExtraConnections() // method under test
+
+        // Only the conn that AuthUtil is using is remaining
+        assert.deepStrictEqual(
+            (await authUtil.auth.listConnections()).map((conn) => conn.id),
+            [conn3.id]
+        )
+    })
 })
 
 describe('getChatAuthState()', function () {

packages/core/src/amazonq/commons/diff.ts

@@ -0,0 +1,34 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { existsSync } from 'fs'
+import * as vscode from 'vscode'
+import { featureDevScheme } from '../../amazonqFeatureDev/constants'
+
+export async function openDiff(leftPath: string, rightPath: string, tabId: string) {
+    const { left, right } = getFileDiffUris(leftPath, rightPath, tabId)
+    await vscode.commands.executeCommand('vscode.diff', left, right)
+}
+
+export async function openDeletedDiff(filePath: string, name: string, tabId: string) {
+    const fileUri = getOriginalFileUri(filePath, tabId)
+    await vscode.commands.executeCommand('vscode.open', fileUri, {}, `${name} (Deleted)`)
+}
+
+export function getOriginalFileUri(fullPath: string, tabId: string) {
+    return existsSync(fullPath) ? vscode.Uri.file(fullPath) : createAmazonQUri('empty', tabId)
+}
+
+export function getFileDiffUris(leftPath: string, rightPath: string, tabId: string) {
+    const left = getOriginalFileUri(leftPath, tabId)
+    const right = createAmazonQUri(rightPath, tabId)
+
+    return { left, right }
+}
+
+export function createAmazonQUri(path: string, tabId: string) {
+    // TODO change the featureDevScheme to a more general amazon q scheme
+    return vscode.Uri.from({ scheme: featureDevScheme, path, query: `tabID=${tabId}` })
+}

packages/core/src/amazonq/index.ts

@@ -27,6 +27,7 @@ export { amazonQHelpUrl } from '../shared/constants'
 export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu'
 export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands'
 export { TryChatCodeLensProvider, tryChatCodeLensCommand } from '../codewhispererChat/editor/codelens'
+export { createAmazonQUri, openDiff, openDeletedDiff, getOriginalFileUri, getFileDiffUris } from './commons/diff'
 
 /**
  * main from createMynahUI is a purely browser dependency. Due to this

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -4,13 +4,11 @@
  */
 
 import { ChatItemAction, MynahIcons } from '@aws/mynah-ui'
-import { existsSync } from 'fs'
 import * as path from 'path'
 import * as vscode from 'vscode'
 import { EventEmitter } from 'vscode'
 import { telemetry } from '../../../shared/telemetry/telemetry'
 import { createSingleFileDialog } from '../../../shared/ui/common/openDialog'
-import { featureDevScheme } from '../../constants'
 import {
     CodeIterationLimitError,
     ContentLengthError,
@@ -53,6 +51,7 @@ import {
 } from '../../userFacingText'
 import { getWorkspaceFoldersByPrefixes } from '../../../shared/utilities/workspaceUtils'
 import { ErrorMessages } from './messenger/constants'
+import { openDeletedDiff, openDiff } from '../../../amazonq/commons/diff'
 
 export interface ChatControllerEventEmitters {
     readonly processHumanChatMessage: EventEmitter<any>
@@ -744,24 +743,6 @@ export class FeatureDevController {
         })
     }
 
-    private getOriginalFileUri(fullPath: string, tabID: string) {
-        const originalPath = fullPath
-        return existsSync(originalPath)
-            ? vscode.Uri.file(originalPath)
-            : vscode.Uri.from({ scheme: featureDevScheme, path: 'empty', query: `tabID=${tabID}` })
-    }
-
-    private getFileDiffUris(zipFilePath: string, fullFilePath: string, tabId: string, session: Session) {
-        const left = this.getOriginalFileUri(fullFilePath, tabId)
-        const right = vscode.Uri.from({
-            scheme: featureDevScheme,
-            path: path.join(session.uploadId, zipFilePath),
-            query: `tabID=${tabId}`,
-        })
-
-        return { left, right }
-    }
-
     private async fileClicked(message: fileClickedMessage) {
         // TODO: add Telemetry here
         const tabId: string = message.tabID
@@ -804,12 +785,11 @@ export class FeatureDevController {
         const pathInfos = getPathsFromZipFilePath(zipFilePath, workspacePrefixMapping, session.config.workspaceFolders)
 
         if (message.deleted) {
-            const fileUri = this.getOriginalFileUri(pathInfos.absolutePath, tabId)
-            const basename = path.basename(pathInfos.relativePath)
-            await vscode.commands.executeCommand('vscode.open', fileUri, {}, `${basename} (Deleted)`)
+            const name = path.basename(pathInfos.relativePath)
+            await openDeletedDiff(pathInfos.absolutePath, name, tabId)
         } else {
-            const { left, right } = this.getFileDiffUris(zipFilePath, pathInfos.absolutePath, tabId, session)
-            await vscode.commands.executeCommand('vscode.diff', left, right)
+            const rightPath = path.join(session.uploadId, zipFilePath)
+            await openDiff(pathInfos.absolutePath, rightPath, tabId)
         }
     }
 

packages/core/src/amazonqFeatureDev/types.ts

@@ -8,7 +8,6 @@ import { VirtualFileSystem } from '../shared/virtualFilesystem'
 import type { CancellationTokenSource } from 'vscode'
 import { Messenger } from './controllers/chat/messenger/messenger'
 import { FeatureDevClient } from './client/featureDev'
-import { featureDevScheme } from './constants'
 import { TelemetryHelper } from './util/telemetryHelper'
 import { CodeReference } from '../amazonq/webview/ui/connector'
 import { DiffTreeFileInfo } from '../amazonq/webview/ui/diffTree/types'
@@ -107,12 +106,4 @@ export interface SessionStorage {
     [key: string]: SessionInfo
 }
 
-export function createUri(filePath: string, tabID?: string) {
-    return vscode.Uri.from({
-        scheme: featureDevScheme,
-        path: filePath,
-        ...(tabID ? { query: `tabID=${tabID}` } : {}),
-    })
-}
-
 export type LLMResponseType = 'EMPTY' | 'INVALID_STATE' | 'VALID'