diff --git a/src/keybind/builtin/flow.json b/src/keybind/builtin/flow.json index ea6ba8e..35f2e36 100644 --- a/src/keybind/builtin/flow.json +++ b/src/keybind/builtin/flow.json @@ -53,7 +53,8 @@ ["shift+alt+f9", "hint_window_next_widget_style"], ["alt+!", "run_task"], ["ctrl+tab", "next_tab"], - ["ctrl+shift+g", "show_vcs_status"], + ["ctrl+shift+g s", "show_vcs_status"], + ["ctrl+shift+g alt+b", "toggle_inline_vcs_blame"], ["ctrl+shift+tab", "previous_tab"], ["ctrl+page_down", "next_tab"], ["ctrl+page_up", "previous_tab"], diff --git a/src/tui/mode/overlay/completion_palette.zig b/src/tui/mode/overlay/completion_palette.zig index bf23235..194112c 100644 --- a/src/tui/mode/overlay/completion_palette.zig +++ b/src/tui/mode/overlay/completion_palette.zig @@ -49,8 +49,9 @@ pub fn load_entries(palette: *Type) !usize { if (!try cbor.matchValue(&iter, cbor.extract_cbor(&cbor_item))) return error.BadCompletion; const values = get_values(cbor_item); - if (existing.contains(values.sort_text)) continue; - try existing.put(palette.allocator, values.sort_text, {}); + const dup_text = if (values.sort_text.len > 0) values.sort_text else values.label; + if (existing.contains(dup_text)) continue; + try existing.put(palette.allocator, dup_text, {}); if (palette.value.replace == null) if (get_replace_selection(values.replace)) |replace| { palette.value.replace = replace;