mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #482 from sinhpham/refactor_write_snippet

Browse Source 
Refactor write_snippet
This commit is contained in:
Marcus Klaas de Vries 2015-10-17 23:50:29 +02:00
commit 36c9a3acf9
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/missed_spans.rs
View File

@ -59,43 +59,22 @@ impl<'a> FmtVisitor<'a> {
let span = codemap::mk_sp(start, end); let span = codemap::mk_sp(start, end);
let snippet = self.snippet(span); let snippet = self.snippet(span);
self.write_snippet(&snippet, true, &process_last_snippet); self.write_snippet(&snippet, &process_last_snippet);
} }
fn write_snippet<F: Fn(&mut FmtVisitor, &str, &str)>(&mut self, fn write_snippet<F: Fn(&mut FmtVisitor, &str, &str)>(&mut self,
snippet: &str, snippet: &str,
last_snippet: bool,
process_last_snippet: F) { process_last_snippet: F) {
// Trim whitespace from the right hand side of each line. let mut lines: Vec<&str> = snippet.lines().collect();
// Annoyingly, the library functions for splitting by lines etc. are not let last_snippet = if snippet.ends_with("\n") {
// quite right, so we must do it ourselves. ""
let mut line_start = 0;
let mut last_wspace = None;
for (i, c) in snippet.char_indices() {
if c == '\n' {
if let Some(lw) = last_wspace {
self.buffer.push_str(&snippet[line_start..lw]);
self.buffer.push_str("\n");
} else {
self.buffer.push_str(&snippet[line_start..i + 1]);
}
line_start = i + 1;
last_wspace = None;
} else {
if c.is_whitespace() {
if last_wspace.is_none() {
last_wspace = Some(i);
}
} else {
last_wspace = None;
}
}
}
if last_snippet {
process_last_snippet(self, &snippet[line_start..], snippet);
} else { } else {
self.buffer.push_str(&snippet[line_start..]); lines.pop().unwrap()
};
for line in lines.iter() {
self.buffer.push_str(line.trim_right());
self.buffer.push_str("\n");
} }
process_last_snippet(self, &last_snippet, snippet);
} }
} }