fix(solidity/core/slither): fixed lint errors

astrodevs-labs · Feb 15, 2024 · e6b1cd9 · e6b1cd9
1 parent e874d78
commit e6b1cd9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/toolchains/solidity/core/crates/slither-server/src/main.rs b/toolchains/solidity/core/crates/slither-server/src/main.rs
@@ -182,7 +182,7 @@ impl Backend {
     async fn is_in_libs(&self, path: &str) -> bool {
         let state = self.data.lock().await;
         for lib in state.libs_paths.iter() {
-            let fsrc = format!("/{}/", lib.replace("\"", ""));
+            let fsrc = format!("/{}/", lib.replace('\"', ""));
             eprintln!("Check path: '{}' contains lib: '{}'", path, fsrc);
             if path.contains(&fsrc) {
                 return true;
@@ -194,7 +194,7 @@ impl Backend {
     async fn is_in_src(&self, path: &str) -> bool {
         let state = self.data.lock().await;
         for src in state.src_paths.iter() {
-            let fsrc = format!("/{}/", src.replace("\"", ""));
+            let fsrc = format!("/{}/", src.replace('\"', ""));
             eprintln!("Check path: '{}' contains src: '{}'", path, fsrc);
             if path.contains(&fsrc) {
                 return true;
@@ -206,7 +206,7 @@ impl Backend {
     async fn is_in_tests(&self, path: &str) -> bool {
         let state = self.data.lock().await;
         for test in state.tests_paths.iter() {
-            let fsrc = format!("/{}/", test.replace("\"", ""));
+            let fsrc = format!("/{}/", test.replace('\"', ""));
             eprintln!("Check path: '{}' contains test: '{}'", path, fsrc);
             if path.contains(&fsrc) {
                 return true;
@@ -221,8 +221,7 @@ impl Backend {
         for folder in workspaces {
             let folderpath = normalize_slither_path(folder.uri.path());
             let foundry_path = find_foundry_toml_config(&folderpath);
-            match foundry_path {
-                Ok(path) => {
+                if let Ok(path) = foundry_path {
                     let foundry = std::fs::read_to_string(path.clone());
                     match foundry {
                         Ok(foundry) => {
@@ -236,8 +235,6 @@ impl Backend {
                         }
                     }
                 }
-                Err(_) => {}
-            }
         }
         Ok(())
     }
@@ -253,7 +250,6 @@ impl Backend {
             tokio::select! {
                 _ = clone.cancelled() => {
                     eprintln!("SLITHER CANCELLED");
-                    return;
                 }
                 output = parse_slither_out(uri.path()) => {
                     match output {
@@ -293,6 +289,6 @@ async fn main() {
     let stdin = tokio::io::stdin();
     let stdout = tokio::io::stdout();
 
-    let (service, socket) = LspService::new(|client| Backend::new(client));
+    let (service, socket) = LspService::new(Backend::new);
     Server::new(stdin, stdout, socket).serve(service).await;
 }
diff --git a/toolchains/solidity/extension/src/extension.ts b/toolchains/solidity/extension/src/extension.ts
@@ -20,8 +20,9 @@ export async function activate(context: ExtensionContext) {
 	foundryCompilerClient = createFoundryCompilerClient(context);
 	slitherClient = await createSlitherClient(context);
 	testsPositionsClient = await createTestsPositionsClient(context);
-	if (workspace.workspaceFolders?.length)
+	if (workspace.workspaceFolders?.length) {
 		testManager = new TestManager(testsPositionsClient, workspace.workspaceFolders[0].uri.fsPath);
+	}
 
 	context.subscriptions.push(linterClient, foundryCompilerClient, slitherClient, testsPositionsClient, testManager.testController);