From 45cd966a16e78b7e9bee0d64afd7d6b2f2394c9e Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 23 Oct 2019 16:09:18 -0700 Subject: [PATCH] Use VS Code's fs instead of node --- .../src/features/updatePathsOnRename.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts index 9333e6f75c0..68d641f316c 100644 --- a/extensions/typescript-language-features/src/features/updatePathsOnRename.ts +++ b/extensions/typescript-language-features/src/features/updatePathsOnRename.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import * as fs from 'fs'; import * as path from 'path'; import * as vscode from 'vscode'; import * as nls from 'vscode-nls'; @@ -22,15 +21,12 @@ const localize = nls.loadMessageBundle(); const updateImportsOnFileMoveName = 'updateImportsOnFileMove.enabled'; -function isDirectory(path: string): Promise { - return new Promise((resolve, reject) => { - fs.stat(path, (err, stat) => { - if (err) { - return reject(err); - } - return resolve(stat.isDirectory()); - }); - }); +async function isDirectory(resource: vscode.Uri): Promise { + try { + return (await vscode.workspace.fs.stat(resource)).type === vscode.FileType.Directory; + } catch { + return false; + } } const enum UpdateImportsOnFileMoveSetting { @@ -198,7 +194,7 @@ class UpdateImportsOnFileRenameHandler extends Disposable { return undefined; } - if (await isDirectory(resource.fsPath)) { + if (await isDirectory(resource)) { const files = await vscode.workspace.findFiles({ base: resource.fsPath, pattern: '**/*.{ts,tsx,js,jsx}',