move to our fs module

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

@@ -14,6 +14,7 @@ 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')
@@ -57,15 +58,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,9 +75,9 @@ describe('diff', () => {
     })
 
     describe('getOriginalFileUri', () => {
-        it('file exists locally', () => {
+        it('file exists locally', async () => {
             sandbox.stub(fs, 'existsSync').returns(true)
-            assert.deepStrictEqual(getOriginalFileUri(filePath, tabId).fsPath, filePath)
+            assert.deepStrictEqual((await getOriginalFileUri(filePath, tabId)).fsPath, filePath)
         })
 
         it('file does not exists locally', () => {
@@ -87,10 +88,10 @@ describe('diff', () => {
     })
 
     describe('getFileDiffUris', () => {
-        it('file exists locally', () => {
+        it('file exists locally', async () => {
             sandbox.stub(fs, 'existsSync').returns(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,9 +100,9 @@ describe('diff', () => {
             assert.deepStrictEqual(right, rightExpected)
         })
 
-        it('file does not exists locally', () => {
+        it('file does not exists locally', async () => {
             sandbox.stub(fs, 'existsSync').returns(false)
-            const { left, right } = getFileDiffUris(filePath, rightPath, tabId)
+            const { left, right } = await getFileDiffUris(filePath, rightPath, tabId)
 
             const leftExpected = getOriginalFileUri(filePath, tabId)
             assert.deepStrictEqual(left, leftExpected)