feat(solidity/extension): file with spaces are now formattable & cleanup

astrodevs-labs · Jan 9, 2024 · 5205de8 · 5205de8
1 parent da7106a
commit 5205de8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 62 deletions.
diff --git a/remove-me-cbf2e47a07ec45e48896.txt b/remove-me-cbf2e47a07ec45e48896.txt
diff --git a/toolchains/solidity/extension/package.json b/toolchains/solidity/extension/package.json
@@ -28,21 +28,8 @@
       {
         "command": "osmium.lint-sol-workspace",
         "title": "Osmium: Lint Solidity Workspace"
-      },
-      {
-        "command": "osmium.lint-sol-file-from-explorer",
-        "title": "Osmium: Lint Solidity File"
       }
     ],
-    "menus": {
-      "explorer/context": [
-        {
-          "when": "resourceLangId == solidity",
-          "command": "extension.lint-sol-file-from-explorer",
-          "group": "navigation"
-        }
-      ]
-    },
     "languages": [
       {
         "id": "solidity",

diff --git a/toolchains/solidity/extension/src/fmt-wrapper.ts b/toolchains/solidity/extension/src/fmt-wrapper.ts
@@ -47,7 +47,7 @@ function forgeFmt(
   const commandArgs = ["fmt"];
 
   if (root) {
-    commandArgs.push("--root", root);
+    commandArgs.push("--root", `"${root}"`);
   }
 
   if (check) {
@@ -58,12 +58,14 @@ function forgeFmt(
     commandArgs.push("--raw");
   }
 
-  commandArgs.push(...files);
+  commandArgs.push(
+    ...files.map((file) => (file.includes(" ") ? `"${file}"` : file))
+  );
 
   const command = `forge ${commandArgs.join(" ")}`;
 
   if (debug) {
-    console.debug(command);
+    console.debug("command =>", command);
   }
 
   return new Promise((resolve, reject) => {
@@ -81,48 +83,6 @@ function forgeFmt(
 }
 
 function registerForgeFmtLinter(context: vscode.ExtensionContext) {
-  const lintSolFromExplorer = vscode.commands.registerCommand(
-    "osmium.lint-sol-file-from-explorer",
-    function (uri) {
-      if (!isFmtInstalled()) {
-        vscode.window.showErrorMessage(
-          "Forge fmt is not installed. Please install it and try again."
-        );
-        return;
-      }
-
-      const options: ForgeFmtOptions = {
-        root: vscode.workspace.workspaceFolders?.[0].uri.fsPath,
-        check: false,
-        raw: false,
-      };
-
-      const args: ForgeFmtArgs = {
-        options,
-        files: [uri.fsPath],
-      };
-
-      forgeFmt(args)
-        .then((result) => {
-          if (result.exitCode === 0) {
-            vscode.window.showInformationMessage("Forge fmt ran successfully.");
-          } else {
-            vscode.window.showErrorMessage(
-              "Forge fmt failed. Please check the output for details."
-            );
-
-            console.log(result.output);
-          }
-        })
-        .catch((error) => {
-          vscode.window.showErrorMessage(
-            "Forge fmt failed. Please check the output for details."
-          );
-          console.error(error);
-        });
-    }
-  );
-
   const lintSolFile = vscode.commands.registerCommand(
     "osmium.lint-sol-file",
     function () {
@@ -216,7 +176,7 @@ function registerForgeFmtLinter(context: vscode.ExtensionContext) {
         files: [vscode.workspace.workspaceFolders?.[0].uri.fsPath],
       };
 
-      forgeFmt(args, true)
+      forgeFmt(args)
         .then((result) => {
           if (result.exitCode === 0) {
             vscode.window.showInformationMessage("Forge fmt ran successfully.");
@@ -276,8 +236,6 @@ function registerForgeFmtLinter(context: vscode.ExtensionContext) {
     }
   );
 
-  context.subscriptions.push(lintSolFromExplorer);
-
   context.subscriptions.push(lintSolFile);
   context.subscriptions.push(lintSolWorkspace);