Update the glob usage to match the new api.

Author: Artmann

src/telemetryGenerator.node.ts

@@ -771,15 +771,7 @@ function generateTelemetryGdpr(output: TelemetryEntry[]) {
 }
 
 async function generateTelemetryOutput() {
-    const files = await new Promise<string[]>((resolve, reject) => {
-        glob(path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src/**/*.ts'), (ex, res) => {
-            if (ex) {
-                reject(ex);
-            } else {
-                resolve(res);
-            }
-        });
-    });
+    const files = await glob(path.join(EXTENSION_ROOT_DIR_FOR_TESTS, 'src/**/*.ts'));
     // Print out the source tree
     return generateDocumentation(files);
 }

src/test/extension.serviceRegistry.vscode.test.ts

@@ -114,16 +114,8 @@ async function getInjectableClasses(fileNames: string[], options: ts.CompilerOpt
 }
 
 async function getSourceFiles() {
-    const files = await new Promise<string[]>((resolve, reject) => {
-        const globPattern = path.join(__dirname, '..', '..', 'src', '**', '*.ts').replace(/\\/g, '/');
-        glob(globPattern, (ex, res) => {
-            if (ex) {
-                reject(ex);
-            } else {
-                resolve(res);
-            }
-        });
-    });
+    const globPattern = path.join(__dirname, '..', '..', 'src', '**', '*.ts').replace(/\\/g, '/');
+    const files = await glob(globPattern);
     return files;
 }
 

src/test/index.node.ts

@@ -187,21 +187,13 @@ export async function run(): Promise<void> {
         default:
             break;
     }
-    const testFiles = await new Promise<string[]>((resolve, reject) => {
-        // If we have mulitple patterns, then turn into regex from `a,b,c` to `(a|b|c)`
-        const pattern = options.testFilesSuffix.includes(',')
-            ? `(${options.testFilesSuffix.split(',').join('|')})`
-            : options.testFilesSuffix;
-        glob(
-            `**/*${pattern}.js`,
-            { ignore: ['**/**.unit.test.js'].concat(ignoreGlob), cwd: testsRoot },
-            (error, files) => {
-                if (error) {
-                    return reject(error);
-                }
-                resolve(files);
-            }
-        );
+    // If we have mulitple patterns, then turn into regex from `a,b,c` to `(a|b|c)`
+    const pattern = options.testFilesSuffix.includes(',')
+        ? `(${options.testFilesSuffix.split(',').join('|')})`
+        : options.testFilesSuffix;
+    const testFiles = await glob(`**/*${pattern}.js`, {
+        ignore: ['**/**.unit.test.js'].concat(ignoreGlob),
+        cwd: testsRoot
     });
 
     // Setup test files that need to be run.

src/test/testRunner.ts

@@ -71,26 +71,17 @@ export async function run(): Promise<void> {
         return promise;
     }
     // Run the tests.
+    const files = await glob(`**/**.${testFilesGlob}.js`, { ignore: ['**/**.unit.test.js'], cwd: testsRoot });
+    files.forEach((file) => mocha.addFile(path.join(testsRoot, file)));
+
     await new Promise<void>((resolve, reject) => {
-        glob(`**/**.${testFilesGlob}.js`, { ignore: ['**/**.unit.test.js'], cwd: testsRoot }, (error, files) => {
-            if (error) {
-                return reject(error);
-            }
-            try {
-                files.forEach((file) => mocha.addFile(path.join(testsRoot, file)));
-                initializationScript()
-                    .then(() =>
-                        mocha.run((failures) =>
-                            failures > 0 ? reject(new Error(`${failures} total failures`)) : resolve()
-                        )
-                    )
-                    .finally(() => {
-                        stopJupyterServer().catch(noop);
-                    })
-                    .catch(reject);
-            } catch (error) {
-                return reject(error);
-            }
-        });
+        initializationScript()
+            .then(() =>
+                mocha.run((failures) => (failures > 0 ? reject(new Error(`${failures} total failures`)) : resolve()))
+            )
+            .finally(() => {
+                stopJupyterServer().catch(noop);
+            })
+            .catch(reject);
     });
 }