support egui top bar search

Author: zsqw123

Cargo.lock

@@ -22,7 +22,7 @@ egui_extras = { workspace = true }
 egui_flex = { workspace = true }
 
 fontdb = { workspace = true }
-rfd = { workspace = true }
+bit-set = { workspace = true }
 
 [profile.release]
 strip = true

asm_egui/Cargo.toml

@@ -281,17 +281,17 @@ fn simple_text(
 }
 
 #[derive(Copy, Clone, Debug)]
-struct SmaliStyle {
-    op: Color32,
-    offset: Color32,
-    register: Color32,
-    desc: Color32,
-    literal: Color32,
-    highlight: Color32,
+pub(crate) struct SmaliStyle {
+    pub op: Color32,
+    pub offset: Color32,
+    pub register: Color32,
+    pub desc: Color32,
+    pub literal: Color32,
+    pub highlight: Color32,
 }
 
 impl SmaliStyle {
-    const LIGHT: SmaliStyle = SmaliStyle {
+    pub(crate) const LIGHT: SmaliStyle = SmaliStyle {
         op: Color32::from_rgb(235, 0, 0),
         offset: Color32::from_rgb(96, 96, 96),
         register: Color32::from_rgb(83, 141, 199),
@@ -300,7 +300,7 @@ impl SmaliStyle {
         highlight: Color32::from_rgb(255, 199, 133),
     };
 
-    const DARK: SmaliStyle = SmaliStyle {
+    pub(crate) const DARK: SmaliStyle = SmaliStyle {
         op: Color32::from_rgb(255, 100, 100),
         offset: SmaliStyle::LIGHT.offset,
         register: SmaliStyle::LIGHT.register,

asm_egui/src/smali.rs

@@ -1,6 +1,8 @@
 use crate::app::EguiApp;
+use bit_set::BitSet;
 use egui::containers::PopupCloseBehavior;
-use egui::{popup_below_widget, Context, Id, Response, TextEdit, Ui};
+use egui::text::LayoutJob;
+use egui::{popup_below_widget, Context, Id, Response, TextEdit, TextFormat, TextStyle, Ui};
 use java_asm_server::AsmServer;
 use std::ops::Deref;
 
@@ -58,7 +60,7 @@ impl EguiApp {
         let search_results = locked_top.search_result.clone();
         drop(locked_top);
 
-        if search_results.is_empty() { return; }
+        if search_results.items.is_empty() { return; }
         popup_below_widget(
             ui, popup_id, &edit_path_ui,
             PopupCloseBehavior::CloseOnClickOutside, |ui| {
@@ -88,13 +90,65 @@ impl EguiApp {
 
     fn popup_file_path_ui(&mut self, ui: &mut Ui) {
         let search_results = self.server_app.top().lock().search_result.clone();
-        for result in search_results {
-            let selectable_label = ui.selectable_label(false, result.to_string());
+        let style = ui.style();
+        let font = TextStyle::Monospace.resolve(&style);
+
+        let dark_mode = style.visuals.dark_mode;
+        let smali_style = if dark_mode { crate::smali::SmaliStyle::DARK } else { crate::smali::SmaliStyle::LIGHT };
+
+        let dft_color = style.visuals.text_color();
+        let dft_text_format = TextFormat::simple(font.clone(), dft_color);
+        let highlight_color = smali_style.desc;
+        let highlight_text_format = TextFormat::simple(font, highlight_color);
+
+
+        for result in search_results.items {
+            let path = result.item.to_string();
+            let sections = Self::get_highlight_sections(&path, result.indices);
+            let mut text_layout_job = LayoutJob::default();
+            for (section, highlighted) in sections {
+                if highlighted {
+                    text_layout_job.append(&section, 0.0, highlight_text_format.clone())
+                } else {
+                    text_layout_job.append(&section, 0.0, dft_text_format.clone())
+                }
+            }
+            let selectable_label = ui.selectable_label(false, text_layout_job);
             if selectable_label.clicked() {
                 let server_locked = self.server.lock();
                 let Some(server) = server_locked.deref() else { return; };
-                server.switch_or_open(&result, &self.server_app);
+                server.switch_or_open(&result.item, &self.server_app);
+                ui.memory_mut(|m| m.close_popup());
             }
         }
     }
+
+    fn get_highlight_sections(path: &str, bits: BitSet) -> Vec<(String, bool)> {
+        let mut current_section = String::new();
+        let mut cur_highlighted = false;
+
+        let mut sections = vec![];
+        for (index, ch) in path.chars().enumerate() {
+            let target_highlighted = bits.contains(index);
+            if current_section.is_empty() {
+                // first char in this section, init
+                current_section.push(ch);
+                cur_highlighted = target_highlighted;
+            } else if cur_highlighted == target_highlighted {
+                // same highlight
+                current_section.push(ch);
+            } else {
+                // different color, start new section
+                sections.push((current_section, cur_highlighted));
+                current_section = ch.to_string();
+                cur_highlighted = target_highlighted;
+            }
+        }
+
+        // last section
+        if !current_section.is_empty() {
+            sections.push((current_section, cur_highlighted));
+        }
+        sections
+    }
 }

asm_egui/src/top_bar.rs

@@ -198,7 +198,7 @@ pub struct SearchResultItem {
     pub indices: BitSet,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct SearchResult {
     pub stop_idx: usize,
     pub items: Vec<SearchResultItem>,
@@ -299,12 +299,12 @@ mod tests {
         let start = std::time::Instant::now();
         let mut model = FuzzyMatchModel::new(input, &items, 10000);
         let result = model.full_search();
-        println!("Cost time: {:?}ms for take 1000 items", start.elapsed().as_millis());
+        println!("Cost time: {:?}ms for take 10000 items", start.elapsed().as_millis());
         assert_eq!(result.items.len(), 10000);
 
         let start = std::time::Instant::now();
         let result = model.search_with_new_input("im21z".into());
-        println!("Cost time: {:?}ms for take 1000 items next time", start.elapsed().as_millis());
+        println!("Cost time: {:?}ms for take 10000 items next time", start.elapsed().as_millis());
         assert_eq!(result.items.len(), 10000);
     }
 }

asm_server/src/impls/fuzzy.rs

@@ -15,7 +15,6 @@ use zip::ZipArchive;
 
 pub enum ServerMessage {
     Progress(ProgressMessage),
-    SearchResult(SearchResultMessage),
 }
 
 pub struct ProgressMessage {
@@ -24,12 +23,6 @@ pub struct ProgressMessage {
     pub in_loading: bool,
 }
 
-// search is too fast now, it's meaningless to use the message to dispatch.
-// so we didn't use this message currently.
-pub struct SearchResultMessage {
-    pub result: Vec<StrRef>,
-}
-
 pub struct FileOpenContext {
     pub path: String,
     pub start_time: Instant,
@@ -55,9 +48,6 @@ impl AsmServer {
                         server_ref.loading_state.in_loading = progress.in_loading;
                         server_ref.on_progress_update(&render_target);
                     }
-                    ServerMessage::SearchResult(result) => {
-                        Self::on_search_result(result, &render_target);
-                    }
                 }
             }
         });
@@ -94,13 +84,6 @@ impl AsmServer {
         (*top_mut).loading_state = current_loading_state.clone();
     }
 
-    fn on_search_result(result: SearchResultMessage, render_target: &AppContainer) {
-        let result = result.result;
-        let mut top = render_target.top().lock();
-        let top_mut = top.deref_mut();
-        (*top_mut).search_result = result;
-    }
-
     fn render_to_app(&self, app: AppContainer) {
         let classes = self.read_classes();
         let start = Instant::now();

asm_server/src/impls/server.rs

@@ -126,9 +126,8 @@ impl AsmServer {
         let query: StrRef = query.as_str().into();
         let mut fuzzy_locked = self.get_or_create_fuzzy(query.clone()).lock();
         let Some(fuzzy) = fuzzy_locked.deref_mut() else { return; };
-        let results: Vec<StrRef> = fuzzy.search_with_new_input(query).items
-            .into_iter().map(|item| item.item).collect();
-        top.search_result = results;
+        let search_result = fuzzy.search_with_new_input(query);
+        top.search_result = search_result;
     }
 }
 

asm_server/src/server.rs

@@ -13,6 +13,7 @@ use std::collections::BTreeMap;
 use std::iter::{Enumerate, Peekable};
 use std::str::Split;
 use std::sync::Arc;
+use crate::impls::fuzzy::SearchResult;
 
 /// contains all states of the app.
 /// It's not like the [crate::AsmServer] which only contains the information of a file.
@@ -41,7 +42,7 @@ impl AppContainer {
 pub struct Top {
     pub loading_state: LoadingState,
     pub file_path: Option<String>,
-    pub search_result: Vec<StrRef>,
+    pub search_result: SearchResult,
 }
 
 #[derive(Default, Clone, Debug)]