Merge branch 'master' into flakyTestTemplate

Author: Hweinstock

package-lock.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Chat container exceeds width of container"
+}

packages/amazonq/.changes/next-release/Bug Fix-289bb195-ba14-4725-9e29-70b514f42df3.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

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "file details and name unneccessary cropping"
+}

packages/amazonq/.changes/next-release/Bug Fix-5883c245-fb4d-4441-8361-38dc21146be5.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /dev: support `.gradle` files"
+}

packages/amazonq/.changes/next-release/Feature-13564075-487c-424c-a48e-43ee446d1dad.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Notifications: Support for delivering critical alerts and product updates"
+}

packages/amazonq/.changes/next-release/Feature-77884869-72ad-4ee0-986e-62cc1ca8e746.json

@@ -75,7 +75,7 @@ async function activateAmazonQNode(context: vscode.ExtensionContext) {
         ...authState,
     })
 
-    await activateNotifications(context, authState, getAuthState)
+    void activateNotifications(context, authState, getAuthState)
 }
 
 async function getAuthState(): Promise<Omit<AuthUserState, 'source'>> {

packages/amazonq/src/extensionNode.ts

@@ -109,6 +109,7 @@ describe('session', () => {
         it('only insert non rejected files', async () => {
             const fsSpyWriteFile = sinon.spy(fs, 'writeFile')
             const session = await createCodeGenState()
+            sinon.stub(session, 'sendLinesOfCodeAcceptedTelemetry').resolves()
             await sessionWriteFile(session, uri, encodedContent)
             await session.insertChanges()
 

packages/amazonq/test/unit/amazonqFeatureDev/session/session.test.ts

@@ -0,0 +1,9 @@
+{
+    "content": [
+        {
+            "name": "Added file",
+            "fileName": "resources/files/addedFile.diff",
+            "isSuccessful": true
+        }
+    ]
+}

packages/amazonq/test/unit/amazonqGumby/resources/files/diff.json

@@ -4,13 +4,19 @@
  */
 import assert from 'assert'
 import sinon from 'sinon'
-import os from 'os'
 import { DiffModel, AddedChangeNode, ModifiedChangeNode } from 'aws-core-vscode/codewhisperer/node'
+import { DescriptionContent } from 'aws-core-vscode/codewhisperer'
 import path from 'path'
 import { getTestResourceFilePath } from './amazonQGumbyUtil'
 import { fs } from 'aws-core-vscode/shared'
+import { createTestWorkspace } from 'aws-core-vscode/test'
 
 describe('DiffModel', function () {
+    let parsedTestDescriptions: DescriptionContent
+    beforeEach(async () => {
+        parsedTestDescriptions = JSON.parse(await fs.readFileText(getTestResourceFilePath('resources/files/diff.json')))
+    })
+
     afterEach(() => {
         sinon.restore()
     })
@@ -28,34 +34,76 @@ describe('DiffModel', function () {
 
             return true
         })
+        testDiffModel.parseDiff(
+            getTestResourceFilePath('resources/files/addedFile.diff'),
+            workspacePath,
+            parsedTestDescriptions.content[0],
+            1
+        )
 
-        testDiffModel.parseDiff(getTestResourceFilePath('resources/files/addedFile.diff'), workspacePath)
-
-        assert.strictEqual(testDiffModel.changes.length, 1)
-        const change = testDiffModel.changes[0]
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/addedFile.diff')
+        )
+        assert(testDiffModel.patchFileNodes[0].label.includes(parsedTestDescriptions.content[0].name))
+        const change = testDiffModel.patchFileNodes[0].children[0]
 
         assert.strictEqual(change instanceof AddedChangeNode, true)
     })
 
     it('WHEN parsing a diff patch where a file was modified THEN returns an array representing the modified file', async function () {
         const testDiffModel = new DiffModel()
 
-        const workspacePath = os.tmpdir()
-
-        sinon.replace(fs, 'exists', async (path) => true)
+        const fileAmount = 1
+        const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: '' })
 
         await fs.writeFile(
-            path.join(workspacePath, 'README.md'),
+            path.join(workspaceFolder.uri.fsPath, 'README.md'),
             'This guide walks you through using Gradle to build a simple Java project.'
         )
 
-        testDiffModel.parseDiff(getTestResourceFilePath('resources/files/modifiedFile.diff'), workspacePath)
+        testDiffModel.parseDiff(
+            getTestResourceFilePath('resources/files/modifiedFile.diff'),
+            workspaceFolder.uri.fsPath,
+            parsedTestDescriptions.content[0],
+            1
+        )
 
-        assert.strictEqual(testDiffModel.changes.length, 1)
-        const change = testDiffModel.changes[0]
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/modifiedFile.diff')
+        )
+        assert(testDiffModel.patchFileNodes[0].label.includes(parsedTestDescriptions.content[0].name))
+        const change = testDiffModel.patchFileNodes[0].children[0]
 
         assert.strictEqual(change instanceof ModifiedChangeNode, true)
+    })
+
+    it('WHEN parsing a diff patch where diff.json is not present and a file was modified THEN returns an array representing the modified file', async function () {
+        const testDiffModel = new DiffModel()
 
-        await fs.delete(path.join(workspacePath, 'README.md'), { recursive: true })
+        const fileAmount = 1
+        const workspaceFolder = await createTestWorkspace(fileAmount, { fileContent: '' })
+
+        await fs.writeFile(
+            path.join(workspaceFolder.uri.fsPath, 'README.md'),
+            'This guide walks you through using Gradle to build a simple Java project.'
+        )
+
+        testDiffModel.parseDiff(
+            getTestResourceFilePath('resources/files/modifiedFile.diff'),
+            workspaceFolder.uri.fsPath,
+            undefined,
+            1
+        )
+
+        assert.strictEqual(
+            testDiffModel.patchFileNodes[0].patchFilePath,
+            getTestResourceFilePath('resources/files/modifiedFile.diff')
+        )
+        assert(testDiffModel.patchFileNodes[0].label.endsWith('modifiedFile.diff'))
+        const change = testDiffModel.patchFileNodes[0].children[0]
+
+        assert.strictEqual(change instanceof ModifiedChangeNode, true)
     })
 })