remove lsp lock on didClose event

Author: JoshuaBatty

sway-lsp/src/core/document.rs

@@ -129,8 +129,11 @@ pub fn mark_file_as_dirty(uri: &Url) -> Result<(), LanguageServerError> {
 /// If the flag file does not exist, this function will do nothing.
 pub fn remove_dirty_flag(uri: &Url) -> Result<(), LanguageServerError> {
     let path = document::get_path_from_url(uri)?;
+    eprintln!("path to remove dirty flag: {:?}", path);
     let dirty_file_path = forc_util::is_dirty_path(&path);
+    eprintln!("dirty_file_path: {:?}", dirty_file_path);
     if dirty_file_path.exists() {
+        eprintln!("Removing dirty flag file: {:?}", dirty_file_path);
         // Remove the "dirty" file
         std::fs::remove_file(dirty_file_path).map_err(|err| DocumentError::UnableToRemoveFile {
             path: uri.path().to_string(),

sway-lsp/src/core/session.rs

@@ -130,8 +130,6 @@ impl Session {
             let _ = join_handle.join();
         }
 
-        // TODO: clean up any remaining .dirty files
-
         // Delete the temporary directory.
         self.sync.remove_temp_dir();
     }
@@ -392,7 +390,10 @@ impl Session {
     fn store_sway_files(&self) -> Result<(), LanguageServerError> {
         let temp_dir = self.sync.temp_dir()?;
         // Store the documents.
-        for path in get_sway_files(temp_dir).iter().filter_map(|fp| fp.to_str()) {
+        for path in get_sway_files(&temp_dir)
+            .iter()
+            .filter_map(|fp| fp.to_str())
+        {
             self.store_document(TextDocument::build_from_path(path)?)?;
         }
         Ok(())

sway-lsp/src/server.rs

@@ -2,19 +2,20 @@
 //! It provides an interface between the LSP protocol and the sway-lsp internals.
 
 use crate::{
+    core::document,
     handlers::{notification, request},
     lsp_ext::{OnEnterParams, ShowAstParams},
     server_state::ServerState,
 };
 use lsp_types::{
     CodeActionParams, CodeActionResponse, CodeLens, CodeLensParams, CompletionParams,
     CompletionResponse, DidChangeTextDocumentParams, DidChangeWatchedFilesParams,
-    DidOpenTextDocumentParams, DidSaveTextDocumentParams, DocumentFormattingParams,
-    DocumentHighlight, DocumentHighlightParams, DocumentSymbolParams, DocumentSymbolResponse,
-    GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverParams, InitializeParams,
-    InitializeResult, InitializedParams, InlayHint, InlayHintParams, PrepareRenameResponse,
-    RenameParams, SemanticTokensParams, SemanticTokensResult, TextDocumentIdentifier,
-    TextDocumentPositionParams, TextEdit, WorkspaceEdit,
+    DidCloseTextDocumentParams, DidOpenTextDocumentParams, DidSaveTextDocumentParams,
+    DocumentFormattingParams, DocumentHighlight, DocumentHighlightParams, DocumentSymbolParams,
+    DocumentSymbolResponse, GotoDefinitionParams, GotoDefinitionResponse, Hover, HoverParams,
+    InitializeParams, InitializeResult, InitializedParams, InlayHint, InlayHintParams,
+    PrepareRenameResponse, RenameParams, SemanticTokensParams, SemanticTokensResult,
+    TextDocumentIdentifier, TextDocumentPositionParams, TextEdit, WorkspaceEdit,
 };
 use tower_lsp::{jsonrpc::Result, LanguageServer};
 
@@ -38,6 +39,12 @@ impl LanguageServer for ServerState {
         }
     }
 
+    async fn did_close(&self, params: DidCloseTextDocumentParams) {
+        if let Err(err) = document::remove_dirty_flag(&params.text_document.uri) {
+            tracing::error!("{}", err.to_string());
+        }
+    }
+
     async fn did_change(&self, params: DidChangeTextDocumentParams) {
         if let Err(err) = notification::handle_did_change_text_document(self, params).await {
             tracing::error!("{}", err.to_string());