progress

Author: psteinroe

crates/pgt_lsp/tests/server.rs

@@ -1,22 +1,22 @@
-use anyhow::bail;
 use anyhow::Context;
 use anyhow::Error;
 use anyhow::Result;
+use anyhow::bail;
 use biome_deserialize::Merge;
 use biome_deserialize::StringSet;
-use futures::channel::mpsc::{channel, Sender};
 use futures::Sink;
 use futures::SinkExt;
 use futures::Stream;
 use futures::StreamExt;
-use pgt_configuration::database::PartialDatabaseConfiguration;
+use futures::channel::mpsc::{Sender, channel};
 use pgt_configuration::PartialConfiguration;
+use pgt_configuration::database::PartialDatabaseConfiguration;
 use pgt_fs::MemoryFileSystem;
 use pgt_lsp::LSPServer;
 use pgt_lsp::ServerFactory;
 use pgt_workspace::DynRef;
-use serde::de::DeserializeOwned;
 use serde::Serialize;
+use serde::de::DeserializeOwned;
 use serde_json::Value;
 use serde_json::{from_value, to_value};
 use sqlx::Executor;
@@ -26,6 +26,7 @@ use std::fmt::Display;
 use std::time::Duration;
 use tower::timeout::Timeout;
 use tower::{Service, ServiceExt};
+use tower_lsp::LspService;
 use tower_lsp::jsonrpc;
 use tower_lsp::jsonrpc::Response;
 use tower_lsp::lsp_types as lsp;
@@ -47,7 +48,6 @@ use tower_lsp::lsp_types::{
     PublishDiagnosticsParams, TextDocumentContentChangeEvent, TextDocumentIdentifier,
     TextDocumentItem, Url, VersionedTextDocumentIdentifier,
 };
-use tower_lsp::LspService;
 use tower_lsp::{jsonrpc::Request, lsp_types::InitializeParams};
 
 /// Statically build an [Url] instance that points to the file at `$path`

crates/pgt_workspace/src/workspace/server/change.rs

@@ -63,6 +63,9 @@ impl Document {
         // very much not guaranteed to result in correct ranges
         self.diagnostics.clear();
 
+        tracing::debug!("Changing from {:?}", self.content);
+        tracing::debug!("Applying changes {:?}", &change.changes);
+
         // when we recieive more than one change, we need to push back the changes based on the
         // total range of the previous ones. This is because the ranges are always related to the original state.
         let mut changes = Vec::new();
@@ -93,6 +96,9 @@ impl Document {
 
         self.version = change.version;
 
+        tracing::debug!("Applied changes {:?}", changes);
+        tracing::debug!("Changed to {:?}", self.content);
+
         changes
     }
 
@@ -1663,6 +1669,40 @@ KEY (\"organisation_id\") REFERENCES \"public\".\"organisation\"(\"id\") ON UPDA
         assert_document_integrity(&doc);
     }
 
+    #[test]
+    fn test_content_out_of_sync() {
+        let path = PgTPath::new("test.sql");
+        let initial_content = "select 1, 2, 2232231313393319 from unknown_users;\n";
+
+        let mut doc = Document::new(initial_content.to_string(), 0);
+
+        let change1 = ChangeFileParams {
+            path: path.clone(),
+            version: 1,
+            changes: vec![
+                ChangeParams {
+                    range: Some(TextRange::new(29.into(), 29.into())),
+                    text: "3".to_string(),
+                },
+                ChangeParams {
+                    range: Some(TextRange::new(30.into(), 30.into())),
+                    text: "1".to_string(),
+                },
+            ],
+        };
+
+        let changes = doc.apply_file_change(&change1);
+
+        println!("changes: {:#?}", changes);
+
+        assert_eq!(
+            doc.content,
+            "select 1, 2, 22322313133933193 from unknown_users;\n"
+        );
+
+        assert_document_integrity(&doc);
+    }
+
     #[test]
     fn test_comments_only() {
         let path = PgTPath::new("test.sql");