diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index 628fd8fbcd8b..69504e9b7dc4 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1743,11 +1743,13 @@ fn global_search(cx: &mut Context) { let smart_case = config.search.smart_case; let file_picker_config = config.file_picker.clone(); - let completions = search_completions(cx, None); + let reg = cx.register.unwrap_or('/'); + + let completions = search_completions(cx, Some(reg)); ui::regex_prompt( cx, "global-search:".into(), - None, + Some(reg), move |_editor: &Editor, input: &str| { completions .iter() diff --git a/helix-view/src/tree.rs b/helix-view/src/tree.rs index e6dba9163f26..3ba85b560f81 100644 --- a/helix-view/src/tree.rs +++ b/helix-view/src/tree.rs @@ -233,7 +233,6 @@ impl Tree { { if let Some(pos) = container.children.iter().position(|&child| child == index) { container.children.remove(pos); - // TODO: if container now only has one child, remove it and place child in parent if container.children.is_empty() && parent_id != self.root { // if container now empty, remove it