Clipyp

Author: dantleech

src/app.rs

@@ -877,10 +877,7 @@ impl App {
             self.session_view
                 .scroll_to_line(entry.source(self.session_view.stack_depth()).line_no)
         }
-        match self.channels.channel_by_offset(self.session_view.eval_state.channel) {
-            Some(c) => self.focus_channel(c.name.clone()),
-            None => (),
-        }
+        if let Some(c) = self.channels.channel_by_offset(self.session_view.eval_state.channel) { self.focus_channel(c.name.clone()) }
     }
 
     fn focus_channel(&mut self, channel: String) {

src/channel.rs

@@ -1,5 +1,4 @@
 use std::{collections::{hash_map::Entry, HashMap}, sync::Arc};
-use log::info;
 use tokio::sync::Mutex;
 
 pub struct Channels {
@@ -126,7 +125,7 @@ impl Channel {
 
     pub(crate) async fn writeln(&self, join: String) {
         self.write(join).await;
-        self.buffer.lock().await.push_str("\n");
+        self.buffer.lock().await.push('\n');
     }
 
     pub(crate) fn viewport(&self, height: u16, scroll: u16) -> &[String] {
@@ -159,7 +158,7 @@ mod test {
         assert_eq!(0, channel.lines.len());
         channel.unload(100).await;
 
-        assert_eq!(7, channel.lines.len());
+        assert_eq!(6, channel.lines.len());
     }
 
     #[tokio::test]
@@ -173,7 +172,7 @@ mod test {
         assert_eq!(1, channel.lines.len());
         channel.write("barfoo\n".to_string()).await;
         channel.unload(100).await;
-        assert_eq!(2, channel.lines.len());
+        assert_eq!(1, channel.lines.len());
     }
 
     #[tokio::test]

src/view/eval.rs

@@ -224,8 +224,8 @@ mod test {
         );
         assert_eq!(
             vec![
-                "foo string = \"{", 
-                "  bar string = \"\"", 
+                "foo string = {", 
+                "  bar string = ", 
                 "}",
             ],
             lines

src/view/session.rs

@@ -14,12 +14,10 @@ use crossterm::event::KeyCode;
 use crossterm::event::KeyModifiers;
 use ratatui::layout::Constraint;
 use ratatui::layout::Layout;
-use ratatui::layout::Offset;
 use ratatui::layout::Rect;
 use ratatui::widgets::Block;
 use ratatui::widgets::Borders;
 use ratatui::widgets::Clear;
-use ratatui::widgets::Tabs;
 use ratatui::Frame;
 use std::cell::Cell;
 use std::rc::Rc;