From c970712c3bf3bde316b5ca109e416e619db6ff13 Mon Sep 17 00:00:00 2001
From: Alexandre Bury <alexandre.bury@gmail.com>
Date: Mon, 23 Jan 2017 20:22:43 -0800
Subject: [PATCH] Add `TextView::append_content`

Also don't strip the newline anymore when setting content.
Instead, just ignore trailing newline when computing rows.
---
 src/views/text_view.rs | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/text_view.rs b/src/views/text_view.rs
index 1c49a60..13b41af 100644
--- a/src/views/text_view.rs
+++ b/src/views/text_view.rs
@@ -29,17 +29,18 @@ pub struct TextView {
 }
 
 // If the last character is a newline, strip it.
-fn strip_last_newline(content: &mut String) {
+fn strip_last_newline(content: &str) -> &str {
     if content.ends_with('\n') {
-        content.pop().unwrap();
+        &content[..content.len() - 1]
+    } else {
+        content
     }
 }
 
 impl TextView {
     /// Creates a new TextView with the given content.
     pub fn new<S: Into<String>>(content: S) -> Self {
-        let mut content = content.into();
-        strip_last_newline(&mut content);
+        let content = content.into();
         TextView {
             content: content,
             rows: Vec::new(),
@@ -99,12 +100,17 @@ impl TextView {
 
     /// Replace the text in this view.
     pub fn set_content<S: Into<String>>(&mut self, content: S) {
-        let mut content = content.into();
-        strip_last_newline(&mut content);
+        let content = content.into();
         self.content = content;
         self.invalidate();
     }
 
+    /// Append content to the end of a TextView.
+    pub fn append_content(&mut self, content: &str) {
+        self.content.push_str(content);
+        self.invalidate();
+    }
+
     /// Returns the current text in this view.
     pub fn get_content(&self) -> &str {
         &self.content
@@ -163,7 +169,9 @@ impl TextView {
 
         // First attempt: naively hope that we won't need a scrollbar_width
         // (This means we try to use the entire available width for text).
-        self.rows = LinesIterator::new(&self.content, size.x).collect();
+        self.rows = LinesIterator::new(strip_last_newline(&self.content),
+                                       size.x)
+            .collect();
 
         // Width taken by the scrollbar. Without a scrollbar, it's 0.
         let mut scrollbar_width = 0;