]> git.lizzy.rs Git - rust.git/blob - src/missed_spans.rs
Stop extra newlines from being added after block comments (#1185)
[rust.git] / src / missed_spans.rs
1 // Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2 // file at the top-level directory of this distribution and at
3 // http://rust-lang.org/COPYRIGHT.
4 //
5 // Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6 // http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7 // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8 // option. This file may not be copied, modified, or distributed
9 // except according to those terms.
10
11 use config::WriteMode;
12 use visitor::FmtVisitor;
13 use syntax::codemap::{self, BytePos, Span, Pos};
14 use comment::{CodeCharKind, CommentCodeSlices, rewrite_comment};
15
16 impl<'a> FmtVisitor<'a> {
17     fn output_at_start(&self) -> bool {
18         self.buffer.len == 0
19     }
20
21     // TODO these format_missing methods are ugly. Refactor and add unit tests
22     // for the central whitespace stripping loop.
23     pub fn format_missing(&mut self, end: BytePos) {
24         self.format_missing_inner(end,
25                                   |this, last_snippet, _| this.buffer.push_str(last_snippet))
26     }
27
28     pub fn format_missing_with_indent(&mut self, end: BytePos) {
29         let config = self.config;
30         self.format_missing_inner(end, |this, last_snippet, snippet| {
31             this.buffer.push_str(last_snippet.trim_right());
32             if last_snippet == snippet && !this.output_at_start() {
33                 // No new lines in the snippet.
34                 this.buffer.push_str("\n");
35             }
36             let indent = this.block_indent.to_string(config);
37             this.buffer.push_str(&indent);
38         })
39     }
40
41     pub fn format_missing_no_indent(&mut self, end: BytePos) {
42         self.format_missing_inner(end, |this, last_snippet, _| {
43             this.buffer.push_str(last_snippet.trim_right());
44         })
45     }
46
47     fn format_missing_inner<F: Fn(&mut FmtVisitor, &str, &str)>(&mut self,
48                                                                 end: BytePos,
49                                                                 process_last_snippet: F) {
50         let start = self.last_pos;
51
52         if start == end {
53             // Do nothing if this is the beginning of the file.
54             if !self.output_at_start() {
55                 process_last_snippet(self, "", "");
56             }
57             return;
58         }
59
60         assert!(start < end,
61                 "Request to format inverted span: {:?} to {:?}",
62                 self.codemap.lookup_char_pos(start),
63                 self.codemap.lookup_char_pos(end));
64
65         self.last_pos = end;
66         let span = codemap::mk_sp(start, end);
67
68         self.write_snippet(span, &process_last_snippet);
69     }
70
71     fn write_snippet<F>(&mut self, span: Span, process_last_snippet: F)
72         where F: Fn(&mut FmtVisitor, &str, &str)
73     {
74         // Get a snippet from the file start to the span's hi without allocating.
75         // We need it to determine what precedes the current comment. If the comment
76         // follows code on the same line, we won't touch it.
77         let big_span_lo = self.codemap.lookup_char_pos(span.lo).file.start_pos;
78         let local_begin = self.codemap.lookup_byte_offset(big_span_lo);
79         let local_end = self.codemap.lookup_byte_offset(span.hi);
80         let start_index = local_begin.pos.to_usize();
81         let end_index = local_end.pos.to_usize();
82         let big_snippet = &local_begin.fm.src.as_ref().unwrap()[start_index..end_index];
83
84         let big_diff = (span.lo - big_span_lo).to_usize();
85         let snippet = self.snippet(span);
86
87         self.write_snippet_inner(big_snippet, big_diff, &snippet, process_last_snippet);
88     }
89
90     fn write_snippet_inner<F>(&mut self,
91                               big_snippet: &str,
92                               big_diff: usize,
93                               old_snippet: &str,
94                               process_last_snippet: F)
95         where F: Fn(&mut FmtVisitor, &str, &str)
96     {
97         // Trim whitespace from the right hand side of each line.
98         // Annoyingly, the library functions for splitting by lines etc. are not
99         // quite right, so we must do it ourselves.
100         let mut line_start = 0;
101         let mut last_wspace = None;
102         let mut rewrite_next_comment = true;
103
104         fn replace_chars(string: &str) -> String {
105             string.chars()
106                 .map(|ch| { if ch.is_whitespace() { ch } else { 'X' } })
107                 .collect()
108         }
109
110         let replaced = match self.config.write_mode {
111             WriteMode::Coverage => replace_chars(old_snippet),
112             _ => old_snippet.to_owned(),
113         };
114         let snippet = &*replaced;
115
116         for (kind, offset, subslice) in CommentCodeSlices::new(snippet) {
117             if let CodeCharKind::Comment = kind {
118                 let last_char = big_snippet[..(offset + big_diff)]
119                     .chars()
120                     .rev()
121                     .skip_while(|rev_c| [' ', '\t'].contains(rev_c))
122                     .next();
123
124                 let fix_indent = last_char.map_or(true, |rev_c| ['{', '\n'].contains(&rev_c));
125
126                 if rewrite_next_comment && fix_indent {
127                     if let Some('{') = last_char {
128                         self.buffer.push_str("\n");
129                     }
130
131                     let comment_width = ::std::cmp::min(self.config.ideal_width,
132                                                         self.config.max_width -
133                                                         self.block_indent.width());
134
135                     self.buffer.push_str(&self.block_indent.to_string(self.config));
136                     self.buffer.push_str(&rewrite_comment(subslice,
137                                                           false,
138                                                           comment_width,
139                                                           self.block_indent,
140                                                           self.config)
141                         .unwrap());
142
143                     last_wspace = None;
144                     line_start = offset + subslice.len();
145
146                     if let Some('/') = subslice.chars().skip(1).next() {
147                         // check that there are no contained block comments
148                         if !subslice.split('\n')
149                             .map(|s| s.trim_left())
150                             .any(|s| s.len() > 2 && &s[0..2] == "/*") {
151                             // Add a newline after line comments
152                             self.buffer.push_str("\n");
153                         }
154                     } else if line_start <= snippet.len() {
155                         // For other comments add a newline if there isn't one at the end already
156                         match snippet[line_start..].chars().next() {
157                             Some('\n') | Some('\r') => (),
158                             _ => self.buffer.push_str("\n"),
159                         }
160                     }
161
162                     continue;
163                 } else {
164                     rewrite_next_comment = false;
165                 }
166             }
167
168             for (mut i, c) in subslice.char_indices() {
169                 i += offset;
170
171                 if c == '\n' {
172                     if let Some(lw) = last_wspace {
173                         self.buffer.push_str(&snippet[line_start..lw]);
174                         self.buffer.push_str("\n");
175                     } else {
176                         self.buffer.push_str(&snippet[line_start..i + 1]);
177                     }
178
179                     line_start = i + 1;
180                     last_wspace = None;
181                     rewrite_next_comment = rewrite_next_comment || kind == CodeCharKind::Normal;
182                 } else if c.is_whitespace() {
183                     if last_wspace.is_none() {
184                         last_wspace = Some(i);
185                     }
186                 } else {
187                     rewrite_next_comment = rewrite_next_comment || kind == CodeCharKind::Normal;
188                     last_wspace = None;
189                 }
190             }
191         }
192
193         process_last_snippet(self, &snippet[line_start..], snippet);
194     }
195 }