Cleanup, workaround unecessary cloning of text contents

WillLillis · Nov 25, 2023 · 444ff2e · 444ff2e
1 parent fd367cc
commit 444ff2e
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/bin/main.rs b/src/bin/main.rs
@@ -180,7 +180,10 @@ fn main_loop(
 ) -> anyhow::Result<()> {
     let _params: InitializeParams = serde_json::from_value(params).unwrap();
 
-    let mut curr_doc = String::new();
+    let mut doc_open_params;
+    let mut doc_change_params;
+    let curr_doc = String::new();
+    let mut curr_doc = &curr_doc;
     let mut parser = tree_sitter::Parser::new();
     parser.set_logger(Some(Box::new(tree_sitter_logger)));
     parser.set_language(tree_sitter_asm::language())?;
@@ -236,16 +239,9 @@ fn main_loop(
                     }
                 } else if let Ok((id, params)) = cast_req::<Completion>(req.clone()) {
                     // CompletionRequest ---------------------------------------------------------------
-                    let res = Response {
-                        id: id.clone(),
-                        result: Some(json!("")),
-                        error: None,
-                    };
-
                     // get suggestions ------------------------------------------------------
-                    // format response
                     let comp_res = get_comp_resp(
-                        &curr_doc,
+                        curr_doc,
                         &mut parser,
                         &params,
                         instruction_completes,
@@ -263,6 +259,11 @@ fn main_loop(
                         }
                         None => {
                             // don't know what to suggest
+                            let res = Response {
+                                id: id.clone(),
+                                result: Some(json!("")),
+                                error: None,
+                            };
                             connection.sender.send(Message::Response(res.clone()))?;
                         }
                     }
@@ -272,9 +273,12 @@ fn main_loop(
             }
             Message::Notification(notif) => {
                 if let Ok(params) = cast_notif::<DidOpenTextDocument>(notif.clone()) {
-                    curr_doc = params.text_document.text;
+                    // move the notification's params into this variable so we can avoid cloning the document contents
+                    doc_open_params = params;
+                    curr_doc = &doc_open_params.text_document.text;
                 } else if let Ok(params) = cast_notif::<DidChangeTextDocument>(notif.clone()) {
-                    curr_doc = params.content_changes.last().unwrap().text.clone();
+                    doc_change_params = params;
+                    curr_doc = &doc_change_params.content_changes.last().unwrap().text;
                 }
             }
             Message::Response(_resp) => {}