2 files changed, 78 insertions, 0 deletions

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 36b85508..71b1f5e5 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -307,6 +307,7 @@ impl Command {
         dap_start, "Start debug session",
         dap_run, "Begin program execution",
         dap_continue, "Continue program execution",
+        dap_variable_scopes, "List variable scopes",
         dap_terminate, "End debug session",
         suspend, "Suspend"
     );
@@ -1905,6 +1906,49 @@ mod cmd {
         Ok(())
     }
 
+    fn variables(
+        cx: &mut compositor::Context,
+        args: &[&str],
+        _event: PromptEvent,
+    ) -> anyhow::Result<()> {
+        use helix_lsp::block_on;
+
+        let scope = args.get(0).and_then(|arg| arg.parse::<usize>().ok());
+        if scope.is_none() {
+            cx.editor.set_status("Please provide scope ID".to_owned());
+            return Ok(());
+        }
+
+        if let Some(debugger) = &mut cx.editor.debugger {
+            if debugger.is_running {
+                cx.editor
+                    .set_status("Cannot access variables while target is running".to_owned());
+                return Ok(());
+            }
+            if debugger.stack_pointer.is_none() {
+                cx.editor
+                    .set_status("Cannot find current stack pointer to access variables".to_owned());
+                return Ok(());
+            }
+
+            let response = block_on(debugger.variables(scope.unwrap()));
+
+            let status = match response {
+                Ok(vars) => {
+                    let mut s = String::new();
+                    for var in vars {
+                        s.push_str(&format!("{} = {}; ", var.name, var.value));
+                    }
+                    s
+                }
+                Err(_) => "Failed to get variables".to_owned(),
+            };
+
+            cx.editor.set_status(status);
+        }
+        Ok(())
+    }
+
     pub const TYPABLE_COMMAND_LIST: &[TypableCommand] = &[
         TypableCommand {
             name: "quit",
@@ -2143,6 +2187,13 @@ mod cmd {
             doc: "Display tree sitter scopes, primarily for theming and development.",
             fun: tree_sitter_scopes,
             completer: None,
+        },
+        TypableCommand {
+            name: "variables",
+            alias: None,
+            doc: "Display variables of scope. Get scope names using a command in debug menu",
+            fun: variables,
+            completer: None,
         }
     ];
 
@@ -4348,6 +4399,32 @@ fn dap_continue(cx: &mut Context) {
     }
 }
 
+fn dap_variable_scopes(cx: &mut Context) {
+    use helix_lsp::block_on;
+
+    if let Some(debugger) = &mut cx.editor.debugger {
+        if debugger.is_running {
+            cx.editor
+                .set_status("Cannot access variables while target is running".to_owned());
+            return;
+        }
+        if debugger.stack_pointer.is_none() {
+            cx.editor
+                .set_status("Cannot find current stack pointer to access variables".to_owned());
+            return;
+        }
+
+        let frame_id = debugger.stack_pointer.clone().unwrap().id;
+        let scopes = block_on(debugger.scopes(frame_id)).unwrap();
+
+        let mut status = String::new();
+        for scope in scopes.iter() {
+            status.push_str(&format!("{}: {}; ", scope.variables_reference, scope.name))
+        }
+        cx.editor.set_status(status);
+    }
+}
+
 fn dap_terminate(cx: &mut Context) {
     use helix_lsp::block_on;
 
diff --git a/helix-term/src/keymap.rs b/helix-term/src/keymap.rs
index 578cb7d7..6082521e 100644
--- a/helix-term/src/keymap.rs
+++ b/helix-term/src/keymap.rs
@@ -490,6 +490,7 @@ impl Default for Keymaps {
                     "b" => dap_toggle_breakpoint,
                     "r" => dap_run,
                     "c" => dap_continue,
+                    "z" => dap_variable_scopes,
                     "t" => dap_terminate,
                 },
                 "w" => { "Window"