Remove Console::with helpers

Author: lionel-

crates/ark/src/browser.rs

@@ -26,17 +26,15 @@ pub unsafe extern "C-unwind" fn ps_browse_url(url: SEXP) -> anyhow::Result<SEXP>
 }
 
 fn is_help_url(url: &str) -> bool {
-    Console::with(|con| con.is_help_url(url))
+    Console::get().is_help_url(url)
 }
 
 fn handle_help_url(url: String) -> anyhow::Result<()> {
-    Console::with(|con| {
-        let event = HelpEvent::ShowHelpUrl(ShowHelpUrlParams {
-            url,
-            kind: ShowHelpUrlKind::HelpProxy,
-        });
-        con.send_help_event(event)
-    })
+    let event = HelpEvent::ShowHelpUrl(ShowHelpUrlParams {
+        url,
+        kind: ShowHelpUrlKind::HelpProxy,
+    });
+    Console::get().send_help_event(event)
 }
 
 unsafe fn ps_browse_url_impl(url: SEXP) -> anyhow::Result<SEXP> {

crates/ark/src/console.rs

@@ -891,20 +891,6 @@ impl Console {
         })
     }
 
-    pub fn with<F, T>(f: F) -> T
-    where
-        F: FnOnce(&Console) -> T,
-    {
-        f(Self::get())
-    }
-
-    pub fn with_mut<F, T>(f: F) -> T
-    where
-        F: FnOnce(&mut Console) -> T,
-    {
-        f(Self::get_mut())
-    }
-
     pub fn on_main_thread() -> bool {
         let thread = std::thread::current();
         thread.id() == unsafe { CONSOLE_THREAD_ID.unwrap() }

crates/ark/src/lsp/backend.rs

@@ -530,7 +530,7 @@ pub fn start_lsp(
             r_task({
                 let events_tx = events_tx.clone();
                 move || {
-                    Console::with_mut(|con| con.set_lsp_channel(events_tx));
+                    Console::get_mut().set_lsp_channel(events_tx);
                 }
             });
 
@@ -577,7 +577,7 @@ pub fn start_lsp(
         // from `Console`, at least until someone starts the LSP up again.
         r_task({
             move || {
-                Console::with_mut(|con| con.remove_lsp_channel());
+                Console::get_mut().remove_lsp_channel();
             }
         });
     })

crates/ark/src/plots/graphics_device.rs

@@ -244,9 +244,8 @@ impl DeviceContext {
     /// comm is connected (i.e. we are connected to Positron) and if we are in
     /// [SessionMode::Console] mode.
     fn should_use_dynamic_plots(&self) -> bool {
-        Console::with(|con| {
-            con.is_ui_comm_connected() && con.session_mode() == SessionMode::Console
-        })
+        let console = Console::get();
+        console.is_ui_comm_connected() && console.session_mode() == SessionMode::Console
     }
 
     /// Deactivation hook
@@ -325,11 +324,9 @@ impl DeviceContext {
         }
 
         // Fall back to getting context from Console (for edge cases)
-        Console::with(|con| {
-            con.get_execution_context().unwrap_or_else(|| {
-                // No active request - might be during startup or from R code
-                (String::new(), String::new())
-            })
+        Console::get().get_execution_context().unwrap_or_else(|| {
+            // No active request - might be during startup or from R code
+            (String::new(), String::new())
         })
     }
 

crates/ark/src/shell.rs

@@ -300,7 +300,7 @@ fn handle_comm_open_help(comm: CommSocket) -> amalthea::Result<bool> {
 
         // Send the help event channel to the main R thread so it can
         // emit help events, to be delivered over the help comm.
-        Console::with_mut(|con| con.set_help_fields(help_event_tx, r_port));
+        Console::get_mut().set_help_fields(help_event_tx, r_port);
 
         Ok(true)
     })

crates/ark/src/srcref.rs

@@ -38,7 +38,7 @@ pub(crate) fn resource_loaded_namespaces() -> anyhow::Result<()> {
 pub(crate) async fn ns_populate_srcref(ns_name: String) -> anyhow::Result<()> {
     if let Some((uri, contents)) = ns_populate_srcref_without_vdoc_insertion(ns_name).await? {
         // Register the virtual document for the namespace
-        Console::with_mut(|con| con.insert_virtual_document(uri, contents));
+        Console::get_mut().insert_virtual_document(uri, contents);
     };
 
     Ok(())
@@ -53,7 +53,7 @@ async fn ns_populate_srcref_without_vdoc_insertion(
 
     // Don't redo the work if we already did it. We don't expect a namespace to change.
     #[cfg(not(test))]
-    if Console::with(|con| con.has_virtual_document(&ark_ns_uri(&ns_name))) {
+    if Console::get().has_virtual_document(&ark_ns_uri(&ns_name)) {
         return Ok(None);
     }
 

crates/ark/src/startup.rs

@@ -105,7 +105,7 @@ fn source_r_profile(path: &PathBuf) {
         text: message,
     });
 
-    Console::with(|con| con.get_iopub_tx().send(message).unwrap())
+    Console::get().get_iopub_tx().send(message).unwrap()
 }
 
 fn find_site_r_profile(r_home: &PathBuf) -> Option<PathBuf> {