Merge master into feature/emr

Author: aws-toolkit-automation

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "amazon q inline: skip indexing when no workspace folders are found"
+}

packages/amazonq/.changes/next-release/Bug Fix-54e46358-d60f-492b-af5c-b23f4aa2b1b8.json

@@ -23,14 +23,6 @@ import { isWeb } from '../../shared/extensionGlobals'
 import { getUserAgent } from '../../shared/telemetry/util'
 import { isAmazonInternalOs } from '../../shared/vscode/env'
 
-function getProjectPaths() {
-    const workspaceFolders = vscode.workspace.workspaceFolders
-    if (!workspaceFolders || workspaceFolders.length === 0) {
-        throw new ToolkitError('No workspace folders found')
-    }
-    return workspaceFolders.map((folder) => folder.uri.fsPath)
-}
-
 export interface Chunk {
     readonly filePath: string
     readonly content: string
@@ -322,12 +314,13 @@ export class LspController {
     async buildIndex(buildIndexConfig: BuildIndexConfig) {
         getLogger().info(`LspController: Starting to build index of project`)
         const start = performance.now()
-        const projPaths = getProjectPaths()
+        const projPaths = (vscode.workspace.workspaceFolders ?? []).map((folder) => folder.uri.fsPath)
+        if (projPaths.length === 0) {
+            getLogger().info(`LspController: Skipping building index. No projects found in workspace`)
+            return
+        }
         projPaths.sort()
         try {
-            if (projPaths.length === 0) {
-                throw Error('No project')
-            }
             this._isIndexingInProgress = true
             const projRoot = projPaths[0]
             const files = await collectFilesForIndex(
@@ -340,7 +333,7 @@ export class LspController {
                 (accumulator, currentFile) => accumulator + currentFile.fileSizeBytes,
                 0
             )
-            getLogger().info(`LspController: Found ${files.length} files in current project ${getProjectPaths()}`)
+            getLogger().info(`LspController: Found ${files.length} files in current project ${projPaths}`)
             const config = buildIndexConfig.isVectorIndexEnabled ? 'all' : 'default'
             const r = files.map((f) => f.fileUri.fsPath)
             const resp = await LspClient.instance.buildIndex(r, projRoot, config)

packages/core/src/amazonq/lsp/lspController.ts

@@ -718,8 +718,12 @@ export async function finalizeTransformationJob(status: string) {
     if (!(status === 'COMPLETED' || status === 'PARTIALLY_COMPLETED')) {
         getLogger().error(`CodeTransformation: ${CodeWhispererConstants.failedToCompleteJobNotification}`)
         jobPlanProgress['transformCode'] = StepProgress.Failed
-        transformByQState.setJobFailureErrorNotification(CodeWhispererConstants.failedToCompleteJobNotification)
-        transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.failedToCompleteJobChatMessage)
+        if (!transformByQState.getJobFailureErrorNotification()) {
+            transformByQState.setJobFailureErrorNotification(CodeWhispererConstants.failedToCompleteJobNotification)
+        }
+        if (!transformByQState.getJobFailureErrorChatMessage()) {
+            transformByQState.setJobFailureErrorChatMessage(CodeWhispererConstants.failedToCompleteJobChatMessage)
+        }
         throw new Error('Job was not successful nor partially successful')
     }
     transformByQState.setToSucceeded()

packages/core/src/codewhisperer/commands/startTransformByQ.ts

@@ -516,8 +516,8 @@ export class ProposedTransformationExplorer {
                             programmingLanguage: {
                                 languageName:
                                     transformByQState.getTransformationType() === TransformationType.LANGUAGE_UPGRADE
-                                        ? 'JAVA'
-                                        : 'SQL',
+                                        ? 'java'
+                                        : 'sql',
                             },
                             linesOfCodeChanged: metricsData.linesOfCodeChanged,
                             charsOfCodeChanged: metricsData.charactersOfCodeChanged,