Merge branch 'removeFsExtra' into removeFsExtra2

Author: Hweinstock

packages/core/src/amazonq/commons/diff.ts

@@ -3,26 +3,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { existsSync } from 'fs'
 import * as vscode from 'vscode'
 import { featureDevScheme } from '../../amazonqFeatureDev/constants'
+import { fs } from '../../shared'
 
 export async function openDiff(leftPath: string, rightPath: string, tabId: string) {
-    const { left, right } = getFileDiffUris(leftPath, rightPath, tabId)
+    const { left, right } = await getFileDiffUris(leftPath, rightPath, tabId)
     await vscode.commands.executeCommand('vscode.diff', left, right)
 }
 
 export async function openDeletedDiff(filePath: string, name: string, tabId: string) {
-    const fileUri = getOriginalFileUri(filePath, tabId)
+    const fileUri = await getOriginalFileUri(filePath, tabId)
     await vscode.commands.executeCommand('vscode.open', fileUri, {}, `${name} (Deleted)`)
 }
 
-export function getOriginalFileUri(fullPath: string, tabId: string) {
-    return existsSync(fullPath) ? vscode.Uri.file(fullPath) : createAmazonQUri('empty', tabId)
+export async function getOriginalFileUri(fullPath: string, tabId: string) {
+    return (await fs.exists(fullPath)) ? vscode.Uri.file(fullPath) : createAmazonQUri('empty', tabId)
 }
 
-export function getFileDiffUris(leftPath: string, rightPath: string, tabId: string) {
-    const left = getOriginalFileUri(leftPath, tabId)
+export async function getFileDiffUris(leftPath: string, rightPath: string, tabId: string) {
+    const left = await getOriginalFileUri(leftPath, tabId)
     const right = createAmazonQUri(rightPath, tabId)
 
     return { left, right }

packages/core/src/test/amazonq/common/diff.test.ts

@@ -11,9 +11,9 @@
 import assert from 'assert'
 import * as path from 'path'
 import * as vscode from 'vscode'
-import fs from 'fs'
 import sinon from 'sinon'
 import { createAmazonQUri, getFileDiffUris, getOriginalFileUri, openDeletedDiff, openDiff } from '../../../amazonq'
+import { FileSystem } from '../../../shared/fs/fs'
 
 describe('diff', () => {
     const filePath = path.join('/', 'foo', 'fi')
@@ -35,7 +35,7 @@ describe('diff', () => {
 
     describe('openDiff', () => {
         it('file exists locally', async () => {
-            sandbox.stub(fs, 'existsSync').returns(true)
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
             await openDiff(filePath, rightPath, tabId)
 
             const leftExpected = vscode.Uri.file(filePath)
@@ -44,10 +44,10 @@ describe('diff', () => {
         })
 
         it('file does not exists locally', async () => {
-            sandbox.stub(fs, 'existsSync').returns(false)
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
             await openDiff(filePath, rightPath, tabId)
 
-            const leftExpected = getOriginalFileUri(filePath, tabId)
+            const leftExpected = await getOriginalFileUri(filePath, tabId)
             const rightExpected = createAmazonQUri(rightPath, tabId)
             assert.ok(executeCommandSpy.calledWith('vscode.diff', leftExpected, rightExpected))
         })
@@ -57,15 +57,15 @@ describe('diff', () => {
         const name = 'foo'
 
         it('file exists locally', async () => {
-            sandbox.stub(fs, 'existsSync').returns(true)
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
             await openDeletedDiff(filePath, name, tabId)
 
             const expectedPath = vscode.Uri.file(filePath)
             assert.ok(executeCommandSpy.calledWith('vscode.open', expectedPath, {}, `${name} (Deleted)`))
         })
 
         it('file does not exists locally', async () => {
-            sandbox.stub(fs, 'existsSync').returns(false)
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
             await openDeletedDiff(filePath, name, tabId)
 
             const expectedPath = createAmazonQUri('empty', tabId)
@@ -74,23 +74,23 @@ describe('diff', () => {
     })
 
     describe('getOriginalFileUri', () => {
-        it('file exists locally', () => {
-            sandbox.stub(fs, 'existsSync').returns(true)
-            assert.deepStrictEqual(getOriginalFileUri(filePath, tabId).fsPath, filePath)
+        it('file exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
+            assert.deepStrictEqual((await getOriginalFileUri(filePath, tabId)).fsPath, filePath)
         })
 
-        it('file does not exists locally', () => {
-            sandbox.stub(fs, 'existsSync').returns(false)
+        it('file does not exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
             const expected = createAmazonQUri('empty', tabId)
-            assert.deepStrictEqual(getOriginalFileUri(filePath, tabId), expected)
+            assert.deepStrictEqual(await getOriginalFileUri(filePath, tabId), expected)
         })
     })
 
     describe('getFileDiffUris', () => {
-        it('file exists locally', () => {
-            sandbox.stub(fs, 'existsSync').returns(true)
+        it('file exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(true)
 
-            const { left, right } = getFileDiffUris(filePath, rightPath, tabId)
+            const { left, right } = await getFileDiffUris(filePath, rightPath, tabId)
 
             const leftExpected = vscode.Uri.file(filePath)
             assert.deepStrictEqual(left, leftExpected)
@@ -99,11 +99,11 @@ describe('diff', () => {
             assert.deepStrictEqual(right, rightExpected)
         })
 
-        it('file does not exists locally', () => {
-            sandbox.stub(fs, 'existsSync').returns(false)
-            const { left, right } = getFileDiffUris(filePath, rightPath, tabId)
+        it('file does not exists locally', async () => {
+            sandbox.stub(FileSystem.prototype, 'exists').resolves(false)
+            const { left, right } = await getFileDiffUris(filePath, rightPath, tabId)
 
-            const leftExpected = getOriginalFileUri(filePath, tabId)
+            const leftExpected = await getOriginalFileUri(filePath, tabId)
             assert.deepStrictEqual(left, leftExpected)
 
             const rightExpected = createAmazonQUri(rightPath, tabId)

packages/core/src/test/techdebt.test.ts

@@ -10,11 +10,11 @@ import * as env from '../shared/vscode/env'
 // Checks project config and dependencies, to remind us to remove old things
 // when possible.
 describe('tech debt', function () {
-    // function fixByDate(date: string, msg: string) {
-    //     const now = Date.now()
-    //     const cutoffDate = Date.parse(date)
-    //     assert.ok(now <= cutoffDate, msg)
-    // }
+    function fixByDate(date: string, msg: string) {
+        const now = Date.now()
+        const cutoffDate = Date.parse(date)
+        assert.ok(now <= cutoffDate, msg)
+    }
 
     it('vscode minimum version', async function () {
         const minVscode = env.getMinVscodeVersion()
@@ -46,13 +46,13 @@ describe('tech debt', function () {
         )
     })
 
-    // it('remove separate sessions login edge cases', async function () {
-    //     // src/auth/auth.ts:SessionSeparationPrompt
-    //     // forgetConnection() function and calls
+    it('remove separate sessions login edge cases', async function () {
+        // src/auth/auth.ts:SessionSeparationPrompt
+        // forgetConnection() function and calls
 
-    //     // Monitor telemtry to determine removal or snooze
-    //     // toolkit_showNotification.id = sessionSeparation
-    //     // auth_modifyConnection.action = deleteProfile OR auth_modifyConnection.source contains CodeCatalyst
-    //     fixByDate('2024-9-30', 'Remove the edge case code from the commit that this test is a part of.')
-    // })
+        // Monitor telemtry to determine removal or snooze
+        // toolkit_showNotification.id = sessionSeparation
+        // auth_modifyConnection.action = deleteProfile OR auth_modifyConnection.source contains CodeCatalyst
+        fixByDate('2024-10-30', 'Remove the edge case code from the commit that this test is a part of.')
+    })
 })