Merge branch 'master' into refactor-sam-sync-deploy-build

Author: vicheey

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": "file details and name unneccessary cropping"
+}

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

@@ -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)
     })
 })

packages/amazonq/test/unit/amazonqGumby/transformationResultsHandler.test.ts

@@ -435,7 +435,6 @@
         "c8": "^9.0.0",
         "circular-dependency-plugin": "^5.2.2",
         "css-loader": "^6.10.0",
-        "diff": "^5.1.0",
         "esbuild-loader": "2.20.0",
         "file-loader": "^6.2.0",
         "jsdom": "^23.0.1",
@@ -470,7 +469,7 @@
         "@aws-sdk/property-provider": "3.46.0",
         "@aws-sdk/smithy-client": "^3.46.0",
         "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws/mynah-ui": "^4.18.0",
+        "@aws/mynah-ui": "^4.18.1",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/middleware-retry": "^2.3.1",
@@ -488,6 +487,7 @@
         "bytes": "^3.1.2",
         "cross-fetch": "^4.0.0",
         "cross-spawn": "^7.0.3",
+        "diff": "^5.1.0",
         "fast-json-patch": "^3.1.1",
         "glob": "^10.3.10",
         "got": "^11.8.5",

packages/core/package.json

@@ -6,6 +6,7 @@
 import * as vscode from 'vscode'
 import { featureDevScheme } from '../../amazonqFeatureDev/constants'
 import { fs } from '../../shared'
+import { diffLines } from 'diff'
 
 export async function openDiff(leftPath: string, rightPath: string, tabId: string) {
     const { left, right } = await getFileDiffUris(leftPath, rightPath, tabId)
@@ -29,6 +30,34 @@ export async function getFileDiffUris(leftPath: string, rightPath: string, tabId
     return { left, right }
 }
 
+export async function computeDiff(leftPath: string, rightPath: string, tabId: string) {
+    const { left, right } = await getFileDiffUris(leftPath, rightPath, tabId)
+    const leftFile = await vscode.workspace.openTextDocument(left)
+    const rightFile = await vscode.workspace.openTextDocument(right)
+
+    const changes = diffLines(leftFile.getText(), rightFile.getText(), {
+        ignoreWhitespace: true,
+    })
+
+    let charsAdded = 0
+    let charsRemoved = 0
+    let linesAdded = 0
+    let linesRemoved = 0
+    changes.forEach((change) => {
+        const lines = change.value.split('\n')
+        const charCount = lines.reduce((sum, line) => sum + line.length, 0)
+        const lineCount = change.count ?? lines.length - 1 // ignoring end-of-file empty line
+        if (change.added) {
+            charsAdded += charCount
+            linesAdded += lineCount
+        } else if (change.removed) {
+            charsRemoved += charCount
+            linesRemoved += lineCount
+        }
+    })
+    return { changes, charsAdded, linesAdded, charsRemoved, linesRemoved }
+}
+
 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/commons/diff.ts

@@ -27,7 +27,14 @@ 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'
+export {
+    createAmazonQUri,
+    openDiff,
+    openDeletedDiff,
+    getOriginalFileUri,
+    getFileDiffUris,
+    computeDiff,
+} from './commons/diff'
 export { CodeReference } from '../codewhispererChat/view/connector/connector'
 export { AuthMessageDataMap, AuthFollowUpType } from './auth/model'
 export { extractAuthFollowUp } from './util/authUtils'

packages/core/src/amazonq/index.ts

@@ -873,6 +873,44 @@
             "max": 100,
             "min": 0
         },
+        "FeatureDevCodeAcceptanceEvent": {
+            "type": "structure",
+            "required": ["conversationId", "linesOfCodeAccepted", "charactersOfCodeAccepted"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "linesOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger" },
+                "charactersOfCodeAccepted": { "shape": "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger" },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
+            }
+        },
+        "FeatureDevCodeAcceptanceEventCharactersOfCodeAcceptedInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "FeatureDevCodeAcceptanceEventLinesOfCodeAcceptedInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "FeatureDevCodeGenerationEvent": {
+            "type": "structure",
+            "required": ["conversationId", "linesOfCodeGenerated", "charactersOfCodeGenerated"],
+            "members": {
+                "conversationId": { "shape": "ConversationId" },
+                "linesOfCodeGenerated": { "shape": "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger" },
+                "charactersOfCodeGenerated": {
+                    "shape": "FeatureDevCodeGenerationEventCharactersOfCodeGeneratedInteger"
+                },
+                "programmingLanguage": { "shape": "ProgrammingLanguage" }
+            }
+        },
+        "FeatureDevCodeGenerationEventCharactersOfCodeGeneratedInteger": {
+            "type": "integer",
+            "min": 0
+        },
+        "FeatureDevCodeGenerationEventLinesOfCodeGeneratedInteger": {
+            "type": "integer",
+            "min": 0
+        },
         "FeatureDevEvent": {
             "type": "structure",
             "required": ["conversationId"],
@@ -1741,6 +1779,8 @@
                 "chatUserModificationEvent": { "shape": "ChatUserModificationEvent" },
                 "terminalUserInteractionEvent": { "shape": "TerminalUserInteractionEvent" },
                 "featureDevEvent": { "shape": "FeatureDevEvent" },
+                "featureDevCodeGenerationEvent": { "shape": "FeatureDevCodeGenerationEvent" },
+                "featureDevCodeAcceptanceEvent": { "shape": "FeatureDevCodeAcceptanceEvent" },
                 "inlineChatEvent": { "shape": "InlineChatEvent" }
             },
             "union": true