From 424a28dccc8c91a19bc4360f901ee936ea20423a Mon Sep 17 00:00:00 2001
From: unknown <uros.mrkobrada99@gmail.com>
Date: Thu, 14 Dec 2023 15:25:29 +0100
Subject: [PATCH] removing hx-lsp attributes

---
 examples/web/templates/example.j2 |  2 +-
 src/short_classes.rs              | 28 ++++++++++++----------------
 src/visit_class.rs                |  1 +
 src/visit_map.rs                  |  7 +++----
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/examples/web/templates/example.j2 b/examples/web/templates/example.j2
index 7548cc7..330bdde 100644
--- a/examples/web/templates/example.j2
+++ b/examples/web/templates/example.j2
@@ -1,2 +1,2 @@
-<p class="text-2xl bg-red-400 rounded">hello world</p>
+<p class="text-2xl bg-red-400 rounded" hx-lsp="abc def">hello world</p>
 <p class="rounded-xl text-3xl">hello world 2</p>
diff --git a/src/short_classes.rs b/src/short_classes.rs
index 1fa8178..e0e7bae 100644
--- a/src/short_classes.rs
+++ b/src/short_classes.rs
@@ -31,30 +31,26 @@ impl Default for ClassIter {
 impl ClassContainer {
     pub fn add(&mut self, key: String, token: CSSToken) -> Option<String> {
         let index = token as usize;
-        if let Some(map) = self.container.get_mut(index) {
-            let oldclass = css_to_html(&key);
-            match map.entry(oldclass) {
-                Entry::Vacant(entry) => {
-                    if let Some(new) = self.class_name[index].next() {
-                        return Some(entry.insert(new_class(&new)).to_string());
-                    }
-                }
-                Entry::Occupied(entry) => {
-                    return Some(entry.get().clone());
+        let map = self.container.get_mut(index)?;
+        let oldclass = css_to_html(&key);
+        match map.entry(oldclass) {
+            Entry::Vacant(entry) => {
+                if let Some(new) = self.class_name[index].next() {
+                    return Some(entry.insert(new_class(&new)).to_string());
                 }
             }
+            Entry::Occupied(entry) => {
+                return Some(entry.get().clone());
+            }
         }
         None
     }
 
     pub fn get(&self, key: String, container: CSSToken) -> Option<String> {
         let index = container as usize;
-        if let Some(map) = self.container.get(index) {
-            if let Some(v) = map.get(&key) {
-                return Some(v.to_string());
-            }
-        }
-        None
+        let map = self.container.get(index)?;
+        let v = map.get(&key)?;
+        Some(v.to_string())
     }
 
     pub fn into_file(&self, stylesheet: StyleSheet) {
diff --git a/src/visit_class.rs b/src/visit_class.rs
index 4a4e961..1a2493d 100644
--- a/src/visit_class.rs
+++ b/src/visit_class.rs
@@ -25,6 +25,7 @@ pub fn check_html(
                     .collect::<Vec<String>>()
                     .join(" ");
                 let _r = el.set_attribute("class", &classes);
+                el.remove_attribute("hx-lsp");
 
                 Ok(())
             })],
diff --git a/src/visit_map.rs b/src/visit_map.rs
index b7a7e19..079d08f 100644
--- a/src/visit_map.rs
+++ b/src/visit_map.rs
@@ -46,10 +46,9 @@ pub fn check_js(
                         Some(&mut srcmap),
                     ),
                 };
-                if let Some(module) = program.as_script() {
-                    if emitter.emit_script(module).is_ok() {
-                        return Some(code);
-                    }
+                let module = program.as_script()?;
+                if emitter.emit_script(module).is_ok() {
+                    return Some(code);
                 }
                 None
             }