Merge master into feature/q-utg

aws-toolkit-automation · web-flow · commit bf041fd2df89 · 2025-02-26T08:42:33.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/amazonq/.changes/next-release/Bug Fix-21c570d4-388e-460f-88e1-7034ed7e17d4.json b/packages/amazonq/.changes/next-release/Bug Fix-21c570d4-388e-460f-88e1-7034ed7e17d4.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace."
+}
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -521,7 +521,7 @@
         "@vscode/debugprotocol": "^1.57.0",
         "@zip.js/zip.js": "^2.7.41",
         "adm-zip": "^0.5.10",
-        "amazon-states-language-service": "^1.15.0",
+        "amazon-states-language-service": "^1.16.1",
         "async-lock": "^1.4.0",
         "aws-sdk": "^2.1692.0",
         "aws-ssm-document-language-service": "^1.0.0",
diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts
@@ -678,12 +678,7 @@ export class TestController {
     private async openDiff(message: OpenDiffMessage) {
         const session = this.sessionStorage.getSession()
         const filePath = session.generatedFilePath
-        const workspaceFolder = vscode.workspace.workspaceFolders?.[0]
-        if (!workspaceFolder) {
-            throw new Error('No workspace folder found')
-        }
-        const projectPath = workspaceFolder.uri.fsPath
-        const absolutePath = path.join(projectPath, filePath)
+        const absolutePath = path.join(session.projectRootPath, filePath)
         const fileExists = await fs.existsFile(absolutePath)
         const leftUri = fileExists ? vscode.Uri.file(absolutePath) : vscode.Uri.from({ scheme: 'untitled' })
         const rightUri = vscode.Uri.file(path.join(this.tempResultDirPath, 'resultArtifacts', filePath))
diff --git a/packages/toolkit/.changes/next-release/Feature-43784260-ff60-4419-8fe3-a886a2b37fc6.json b/packages/toolkit/.changes/next-release/Feature-43784260-ff60-4419-8fe3-a886a2b37fc6.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Step Functions: Expand data source and output options for Distributed Map in ASL language schema"
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "Amazon Q /test: Unit test generation displays an inaccurate diff view for non-primary packages in the workspace."
 +}