Merge pull request #97 from seryj/features/ratatui-replacement

replace tui by ratatui

Cargo.toml

@@ -30,11 +30,11 @@ log = "0.4"
 mimalloc = { version = "0.1", default-features = false }
 serde = "1.0.136"
 serde_json = "1.0.79"
-tui = { version = "0.17", default-features = false, features = [
+ratatui = { version = "0.21", default-features = false, features = [
     'crossterm',
     'serde',
 ] }
-tui-logger = "0.7"
+tui-logger = {version="0.9", default-features = false, features = ["ratatui-support"]}
 tokio = { version = "1", features = ["full"] }
 unicode-width = "0.1.9"
 

src/app/core.rs

@@ -36,20 +36,15 @@ pub struct Tabs {
     pub index: usize,
 }
 
-#[derive(Debug, Copy, Eq, PartialEq, Clone)]
+#[derive(Default, Debug, Copy, Eq, PartialEq, Clone)]
 pub enum TabItem {
+    #[default]
     Editor,
     QueryHistory,
     Context,
     Logs,
 }
 
-impl Default for TabItem {
-    fn default() -> TabItem {
-        TabItem::Editor
-    }
-}
-
 impl TabItem {
     pub(crate) fn all_values() -> Vec<TabItem> {
         vec![
@@ -68,7 +63,7 @@ impl TabItem {
     }
 
     pub(crate) fn title_with_key(&self) -> String {
-        return format!("{} [{}]", self.title(), self.list_index() + 1);
+        format!("{} [{}]", self.title(), self.list_index() + 1)
     }
 
     pub(crate) fn title(&self) -> &'static str {
@@ -109,19 +104,14 @@ impl From<TabItem> for usize {
     }
 }
 
-#[derive(Debug, Copy, Clone)]
+#[derive(Default, Debug, Copy, Clone)]
 pub enum InputMode {
+    #[default]
     Normal,
     Editing,
     Rc,
 }
 
-impl Default for InputMode {
-    fn default() -> InputMode {
-        InputMode::Normal
-    }
-}
-
 /// Status that determines whether app should continue or exit
 #[derive(PartialEq)]
 pub enum AppReturn {

src/app/editor/mod.rs

@@ -78,7 +78,7 @@ impl Input {
             self.current_row - MAX_EDITOR_LINES
         } as usize;
 
-        let end = (start + (MAX_EDITOR_LINES as usize) + 1) as usize;
+        let end = start + (MAX_EDITOR_LINES as usize) + 1;
 
         let text: Vec<&str> = if start == 0 {
             // debug!("Combining all lines");

src/app/ui.rs

@@ -15,11 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use tui::{
+use ratatui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Modifier, Style},
-    text::{Span, Spans, Text},
+    text::{Line, Span, Text},
     widgets::{Block, Borders, List, ListItem, Paragraph, Tabs},
     Frame,
 };
@@ -180,7 +180,7 @@ fn draw_sql_editor_help<'screen>(app: &App) -> Paragraph<'screen> {
             Style::default(),
         ),
     };
-    let mut text = Text::from(Spans::from(msg));
+    let mut text = Text::from(Line::from(msg));
     text.patch_style(style);
     Paragraph::new(text)
 }
@@ -196,7 +196,7 @@ fn draw_default_help<'screen>() -> Paragraph<'screen> {
         ],
         Style::default().add_modifier(Modifier::RAPID_BLINK),
     );
-    let mut text = Text::from(Spans::from(msg));
+    let mut text = Text::from(Line::from(msg));
     text.patch_style(style);
     Paragraph::new(text)
 }
@@ -262,7 +262,7 @@ fn draw_tabs<'screen>(app: &App) -> Tabs<'screen> {
     let titles = TabItem::all_values()
         .iter()
         .map(|tab| tab.title_with_key())
-        .map(|t| Spans::from(vec![Span::styled(t, Style::default())]))
+        .map(|t| Line::from(vec![Span::styled(t, Style::default())]))
         .collect();
 
     Tabs::new(titles)
@@ -280,12 +280,12 @@ fn draw_query_history<'screen>(app: &App) -> List<'screen> {
         .enumerate()
         .map(|(i, m)| {
             let content = vec![
-                Spans::from(Span::raw(format!(
+                Line::from(Span::raw(format!(
                     "Query {} [ {} rows took {:.3} seconds ]",
                     i, m.rows, m.query_duration
                 ))),
-                Spans::from(Span::raw(m.query.clone())),
-                Spans::from(Span::raw(String::new())),
+                Line::from(Span::raw(m.query.clone())),
+                Line::from(Span::raw(String::new())),
             ];
             ListItem::new(content)
         })
@@ -332,7 +332,7 @@ fn draw_execution_config<'screen>(app: &App) -> List<'screen> {
     let config: Vec<ListItem> = exec_config
         .iter()
         .map(|i| {
-            let content = vec![Spans::from(Span::raw(i.to_string()))];
+            let content = vec![Line::from(Span::raw(i.to_string()))];
             ListItem::new(content)
         })
         .collect();
@@ -349,7 +349,7 @@ fn draw_physical_optimizers<'screen>(app: &App) -> List<'screen> {
     let opts: Vec<ListItem> = physical_optimizers
         .iter()
         .map(|i| {
-            let content = vec![Spans::from(Span::raw(i.to_string()))];
+            let content = vec![Line::from(Span::raw(i.to_string()))];
             ListItem::new(content)
         })
         .collect();