Fix LSP format not works. (#273)

Author: huacnlee

autocorrect-lsp/src/lib.rs

@@ -31,12 +31,10 @@ impl Backend {
     }
 
     fn upsert_document(&self, doc: Arc<TextDocumentItem>) {
-        let uri = doc.uri.clone();
         self.documents
             .write()
             .unwrap()
-            .get_mut(&uri)
-            .map(|old| std::mem::replace(old, doc.clone()));
+            .insert(doc.uri.clone(), doc.clone());
     }
 
     fn get_document(&self, uri: &Url) -> Option<Arc<TextDocumentItem>> {
@@ -105,7 +103,6 @@ impl Backend {
     }
 
     async fn clear_diagnostics(&self, uri: &Url) {
-        self.diagnostics.write().unwrap().remove(uri);
         self.client
             .publish_diagnostics(uri.clone(), vec![], None)
             .await;
@@ -263,14 +260,14 @@ impl LanguageServer for Backend {
             return;
         }
 
-        self.client
-            .log_message(MessageType::INFO, format!("did_change {}\n", uri))
-            .await;
-
         assert_eq!(content_changes.len(), 1);
         let change = content_changes.into_iter().next().unwrap();
         assert!(change.range.is_none());
 
+        self.client
+            .log_message(MessageType::INFO, format!("did_change {}", uri))
+            .await;
+
         let updated_doc =
             TextDocumentItem::new(uri.clone(), "".to_string(), version, change.text.clone());
         self.upsert_document(Arc::new(updated_doc.clone()));
@@ -316,7 +313,13 @@ impl LanguageServer for Backend {
             self.clear_diagnostics(&text_document.uri).await;
             let input = document.text.as_str();
 
+            self.client
+                .log_message(MessageType::INFO, format!("before: {}", input))
+                .await;
             let result = autocorrect::format_for(input, document.uri.path());
+            self.client
+                .log_message(MessageType::INFO, format!("after: {}", result.out))
+                .await;
             let range = Range::new(
                 Position::new(0, 0),
                 Position {

autocorrect/src/code/types.rs

@@ -25,7 +25,7 @@ pub fn get_file_extension(filename: &str) -> String {
         return String::from(filename);
     }
 
-    let filename = filename.split('/').last().unwrap().to_string();
+    let filename = filename.split('/').next_back().unwrap().to_string();
     let path_parts: Vec<&str> = filename.split('.').collect();
     let mut ext: String = path_parts.last().unwrap().to_string();
 

autocorrect/src/result/mod.rs

@@ -69,10 +69,7 @@ pub trait Results {
 
     /// Is AutoCorrrect current is enable
     fn is_enabled(&self) -> bool {
-        match self.get_toggle().match_rule("") {
-            Some(enable) => enable,
-            _ => true,
-        }
+        self.get_toggle().match_rule("").unwrap_or(true)
     }
 }
 

autocorrect/src/result/rdjson.rs

@@ -3,19 +3,6 @@
 use super::LintResult;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Clone)]
-struct RdfJson {
-    source: RdfSource,
-    severity: String,
-    diagnostics: String,
-}
-
-#[derive(Serialize, Deserialize, Clone)]
-struct RdfSource {
-    name: String,
-    url: String,
-}
-
 #[derive(Serialize, Deserialize, Clone)]
 struct RdfDiagnostic {
     message: String,