feat: add support for reading unsaved content

Author: Hweinstock

packages/core/src/shared/utilities/workspaceUtils.ts

@@ -21,6 +21,7 @@ import { ChildProcess } from './processUtils'
 import { isWin } from '../vscode/env'
 import { maxRepoSizeBytes } from '../../amazonqFeatureDev/constants'
 import { ZipConstants } from '../../codewhisperer/util/zipUtil'
+import { isFileOpenAndDirty } from '../../amazonq/util/zipProjectUtil'
 
 type GitIgnoreRelativeAcceptor = {
     folderPath: string
@@ -391,7 +392,7 @@ export async function collectFiles(
     }
 
     let totalSizeBytes = 0
-    const storage = []
+    const storage: (Omit<CollectFilesResultItem, 'fileContent'> | CollectFilesResultItem)[] = []
     const excludePatternFilter = excludePatternsAsString(excludePatterns)
     for (const rootPath of sourcePaths) {
         const allFiles = await vscode.workspace.findFiles(
@@ -432,19 +433,21 @@ export async function collectFiles(
                 isText: !ZipConstants.knownBinaryFileExts.includes(path.extname(file.fsPath)),
             }
             if (includeContent) {
-                const content = await readFile(file)
+                const hasUnsavedChanges = isFileOpenAndDirty(file)
+                const content =
+                    result.isText && hasUnsavedChanges ? await getCurrentTextContent(file) : await readFile(file)
                 if (content === undefined) {
                     continue
                 }
-                totalSizeBytes += fileStat.size
+
                 storage.push({
                     ...result,
                     fileContent: content,
                 })
             } else {
-                totalSizeBytes += fileStat.size
                 storage.push(result)
             }
+            totalSizeBytes += fileStat.size
         }
     }
     return storage
@@ -463,6 +466,12 @@ export async function collectFiles(
         }
         return prefix === '' ? path : `${prefix}/${path}`
     }
+
+    async function getCurrentTextContent(uri: vscode.Uri) {
+        const document = await vscode.workspace.openTextDocument(uri)
+        const content = document.getText()
+        return content
+    }
 }
 
 const readFile = async (file: vscode.Uri) => {

packages/core/src/testInteg/shared/utilities/workspaceUtils.test.ts

@@ -363,6 +363,22 @@ describe('workspaceUtils', () => {
                 (e) => e instanceof ToolkitError && e.code === 'ContentLengthError'
             )
         })
+
+        it('pulls updated content from unsaved open files', async function () {
+            const workspace = await createTestWorkspaceFolder()
+            const filepath = path.join(workspace.uri.fsPath, 'file1')
+            await toFile('this is some text', filepath)
+
+            const document = await vscode.workspace.openTextDocument(filepath)
+            await vscode.window.showTextDocument(document)
+            void vscode.window.activeTextEditor?.edit((editBuilder) => {
+                editBuilder.insert(new vscode.Position(0, 0), '// a comment\n')
+            })
+
+            const result = await collectFiles([workspace.uri.fsPath], [workspace])
+            assert.strictEqual(result.length, 1)
+            assert.strictEqual(result[0].fileContent, '// a comment\nthis is some text')
+        })
     })
 
     describe('getWorkspaceFoldersByPrefixes', function () {