Use IFileSystem.search() instead of glob().

Author: ericsnowcurrently

src/client/common/platform/fileSystem.ts

@@ -9,11 +9,14 @@ import * as glob from 'glob';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import * as tmp from 'tmp';
+import { promisify } from 'util';
 import { FileStat } from 'vscode';
 import { createDeferred } from '../utils/async';
 import { noop } from '../utils/misc';
 import { IFileSystem, IPlatformService, TemporaryFile } from './types';
 
+const globAsync = promisify(glob);
+
 @injectable()
 export class FileSystem implements IFileSystem {
     constructor(@inject(IPlatformService) private platformService: IPlatformService) {}
@@ -173,15 +176,17 @@ export class FileSystem implements IFileSystem {
             });
         });
     }
-    public search(globPattern: string): Promise<string[]> {
-        return new Promise<string[]>((resolve, reject) => {
-            glob(globPattern, (ex, files) => {
-                if (ex) {
-                    return reject(ex);
-                }
-                resolve(Array.isArray(files) ? files : []);
-            });
-        });
+    public async search(globPattern: string, cwd?: string): Promise<string[]> {
+        let found: string[];
+        if (cwd) {
+            const options = {
+                cwd: cwd
+            };
+            found = await globAsync(globPattern, options);
+        } else {
+            found = await globAsync(globPattern);
+        }
+        return Array.isArray(found) ? found : [];
     }
     public createTemporaryFile(extension: string): Promise<TemporaryFile> {
         return new Promise<TemporaryFile>((resolve, reject) => {

src/client/common/platform/types.ts

@@ -62,7 +62,7 @@ export interface IFileSystem {
     copyFile(src: string, dest: string): Promise<void>;
     deleteFile(filename: string): Promise<void>;
     getFileHash(filePath: string): Promise<string>;
-    search(globPattern: string): Promise<string[]>;
+    search(globPattern: string, cwd?: string): Promise<string[]>;
     createTemporaryFile(extension: string): Promise<TemporaryFile>;
     createReadStream(path: string): fs.ReadStream;
     createWriteStream(path: string): fs.WriteStream;

src/client/datascience/themeFinder.ts

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 'use strict';
-import * as glob from 'glob';
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 
@@ -107,14 +106,10 @@ export class ThemeFinder implements IThemeFinder {
 
         // Search through all package.json files in the directory and below, looking
         // for the themeName in them.
-        const foundPackages = await new Promise<string[]>((resolve, reject) => {
-            glob('**/package.json', { cwd: rootPath }, (err, matches) => {
-                if (err) {
-                    reject(err);
-                }
-                resolve(matches);
-            });
-        });
+        const fs = new FileSystem(
+            new PlatformService()
+        );
+        const foundPackages = await fs.search('**/package.json', rootPath);
         if (foundPackages.length > 0) {
             // For each one, open it up and look for the theme name.
             for (const f of foundPackages) {
@@ -167,14 +162,10 @@ export class ThemeFinder implements IThemeFinder {
     private async findMatchingThemes(rootPath: string, themeName: string) : Promise<IThemeData | undefined> {
         // Search through all package.json files in the directory and below, looking
         // for the themeName in them.
-        const foundPackages = await new Promise<string []>((resolve, reject) => {
-            glob('**/package.json', { cwd: rootPath }, (err, matches) => {
-                if (err) {
-                    reject(err);
-                }
-                resolve(matches);
-            });
-        });
+        const fs = new FileSystem(
+            new PlatformService()
+        );
+        const foundPackages = await fs.search('**/package.json', rootPath);
         if (foundPackages.length > 0) {
             // For each one, open it up and look for the theme name.
             for (const f of foundPackages) {