fix: rope ends_with (#158)

Author: SyMind

src/helpers.rs

@@ -240,7 +240,7 @@ pub fn get_generated_source_info<'a, S>(source: S) -> GeneratedInfo
 where
   S: SourceText<'a>,
 {
-  let (generated_line, generated_column) = if source.ends_with("\n") {
+  let (generated_line, generated_column) = if source.ends_with('\n') {
     (source.split_into_lines().count() + 1, 0)
   } else {
     let mut line_count = 0;
@@ -288,7 +288,7 @@ where
     last_line = Some(l);
   }
   if let Some(last_line) =
-    last_line.filter(|last_line| !last_line.ends_with("\n"))
+    last_line.filter(|last_line| !last_line.ends_with('\n'))
   {
     GeneratedInfo {
       generated_line: line - 1,
@@ -443,7 +443,7 @@ where
   }
   let last_line =
     &line_with_indices_list[line_with_indices_list.len() - 1].line;
-  let last_new_line = last_line.ends_with("\n");
+  let last_new_line = last_line.ends_with('\n');
   let final_line: u32 = if last_new_line {
     line_with_indices_list.len() + 1
   } else {
@@ -686,7 +686,7 @@ where
     current_generated_line += 1;
   }
   let last_line = &lines[lines.len() - 1];
-  let last_new_line = last_line.ends_with("\n");
+  let last_new_line = last_line.ends_with('\n');
   let final_line = if last_new_line {
     lines.len() + 1
   } else {
@@ -1249,7 +1249,7 @@ pub trait SourceText<'a>: Default + Clone + ToString {
   fn split_into_lines(&self) -> impl Iterator<Item = Self>;
 
   /// Checks if the text ends with the given string.
-  fn ends_with(&self, value: &str) -> bool;
+  fn ends_with(&self, value: char) -> bool;
 
   /// Returns an iterator over the char indices in the text.
   fn char_indices(&self) -> impl Iterator<Item = (usize, char)>;
@@ -1285,7 +1285,7 @@ impl<'a> SourceText<'a> for Rope<'a> {
   }
 
   #[inline]
-  fn ends_with(&self, value: &str) -> bool {
+  fn ends_with(&self, value: char) -> bool {
     (*self).ends_with(value)
   }
 
@@ -1327,7 +1327,7 @@ impl<'a> SourceText<'a> for &'a str {
   }
 
   #[inline]
-  fn ends_with(&self, value: &str) -> bool {
+  fn ends_with(&self, value: char) -> bool {
     (*self).ends_with(value)
   }
 

src/original_source.rs

@@ -218,7 +218,7 @@ impl StreamChunks for OriginalSource {
         last_line = Some(l);
       }
       if let Some(last_line) =
-        last_line.filter(|last_line| !last_line.ends_with("\n"))
+        last_line.filter(|last_line| !last_line.ends_with('\n'))
       {
         GeneratedInfo {
           generated_line: line - 1,

src/replace_source.rs

@@ -431,7 +431,7 @@ impl<T: Source> StreamChunks for ReplaceSource<T> {
           // Skip over the whole chunk
           if replacement_end >= end_pos {
             let line = mapping.generated_line as i64 + generated_line_offset;
-            if chunk.ends_with("\n") {
+            if chunk.ends_with('\n') {
               generated_line_offset -= 1;
               if generated_column_offset_line == line {
                 // undo exiting corrections form the current line
@@ -567,7 +567,7 @@ impl<T: Source> StreamChunks for ReplaceSource<T> {
             // Only the first chunk has name assigned
             replacement_name_index = None;
 
-            if m == lines.len() - 1 && !content_line.ends_with("\n") {
+            if m == lines.len() - 1 && !content_line.ends_with('\n') {
               if generated_column_offset_line == line {
                 generated_column_offset += content_line.len() as i64;
               } else {
@@ -607,7 +607,7 @@ impl<T: Source> StreamChunks for ReplaceSource<T> {
               .is_some_and(|replacement_end| replacement_end >= end_pos)
             {
               let line = mapping.generated_line as i64 + generated_line_offset;
-              if chunk.ends_with("\n") {
+              if chunk.ends_with('\n') {
                 generated_line_offset -= 1;
                 if generated_column_offset_line == line {
                   // undo exiting corrections form the current line
@@ -731,7 +731,7 @@ impl<T: Source> StreamChunks for ReplaceSource<T> {
         },
       );
 
-      if m == matches.len() - 1 && !content_line.ends_with("\n") {
+      if m == matches.len() - 1 && !content_line.ends_with('\n') {
         if generated_column_offset_line == line {
           generated_column_offset += content_line.len() as i64;
         } else {

src/rope.rs

@@ -59,33 +59,42 @@ impl<'a> Rope<'a> {
   pub fn append(&mut self, value: Rope<'a>) {
     match (&mut self.repr, value.repr) {
       (Repr::Light(s), Repr::Light(other)) => {
+        if other.is_empty() {
+          return;
+        }
         let raw = Vec::from_iter([(*s, 0), (other, s.len())]);
         self.repr = Repr::Full(Rc::new(raw));
       }
       (Repr::Full(s), Repr::Full(other)) => {
-        if !other.is_empty() {
-          let mut len = s
-            .last()
-            .map_or(0, |(chunk, start_pos)| *start_pos + chunk.len());
+        if other.is_empty() {
+          return;
+        }
+        let mut len = s
+          .last()
+          .map_or(0, |(chunk, start_pos)| *start_pos + chunk.len());
 
-          let cur = Rc::make_mut(s);
-          cur.reserve_exact(other.len());
+        let cur = Rc::make_mut(s);
+        cur.reserve_exact(other.len());
 
-          for &(chunk, _) in other.iter() {
-            cur.push((chunk, len));
-            len += chunk.len();
-          }
+        for &(chunk, _) in other.iter() {
+          cur.push((chunk, len));
+          len += chunk.len();
         }
       }
       (Repr::Full(s), Repr::Light(other)) => {
-        if !other.is_empty() {
-          let len = s
-            .last()
-            .map_or(0, |(chunk, start_pos)| *start_pos + chunk.len());
-          Rc::make_mut(s).push((other, len));
+        if other.is_empty() {
+          return;
         }
+        let len = s
+          .last()
+          .map_or(0, |(chunk, start_pos)| *start_pos + chunk.len());
+        Rc::make_mut(s).push((other, len));
       }
       (Repr::Light(s), Repr::Full(other)) => {
+        if s.is_empty() {
+          self.repr = Repr::Full(other.clone());
+          return;
+        }
         let mut raw = Vec::with_capacity(other.len() + 1);
         raw.push((*s, 0));
         let mut len = s.len();
@@ -228,7 +237,7 @@ impl<'a> Rope<'a> {
 
   /// Returns whether the rope ends with the given string.
   #[inline]
-  pub fn ends_with(&self, value: &str) -> bool {
+  pub fn ends_with(&self, value: char) -> bool {
     match &self.repr {
       Repr::Light(s) => s.ends_with(value),
       Repr::Full(data) => {
@@ -975,10 +984,13 @@ impl<'a> FromIterator<&'a str> for Rope<'a> {
     let mut len = 0;
     let raw = iter
       .into_iter()
-      .map(|chunk| {
+      .filter_map(|chunk| {
+        if chunk.is_empty() {
+          return None;
+        }
         let cur = (chunk, len);
         len += chunk.len();
-        cur
+        Some(cur)
       })
       .collect::<Vec<_>>();
 
@@ -1337,4 +1349,20 @@ mod tests {
     assert!(!rope.starts_with(&Rope::from_iter(vec!["a", "b", "c", "d"])));
     assert!(!rope.starts_with(&Rope::from_iter(vec!["b", "c"])));
   }
+
+  #[test]
+  fn ends_with() {
+    let rope = Rope::from("abc\n");
+    assert!(rope.ends_with('\n'));
+
+    let mut rope = Rope::from("abc\n");
+    rope.append("".into());
+    assert!(rope.ends_with('\n'));
+
+    let rope = Rope::from_iter(["abc\n", ""]);
+    assert!(rope.ends_with('\n'));
+
+    let rope = Rope::from_iter(["abc", "\n"]);
+    assert!(rope.ends_with('\n'));
+  }
 }

src/source.rs

@@ -194,7 +194,7 @@ fn is_all_empty(val: &Arc<[String]>) -> bool {
 }
 
 /// The source map created by [Source::map].
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+#[derive(Clone, PartialEq, Eq, Serialize)]
 pub struct SourceMap {
   version: u8,
   #[serde(skip_serializing_if = "Option::is_none")]
@@ -210,6 +210,23 @@ pub struct SourceMap {
   debug_id: Option<Arc<str>>,
 }
 
+impl std::fmt::Debug for SourceMap {
+  fn fmt(
+    &self,
+    f: &mut std::fmt::Formatter<'_>,
+  ) -> std::result::Result<(), std::fmt::Error> {
+    let indent = f.width().unwrap_or(0);
+    let indent_str = format!("{:indent$}", "", indent = indent);
+
+    write!(
+      f,
+      "{indent_str}SourceMap::from_json({:?}).unwrap()",
+      self.clone().to_json().unwrap()
+    )?;
+
+    Ok(())
+  }
+}
 impl Hash for SourceMap {
   fn hash<H: Hasher>(&self, state: &mut H) {
     self.file.hash(state);

src/source_map_source.rs

@@ -143,14 +143,41 @@ impl std::fmt::Debug for SourceMapSource {
     &self,
     f: &mut std::fmt::Formatter<'_>,
   ) -> Result<(), std::fmt::Error> {
-    f.debug_struct("SourceMapSource")
-      .field("name", &self.name)
-      .field("value", &self.value)
-      .field("source_map", &self.source_map)
-      .field("original_source", &self.original_source)
-      .field("inner_source_map", &self.inner_source_map)
-      .field("remove_original_source", &self.remove_original_source)
-      .finish()
+    let indent = f.width().unwrap_or(0);
+    let indent_str = format!("{:indent$}", "", indent = indent);
+
+    writeln!(
+      f,
+      "{indent_str}SourceMapSource::new(SourceMapSourceOptions {{"
+    )?;
+    writeln!(f, "{indent_str}  value: {:?},", self.value)?;
+    writeln!(f, "{indent_str}  name: {:?},", self.name)?;
+    writeln!(f, "{indent_str}  source_map: {:?},", self.source_map)?;
+    match &self.original_source {
+      Some(original_source) => {
+        writeln!(
+          f,
+          "{indent_str}  original_source: Some({:?}.to_string()),",
+          original_source
+        )?;
+      }
+      None => {
+        writeln!(f, "{indent_str}  original_source: None,")?;
+      }
+    }
+    writeln!(
+      f,
+      "{indent_str}  inner_source_map: {:?},",
+      self.inner_source_map
+    )?;
+    writeln!(
+      f,
+      "{indent_str}  remove_original_source: {:?},",
+      self.remove_original_source
+    )?;
+    write!(f, "{indent_str}}}).boxed()")?;
+
+    Ok(())
   }
 }
 
@@ -730,4 +757,45 @@ mod tests {
       .unwrap()
     );
   }
+
+  #[test]
+  fn debug() {
+    let source = SourceMapSource::new(SourceMapSourceOptions {
+      value: "hello world",
+      name: "hello.txt",
+      source_map: SourceMap::from_json(
+        r#"{
+          "version": 3,
+          "sources": ["hello.txt"],
+          "mappings": "AAAA,MAAG"
+        }"#,
+      )
+      .unwrap(),
+      original_source: Some("你好 世界".to_string()),
+      inner_source_map: Some(
+        SourceMap::from_json(
+          r#"{
+          "version": 3,
+          "sources": ["hello world.txt"],
+          "mappings": "AAAA,EAAE",
+          "sourcesContent": ["你好✋世界"]
+        }"#,
+        )
+        .unwrap(),
+      ),
+      remove_original_source: false,
+    });
+
+    assert_eq!(
+      format!("{:?}", source),
+      r#"SourceMapSource::new(SourceMapSourceOptions {
+  value: "hello world",
+  name: "hello.txt",
+  source_map: SourceMap::from_json("{\"version\":3,\"sources\":[\"hello.txt\"],\"names\":[],\"mappings\":\"AAAA,MAAG\"}").unwrap(),
+  original_source: Some("你好 世界".to_string()),
+  inner_source_map: Some(SourceMap::from_json("{\"version\":3,\"sources\":[\"hello world.txt\"],\"sourcesContent\":[\"你好✋世界\"],\"names\":[],\"mappings\":\"AAAA,EAAE\"}").unwrap()),
+  remove_original_source: false,
+}).boxed()"#
+    );
+  }
 }