Workspace formatting uses threads

Author: znorman-harris

libs/translation/src/lib/languages/en/en.ts

@@ -168,7 +168,7 @@ export const EN: ITranslation = {
         notAllFilesFormatted:
           'Some files were not formatted, see logs for more details',
         pickWorkspace:
-          'Specify the open workspace to format all IDL files for (Task and PRO)',
+          'Specify the open workspace to format all PRO files in workspace',
       },
       initConfig: {
         noWorkspaceOpen: 'No currently open workspaces',

libs/vscode/client/src/lib/helpers/vscode-display-progress.ts

@@ -31,7 +31,7 @@ export function VSCodeDisplayOrUpdateProgress(
       delete dialogs[id];
     } else {
       // update progress
-      dialogs[id].progress.report({ message, increment });
+      dialogs[id].progress.report({ message: '', increment });
     }
     return;
   } else {

libs/vscode/server/src/lib/events/custom-events/on-format-workspace.ts

@@ -1,5 +1,5 @@
 import { IDL_LSP_LOG } from '@idl/logger';
-import { IDL_JSON_URI, IDL_NOTEBOOK_EXTENSION } from '@idl/shared';
+import { PRO_CODE_GLOB_PATTERN } from '@idl/shared';
 import { IDL_TRANSLATION } from '@idl/translation';
 import {
   FormatWorkspacePayload,
@@ -37,12 +37,9 @@ export const ON_FORMAT_WORKSPACE = async (
     /**
      * Find files and exclude notebooks
      */
-    const files = (await IDL_INDEX.findFiles(event.folders)).filter(
-      (file) =>
-        !(
-          file.toLowerCase().endsWith(IDL_NOTEBOOK_EXTENSION) ||
-          file.toLowerCase().endsWith(IDL_JSON_URI)
-        )
+    const files = await IDL_INDEX.findFiles(
+      event.folders,
+      PRO_CODE_GLOB_PATTERN
     );
 
     /** Track file failures */
@@ -63,74 +60,92 @@ export const ON_FORMAT_WORKSPACE = async (
       }
     );
 
+    /**
+     * Track all work
+     */
+    const promises: Promise<any>[] = [];
+
     /**
      * Format each file
      */
     for (let i = 0; i < files.length; i++) {
-      try {
-        /**
-         * Resolve the fspath to our cell and retrieve code
-         */
-        const info = await ResolveFSPathAndCodeForURI(
-          URI.file(files[i]).toString()
-        );
-
-        // return if nothing found
-        if (info === undefined) {
-          return undefined;
-        }
-
-        /**
-         * Attempt to format
-         */
-        const formatted = await FormatFile({
-          // options are ignored
-          options: {
-            tabSize: 2,
-            insertSpaces: true,
-          },
-          textDocument: {
-            uri: info.uri,
-          },
-        });
-
-        /**
-         * Check if we failed to format
-         */
-        if (formatted === undefined) {
-          failures.push(files[i]);
-          continue;
-        }
-
-        // update the doc in VSCode
-        if (info.doc !== undefined) {
-          await UpdateDocument(info.uri, formatted, info.doc);
-        } else {
-          await writeFile(info.fsPath, formatted, 'utf-8');
-        }
-      } catch (err) {
-        IDL_LANGUAGE_SERVER_LOGGER.log({
-          log: IDL_LSP_LOG,
-          type: 'error',
-          content: [
-            `Error trying to format file in workspace: "${files[i]}"`,
-            err,
-          ],
-        });
-        failures.push(files[i]);
-      }
-
-      // update progress
-      SERVER_EVENT_MANAGER.sendNotification(
-        LANGUAGE_SERVER_MESSAGE_LOOKUP.PROGRESS,
-        {
-          progressId: id,
-          increment: 100 * (1 / files.length),
-          title: IDL_TRANSLATION.lsp.progress.formatWorkspace,
-        }
+      promises.push(
+        // eslint-disable-next-line no-async-promise-executor
+        new Promise<void>(async (res) => {
+          try {
+            /**
+             * Resolve the fspath to our cell and retrieve code
+             */
+            const info = await ResolveFSPathAndCodeForURI(
+              URI.file(files[i]).toString()
+            );
+
+            // return if nothing found
+            if (info === undefined) {
+              res();
+              return;
+            }
+
+            /**
+             * Attempt to format
+             */
+            const formatted = await FormatFile({
+              // options are ignored
+              options: {
+                tabSize: 2,
+                insertSpaces: true,
+              },
+              textDocument: {
+                uri: info.uri,
+              },
+            });
+
+            /**
+             * Check if we failed to format
+             */
+            if (formatted === undefined) {
+              failures.push(files[i]);
+              res();
+              return;
+            }
+
+            // update the doc in VSCode
+            if (info.doc !== undefined) {
+              await UpdateDocument(info.uri, formatted, info.doc);
+            } else {
+              await writeFile(info.fsPath, formatted, 'utf-8');
+            }
+          } catch (err) {
+            IDL_LANGUAGE_SERVER_LOGGER.log({
+              log: IDL_LSP_LOG,
+              type: 'error',
+              content: [
+                `Error trying to format file in workspace: "${files[i]}"`,
+                err,
+              ],
+            });
+            failures.push(files[i]);
+          }
+
+          // update progress
+          SERVER_EVENT_MANAGER.sendNotification(
+            LANGUAGE_SERVER_MESSAGE_LOOKUP.PROGRESS,
+            {
+              progressId: id,
+              increment: 100 * (1 / files.length),
+              title: IDL_TRANSLATION.lsp.progress.formatWorkspace,
+            }
+          );
+
+          // finish promise
+          res();
+        })
       );
     }
 
+    // wait for promises to finish
+    await Promise.all(promises);
+
     // update progress
     SERVER_EVENT_MANAGER.sendNotification(
       LANGUAGE_SERVER_MESSAGE_LOOKUP.PROGRESS,