feat: use macros to build completions statically (#34)

* feat: use macros to build completions statically * fix: remove references to init_hx_tags * fix: satisfy clippy warnings * refactor: coerce sized slice to normal slice, eliminate enum * feat: add hx-disable-elt * fix: macro bickers with trailing comma * fix: typo at hx-disabled-elt
ThePrimeagen · Dec 9, 2023 · 9cbd8d9 · 9cbd8d9
1 parent 1f4071f
commit 9cbd8d9
Show file tree

Hide file tree

Showing 5 changed files with 234 additions and 227 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lsp/Cargo.toml b/lsp/Cargo.toml
@@ -19,3 +19,4 @@ htmx-lsp-util = { version = "0.1", path = "../util" }
 tree-sitter.workspace = true
 tree-sitter-html.workspace = true
 maplit = "1.0.2"
+phf = { version = "0.11.2", features = ["macros"] }
diff --git a/lsp/src/handle.rs b/lsp/src/handle.rs
@@ -129,7 +129,7 @@ fn handle_completion(req: Request) -> Option<HtmxResult> {
             );
 
             Some(HtmxResult::AttributeCompletion(HtmxAttributeCompletion {
-                items,
+                items: items.to_vec(),
                 id: req.id,
             }))
         }
@@ -154,7 +154,7 @@ fn handle_hover(req: Request) -> Option<HtmxResult> {
 
     Some(HtmxResult::AttributeHover(HtmxAttributeHoverResult {
         id: req.id,
-        value: attribute.desc,
+        value: attribute.desc.to_string(),
     }))
 }
 
@@ -189,14 +189,12 @@ pub fn handle_other(msg: Message) -> Option<HtmxResult> {
 #[cfg(test)]
 mod tests {
     use super::{handle_request, HtmxResult, Request};
-    use crate::htmx;
     use crate::text_store::{init_text_store, TEXT_STORE};
     use std::sync::Once;
 
     static SETUP: Once = Once::new();
     fn prepare_store(file: &str, content: &str) {
         SETUP.call_once(|| {
-            htmx::init_hx_tags();
             init_text_store();
         });