Refresh script without looking at the previous state on did_save

crates/core/src/script.rs

@@ -29,7 +29,7 @@ impl Script {
         })
     }
 
-    /// Reparses AST based on the script document.
+    /// Reparses AST based on the previous script state and changes made to the document.
     /// Clear document's edit history.
     pub fn update(&mut self, doc: &mut ScriptDocument) -> Result<(), ScriptError> {
         for edit in &doc.edits {
@@ -45,6 +45,16 @@ impl Script {
         Ok(())
     }
 
+    /// Reparses AST based on the script document alone.
+    /// The range of the entire script will be different after the operation.
+    pub fn refresh(&mut self, doc: &ScriptDocument) -> Result<(), ScriptError> {
+        let current_tree = Self::parse_rope(&doc.rope, None)?;
+        let prev_tree = std::mem::replace(&mut self.current_tree, current_tree);
+        self.prev_tree = Some(prev_tree);
+
+        Ok(())
+    }
+
     fn parse_rope(rope: &Rope, prev_tree: Option<&Tree>) -> Result<Tree, ScriptError> {
         use ScriptError::*;
 

crates/lsp/src/providers/document_ops.rs

@@ -105,13 +105,15 @@ pub async fn did_save(backend: &Backend, params: lsp::DidSaveTextDocumentParams)
 
 
         // replace the doc content completely
-        let mut doc_buff = backend
+        let doc_buff = backend
             .doc_buffers
             .entry(doc_path.clone())
             .insert(ScriptDocument::from_str(&params.text.unwrap()));
 
         if let Some(mut script) = backend.scripts.get_mut(&doc_path) {
-            if let Err(err) = script.update(&mut doc_buff) {
+            // do a fresh reparse without caring about the previous state 
+            // as a fail-safe in case of bad edits or document being changed outside of the editor
+            if let Err(err) = script.refresh(&doc_buff) {
                 backend.log_error(err).await;
             }