merge: #17 from astrodevs-labs/hotfix/slither-server-crash

Slither Crash Hotfix
astrodevs-labs · Apr 27, 2024 · b450c46 · b450c46
2 parents ac717c5 + 80451f0
commit b450c46
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/servers/slither-server/src/main.rs b/servers/slither-server/src/main.rs
@@ -29,14 +29,14 @@ struct Backend {
 impl LanguageServer for Backend {
     async fn initialize(&self, params: InitializeParams) -> Result<InitializeResult> {
         if !is_slither_installed() {
-            error!("Slither is not installed!");
             self.client
                 .show_message(
                     MessageType::ERROR,
                     "Slither is not installed! Please install it and restart the extension",
                 )
                 .await;
-            return Err(tower_lsp::jsonrpc::Error::internal_error());
+            error!("Slither is not installed!");
+            self.data.lock().await.has_to_shutdown = true;
         }
         if !is_solc_installed() {
             self.client
@@ -46,7 +46,7 @@ impl LanguageServer for Backend {
                 )
                 .await;
             error!("Solc is not installed!");
-            return Err(tower_lsp::jsonrpc::Error::internal_error());
+            self.data.lock().await.has_to_shutdown = true;
         }
 
         info!("Initializing diagnostic receiver ...");
@@ -94,7 +94,13 @@ impl LanguageServer for Backend {
     }
 
     async fn initialized(&self, _: InitializedParams) {
-        info!("Osmium-slither initialized!");
+        if self.data.lock().await.has_to_shutdown {
+            error!("Osmium-Solidity-Slither shuting down ...");
+            info!("This may occur because of missing dependencies or errors. Please check the logs for more information.");
+            let _ = self.shutdown().await;
+        } else {
+            info!("Osmium-Solidity-Slither initialized!");
+        }
     }
 
     async fn did_change_workspace_folders(&self, params: DidChangeWorkspaceFoldersParams) {

diff --git a/servers/slither-server/src/types.rs b/servers/slither-server/src/types.rs
@@ -24,6 +24,7 @@ pub struct SlitherData {
     pub sender: Sender<SlitherDiag>,
     pub src_paths: Vec<String>,
     pub workspace: String,
+    pub has_to_shutdown: bool,
 }
 
 impl SlitherData {
@@ -35,6 +36,7 @@ impl SlitherData {
             receiver: Some(receiver),
             sender,
             workspace: String::new(),
+            has_to_shutdown: false,
         }
     }
 }