Moved bookmark toggling logic into Rust.

Author: trypsynth

app/document_manager.cpp

@@ -559,9 +559,7 @@ void document_manager::toggle_bookmark() const {
 		bookmark_start = current_pos;
 		bookmark_end = current_pos;
 	}
-	const auto info = bookmark_info(config.backend_for_ffi(), tab->file_path.ToUTF8().data(), bookmark_start, bookmark_end);
-	const bool was_bookmarked = info.found;
-	config.toggle_bookmark(tab->file_path, bookmark_start, bookmark_end);
+	const bool was_bookmarked = config_manager_toggle_bookmark_with_result(config.backend_for_ffi_mut(), tab->file_path.ToUTF8().data(), bookmark_start, bookmark_end, "");
 	config.flush();
 	speak(was_bookmarked ? _("Bookmark removed") : _("Bookmarked"));
 }
@@ -589,13 +587,8 @@ void document_manager::add_bookmark_with_note() const {
 	note_entry_dialog note_dialog(nullptr, _("Bookmark Note"), prompt, existing_note);
 	if (note_dialog.ShowModal() != wxID_OK) return;
 	wxString note = note_dialog.get_note();
-	if (bookmark_exists) {
-		config.update_bookmark_note(tab->file_path, bookmark_start, bookmark_end, note);
-		speak(_("Bookmark note updated"));
-	} else {
-		config.add_bookmark(tab->file_path, bookmark_start, bookmark_end, note);
-		speak(_("Bookmarked with note"));
-	}
+	const bool updated = config_manager_upsert_bookmark_note(config.backend_for_ffi_mut(), tab->file_path.ToUTF8().data(), bookmark_start, bookmark_end, note.ToUTF8().data());
+	speak(updated ? _("Bookmark note updated") : _("Bookmarked with note"));
 	config.flush();
 }
 

lib/src/bridge.rs

@@ -319,6 +319,20 @@ pub mod ffi {
 		fn config_manager_add_bookmark(manager: &mut ConfigManager, path: &str, start: i64, end: i64, note: &str);
 		fn config_manager_remove_bookmark(manager: &mut ConfigManager, path: &str, start: i64, end: i64);
 		fn config_manager_toggle_bookmark(manager: &mut ConfigManager, path: &str, start: i64, end: i64, note: &str);
+		fn config_manager_toggle_bookmark_with_result(
+			manager: &mut ConfigManager,
+			path: &str,
+			start: i64,
+			end: i64,
+			note: &str,
+		) -> bool;
+		fn config_manager_upsert_bookmark_note(
+			manager: &mut ConfigManager,
+			path: &str,
+			start: i64,
+			end: i64,
+			note: &str,
+		) -> bool;
 		fn config_manager_update_bookmark_note(
 			manager: &mut ConfigManager,
 			path: &str,
@@ -621,6 +635,34 @@ fn config_manager_toggle_bookmark(manager: &mut RustConfigManager, path: &str, s
 	manager.toggle_bookmark(path, start, end, note);
 }
 
+fn config_manager_toggle_bookmark_with_result(
+	manager: &mut RustConfigManager,
+	path: &str,
+	start: i64,
+	end: i64,
+	note: &str,
+) -> bool {
+	let was_bookmarked = manager.get_bookmarks(path).iter().any(|bm| bm.start == start && bm.end == end);
+	manager.toggle_bookmark(path, start, end, note);
+	was_bookmarked
+}
+
+fn config_manager_upsert_bookmark_note(
+	manager: &mut RustConfigManager,
+	path: &str,
+	start: i64,
+	end: i64,
+	note: &str,
+) -> bool {
+	let exists = manager.get_bookmarks(path).iter().any(|bm| bm.start == start && bm.end == end);
+	if exists {
+		manager.update_bookmark_note(path, start, end, note);
+	} else {
+		manager.add_bookmark(path, start, end, note);
+	}
+	exists
+}
+
 fn config_manager_update_bookmark_note(manager: &mut RustConfigManager, path: &str, start: i64, end: i64, note: &str) {
 	manager.update_bookmark_note(path, start, end, note);
 }