start menu refactor

maxomatic458 · Jan 25, 2024 · 62726f2 · 62726f2
1 parent 3f0dd62
commit 62726f2
Show file tree

Hide file tree

Showing 9 changed files with 312 additions and 431 deletions.
diff --git a/examples/completions.rs b/examples/completions.rs
@@ -6,7 +6,7 @@
 
 use reedline::{
     default_emacs_keybindings, ColumnarMenu, DefaultCompleter, DefaultPrompt, EditCommand, Emacs,
-    KeyCode, KeyModifiers, Keybindings, Reedline, ReedlineEvent, ReedlineMenu, Signal,
+    KeyCode, KeyModifiers, Keybindings, MenuBuilder, Reedline, ReedlineEvent, ReedlineMenu, Signal,
 };
 use std::io;
 

diff --git a/examples/demo.rs b/examples/demo.rs
@@ -9,8 +9,8 @@ use {
     reedline::{
         default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
         ColumnarMenu, DefaultCompleter, DefaultHinter, DefaultPrompt, DefaultValidator,
-        EditCommand, EditMode, Emacs, ExampleHighlighter, Keybindings, ListMenu, Reedline,
-        ReedlineEvent, ReedlineMenu, Signal, Vi,
+        EditCommand, EditMode, Emacs, ExampleHighlighter, Keybindings, ListMenu, MenuBuilder,
+        Reedline, ReedlineEvent, ReedlineMenu, Signal, Vi,
     },
 };
 

diff --git a/examples/ide_completions.rs b/examples/ide_completions.rs
@@ -6,8 +6,8 @@
 
 use reedline::{
     default_emacs_keybindings, DefaultCompleter, DefaultPrompt, DescriptionMode, EditCommand,
-    Emacs, IdeMenu, KeyCode, KeyModifiers, Keybindings, Reedline, ReedlineEvent, ReedlineMenu,
-    Signal,
+    Emacs, IdeMenu, KeyCode, KeyModifiers, Keybindings, MenuBuilder, Reedline, ReedlineEvent,
+    ReedlineMenu, Signal,
 };
 use std::io;
 

diff --git a/examples/transient_prompt.rs b/examples/transient_prompt.rs
@@ -8,7 +8,7 @@ use nu_ansi_term::{Color, Style};
 use reedline::SqliteBackedHistory;
 use reedline::{
     default_emacs_keybindings, ColumnarMenu, DefaultCompleter, DefaultHinter, DefaultPrompt, Emacs,
-    ExampleHighlighter, KeyCode, KeyModifiers, Keybindings, Prompt, PromptEditMode,
+    ExampleHighlighter, KeyCode, KeyModifiers, Keybindings, MenuBuilder, Prompt, PromptEditMode,
     PromptHistorySearch, PromptHistorySearchStatus, Reedline, ReedlineEvent, ReedlineMenu, Signal,
     ValidationResult, Validator,
 };

diff --git a/src/lib.rs b/src/lib.rs
@@ -277,7 +277,7 @@ pub use validator::{DefaultValidator, ValidationResult, Validator};
 
 mod menu;
 pub use menu::{
-    menu_functions, ColumnarMenu, DescriptionMode, IdeMenu, ListMenu, Menu, MenuEvent,
+    menu_functions, ColumnarMenu, DescriptionMode, IdeMenu, ListMenu, Menu, MenuBuilder, MenuEvent,
     MenuTextStyle, ReedlineMenu,
 };