fix: lint and format

Author: 0xSwapFeeder

libs/path-utils/src/lib.rs

@@ -53,7 +53,6 @@ pub fn escape_path(path: &str) -> String {
     path.to_string()
 }
 
-
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -74,7 +73,10 @@ mod tests {
     fn test_join_path() {
         let base_path = "C:/Users/username/Documents";
         let file = "file.sol";
-        assert_eq!(join_path(base_path, file), "C:/Users/username/Documents/file.sol");
+        assert_eq!(
+            join_path(base_path, file),
+            "C:/Users/username/Documents/file.sol"
+        );
     }
 
     #[test]

vscode/src/fmt-wrapper.ts

@@ -168,6 +168,81 @@ function registerForgeFmtLinter(context: vscode.ExtensionContext): {
       });
   });
 
+  const formatter = vscode.languages.registerDocumentFormattingEditProvider('solidity', {
+    provideDocumentFormattingEdits: (document) => {
+      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: [document.fileName],
+      };
+
+      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);
+        });
+    } else {
+      vscode.window.showErrorMessage('Forge fmt is only available for solidity files.');
+    }
+  });
+
+  const lintSolWorkspace = vscode.commands.registerCommand('osmium.format-sol-workspace', function () {
+    if (!isFmtInstalled()) {
+      vscode.window.showErrorMessage('Forge fmt is not installed. Please install it and try again.');
+      return;
+    }
+
+    if (!vscode.workspace.workspaceFolders?.[0]) {
+      vscode.window.showErrorMessage('Unable to find workspace root. Please open a folder and try again.');
+      return;
+    }
+
+    const options: ForgeFmtOptions = {
+      root: vscode.workspace.workspaceFolders?.[0].uri.fsPath,
+      check: false,
+      raw: false,
+    };
+
+    const args: ForgeFmtArgs = {
+      options,
+      files: [vscode.workspace.workspaceFolders?.[0].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 formatter = vscode.languages.registerDocumentFormattingEditProvider('solidity', {
     provideDocumentFormattingEdits: (document) => {
       if (!isFmtInstalled()) {

vscode/src/sidebar-provider.ts

@@ -33,9 +33,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
   ) {}
 
   async _osmiumWatcherCallback(uri: vscode.Uri) {
-    if (!this._view) {
-      return;
-    }
+    if (!this._view) {return;}
     const basename = path.basename(uri.fsPath, '.json');
     if (basename === 'contracts') {
       this._interactContractRepository?.load();
@@ -186,15 +184,9 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
             walletPk: 'Enter private key',
             walletRpc: 'Enter rpc',
           });
-          if (!inputs) {
-            return;
-          }
-          if (!inputs.walletAddress.startsWith('0x') || !inputs.walletPk.startsWith('0x')) {
-            return;
-          }
-          if (!inputs.walletRpc.startsWith('http') && !inputs.walletRpc.startsWith('ws')) {
-            return;
-          }
+          if (!inputs) {return;}
+          if (!inputs.walletAddress.startsWith('0x') || !inputs.walletPk.startsWith('0x')) {return;}
+          if (!inputs.walletRpc.startsWith('http') && !inputs.walletRpc.startsWith('ws')) {return;}
 
           this._walletRepository.createWallet(
             inputs.walletName,
@@ -212,9 +204,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
               ignoreFocusOut: true,
             },
           );
-          if (!walletName) {
-            return;
-          }
+          if (!walletName) {return;}
           this._walletRepository.deleteWallet(walletName);
         }
         break;
@@ -232,12 +222,8 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
             contractRpc: 'Enter rpc',
             contractChainId: 'Enter chain id',
           });
-          if (!inputs || !inputs.contractAddress.startsWith('0x')) {
-            return;
-          }
-          if (!inputs.contractRpc.startsWith('http') && !inputs.contractRpc.startsWith('ws')) {
-            return;
-          }
+          if (!inputs || !inputs.contractAddress.startsWith('0x')) {return;}
+          if (!inputs.contractRpc.startsWith('http') && !inputs.contractRpc.startsWith('ws')) {return;}
           this._interactContractRepository.createContract(
             <Address>inputs['contractAddress'],
             JSON.parse(inputs['contractAbi']),
@@ -254,9 +240,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
               ignoreFocusOut: true,
             },
           );
-          if (!contractName) {
-            return;
-          }
+          if (!contractName) {return;}
           this._interactContractRepository.deleteContract(contractName);
         }
         break;
@@ -270,12 +254,8 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
             environmentName: 'Enter name',
             environmentRpc: 'Enter rpc',
           });
-          if (!inputs) {
-            return;
-          }
-          if (!inputs.environmentRpc.startsWith('http') && !inputs.environmentRpc.startsWith('ws')) {
-            return;
-          }
+          if (!inputs) {return;}
+          if (!inputs.environmentRpc.startsWith('http') && !inputs.environmentRpc.startsWith('ws')) {return;}
 
           this._environmentRepository.createEnvironment(inputs.environmentName, <RpcUrl>inputs.environmentRpc);
         }
@@ -287,9 +267,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
               ignoreFocusOut: true,
             },
           );
-          if (!environmentName) {
-            return;
-          }
+          if (!environmentName) {return;}
           this._environmentRepository.deleteEnvironment(environmentName);
         }
         break;