inside_code_block = !inside_code_block;
}
if inside_code_block {
- result.push_str(line);
+ if line.is_empty() && result.ends_with(' ') {
+ result.pop();
+ } else {
+ result.push_str(line);
+ }
continue;
}
buffer
}
-struct CharClasses<T>
+pub struct CharClasses<T>
where
T: Iterator,
T::Item: RichChar,
status: CharClassesStatus,
}
-trait RichChar {
+pub trait RichChar {
fn get_char(&self) -> char;
}
}
}
+impl RichChar for (char, usize) {
+ fn get_char(&self) -> char {
+ self.0
+ }
+}
+
#[derive(PartialEq, Eq, Debug, Clone, Copy)]
enum CharClassesStatus {
Normal,
/// describing opening and closing of comments for ease when chunking
/// code from tagged characters
#[derive(PartialEq, Eq, Debug, Clone, Copy)]
-enum FullCodeCharKind {
+pub enum FullCodeCharKind {
Normal,
/// The first character of a comment, there is only one for a comment (always '/')
StartComment,
}
impl FullCodeCharKind {
- fn is_comment(&self) -> bool {
+ pub fn is_comment(&self) -> bool {
match *self {
FullCodeCharKind::StartComment
| FullCodeCharKind::InComment
}
}
+ pub fn is_string(&self) -> bool {
+ *self == FullCodeCharKind::InString
+ }
+
fn to_codecharkind(&self) -> CodeCharKind {
if self.is_comment() {
CodeCharKind::Comment
T: Iterator,
T::Item: RichChar,
{
- fn new(base: T) -> CharClasses<T> {
+ pub fn new(base: T) -> CharClasses<T> {
CharClasses {
base: base.peekable(),
status: CharClassesStatus::Normal,
context: &RewriteContext,
) -> Option<String> {
let snippet = context.snippet(span);
- if snippet != new && changed_comment_content(&snippet, &new) {
+ if snippet != new && changed_comment_content(snippet, &new) {
// We missed some comments. Keep the original text.
- Some(snippet.into())
+ Some(snippet.to_owned())
} else {
Some(new)
}