test: add incremental test

Author: Chronostasys

src/ast/test.rs

@@ -676,3 +676,25 @@ fn test_fmt() {
     let text_edit = test_lsp::<PLFormat>(&Database::default(), None, ActionType::LspFmt, testfile);
     debug_assert!(text_edit[0].is_empty());
 }
+
+#[test]
+fn test_lsp_incremental() {
+    let raw_db = Database::default().enable_logging();
+    let db = &raw_db;
+    let docs = MemDocs::default();
+    let input = MemDocsInput::new(
+        db,
+        Arc::new(Mutex::new(RefCell::new(docs))),
+        "test/lsp_incremental/main.pi".to_string(),
+        Default::default(),
+        ActionType::Diagnostic,
+        None,
+        None,
+    );
+    compile_dry(db, input).unwrap();
+    let l = raw_db.take_logs();
+    assert_eq!(l.len(), 64);
+    compile_dry(db, input).unwrap();
+    let ll = raw_db.take_logs();
+    assert_eq!(ll.len(), 0);
+}

src/db.rs

@@ -57,3 +57,25 @@ impl Db for Database {
         self.ref_str.lock().unwrap().get_mut().clone()
     }
 }
+
+impl Database {
+    /// Enable logging of each salsa event.
+    #[cfg(test)]
+    pub fn enable_logging(self) -> Self {
+        assert!(self.logs.is_none());
+        Self {
+            storage: self.storage,
+            logs: Some(Default::default()),
+            ref_str: self.ref_str,
+        }
+    }
+
+    #[cfg(test)]
+    pub fn take_logs(&self) -> Vec<String> {
+        if let Some(logs) = &self.logs {
+            std::mem::take(&mut *logs.lock().unwrap())
+        } else {
+            panic!("logs not enabled");
+        }
+    }
+}

src/lsp/lspserver.rs

@@ -6,7 +6,7 @@
 //! - goto definition
 //! - find references
 use std::{
-    cell::RefCell,
+    cell::{Cell, RefCell},
     error::Error,
     sync::{Arc, Mutex},
     thread::available_parallelism,
@@ -137,7 +137,7 @@ fn main_loop(
         None,
         None,
     );
-    let mut tokens = FxHashMap::default();
+    let last_tokens = Cell::new(Default::default());
     let mut completions: Vec<Vec<lsp_types::CompletionItem>> = vec![];
 
     log::info!("starting main loop");
@@ -221,7 +221,7 @@ fn main_loop(
         })
         .on::<SemanticTokensFullRequest, _>(|id, params| {
             let uri = url_to_path(params.text_document.uri);
-            docin.set_file(&mut db).to(uri.clone());
+            docin.set_file(&mut db).to(uri);
             docin.set_action(&mut db).to(ActionType::SemanticTokensFull);
             docin
                 .set_params(&mut db)
@@ -231,15 +231,15 @@ fn main_loop(
             if newtokens.is_empty() {
                 newtokens.push(SemanticTokens::default());
             }
-            _ = tokens.insert(uri, newtokens[0].clone());
+            last_tokens.replace(newtokens[0].clone());
             let sender = connection.sender.clone();
             pool.execute(move || {
                 send_semantic_tokens(&sender, id, newtokens[0].clone());
             });
         })
         .on::<SemanticTokensFullDeltaRequest, _>(|id, params| {
             let uri = url_to_path(params.text_document.uri);
-            docin.set_file(&mut db).to(uri.clone());
+            docin.set_file(&mut db).to(uri);
             docin.set_action(&mut db).to(ActionType::SemanticTokensFull);
             docin
                 .set_params(&mut db)
@@ -249,8 +249,9 @@ fn main_loop(
             if newtokens.is_empty() {
                 newtokens.push(SemanticTokens::default());
             }
-            let old = tokens.insert(uri, newtokens[0].clone());
-            let delta = diff_tokens(&old.unwrap().data, &newtokens[0].data);
+
+            let old = last_tokens.replace(newtokens[0].clone());
+            let delta = diff_tokens(&old.data, &newtokens[0].data);
             let sender = connection.sender.clone();
             pool.execute(move || {
                 send_semantic_tokens_edit(

test/lsp_incremental/Kagari.toml

@@ -0,0 +1,2 @@
+entry = "main.pi"
+project = "lsp_incremental"

test/lsp_incremental/main.pi

@@ -0,0 +1,6 @@
+use std::io;
+use lsp_incremental::module1;
+fn main() i64 {
+    io::print_s("Hello World\n");
+    return 0;
+}

test/lsp_incremental/module1.pi

@@ -0,0 +1 @@
+use lsp_incremental::module2;