2015-06-23 08:58:58 -05:00
|
|
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2016-01-10 08:12:15 -06:00
|
|
|
// Formatting and tools for comments.
|
2015-06-23 08:58:58 -05:00
|
|
|
|
2016-01-10 08:12:15 -06:00
|
|
|
use std::{self, iter};
|
|
|
|
|
|
|
|
use syntax::codemap::Span;
|
2015-08-27 07:07:15 -05:00
|
|
|
|
2017-01-30 13:28:48 -06:00
|
|
|
use {Indent, Shape};
|
2015-09-06 00:39:28 -05:00
|
|
|
use config::Config;
|
2016-01-10 08:12:15 -06:00
|
|
|
use rewrite::RewriteContext;
|
2017-07-13 04:42:14 -05:00
|
|
|
use string::{rewrite_string, StringFormat};
|
2017-08-11 03:52:13 -05:00
|
|
|
use utils::{first_line_width, last_line_width, wrap_str};
|
2015-06-23 08:58:58 -05:00
|
|
|
|
2016-09-29 14:34:46 -05:00
|
|
|
fn is_custom_comment(comment: &str) -> bool {
|
|
|
|
if !comment.starts_with("//") {
|
|
|
|
false
|
|
|
|
} else {
|
|
|
|
if let Some(c) = comment.chars().nth(2) {
|
|
|
|
!c.is_alphanumeric() && !c.is_whitespace()
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-28 05:10:05 -05:00
|
|
|
#[derive(PartialEq, Eq)]
|
2017-05-29 18:15:12 -05:00
|
|
|
pub enum CommentStyle<'a> {
|
2017-05-28 05:10:05 -05:00
|
|
|
DoubleSlash,
|
|
|
|
TripleSlash,
|
|
|
|
Doc,
|
|
|
|
SingleBullet,
|
|
|
|
DoubleBullet,
|
|
|
|
Exclamation,
|
2017-05-29 18:15:12 -05:00
|
|
|
Custom(&'a str),
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
|
|
|
|
2017-05-29 18:15:12 -05:00
|
|
|
fn custom_opener(s: &str) -> &str {
|
|
|
|
s.lines().next().map_or("", |first_line| {
|
2017-06-17 02:56:54 -05:00
|
|
|
first_line
|
|
|
|
.find(' ')
|
|
|
|
.map_or(first_line, |space_index| &first_line[0..space_index + 1])
|
2017-05-29 18:15:12 -05:00
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CommentStyle<'a> {
|
|
|
|
pub fn opener(&self) -> &'a str {
|
2017-05-28 05:10:05 -05:00
|
|
|
match *self {
|
|
|
|
CommentStyle::DoubleSlash => "// ",
|
|
|
|
CommentStyle::TripleSlash => "/// ",
|
|
|
|
CommentStyle::Doc => "//! ",
|
|
|
|
CommentStyle::SingleBullet => "/* ",
|
|
|
|
CommentStyle::DoubleBullet => "/** ",
|
|
|
|
CommentStyle::Exclamation => "/*! ",
|
2017-05-29 18:15:12 -05:00
|
|
|
CommentStyle::Custom(opener) => opener,
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-29 18:15:12 -05:00
|
|
|
pub fn closer(&self) -> &'a str {
|
2017-05-28 05:10:05 -05:00
|
|
|
match *self {
|
|
|
|
CommentStyle::DoubleSlash |
|
|
|
|
CommentStyle::TripleSlash |
|
2017-05-29 18:15:12 -05:00
|
|
|
CommentStyle::Custom(..) |
|
2017-05-28 05:10:05 -05:00
|
|
|
CommentStyle::Doc => "",
|
|
|
|
CommentStyle::DoubleBullet => " **/",
|
2017-07-09 12:24:59 -05:00
|
|
|
CommentStyle::SingleBullet | CommentStyle::Exclamation => " */",
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-29 18:15:12 -05:00
|
|
|
pub fn line_start(&self) -> &'a str {
|
2017-05-28 05:10:05 -05:00
|
|
|
match *self {
|
|
|
|
CommentStyle::DoubleSlash => "// ",
|
|
|
|
CommentStyle::TripleSlash => "/// ",
|
|
|
|
CommentStyle::Doc => "//! ",
|
2017-07-09 12:24:59 -05:00
|
|
|
CommentStyle::SingleBullet | CommentStyle::Exclamation => " * ",
|
2017-05-28 05:10:05 -05:00
|
|
|
CommentStyle::DoubleBullet => " ** ",
|
2017-05-29 18:15:12 -05:00
|
|
|
CommentStyle::Custom(opener) => opener,
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-29 18:15:12 -05:00
|
|
|
pub fn to_str_tuplet(&self) -> (&'a str, &'a str, &'a str) {
|
|
|
|
(self.opener(), self.closer(), self.line_start())
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
|
|
|
|
2017-05-29 18:15:12 -05:00
|
|
|
pub fn line_with_same_comment_style(&self, line: &str, normalize_comments: bool) -> bool {
|
2017-05-28 05:10:05 -05:00
|
|
|
match *self {
|
2017-07-09 12:24:59 -05:00
|
|
|
CommentStyle::DoubleSlash | CommentStyle::TripleSlash | CommentStyle::Doc => {
|
2017-05-29 18:15:12 -05:00
|
|
|
line.trim_left().starts_with(self.line_start().trim_left()) ||
|
2017-06-11 22:58:58 -05:00
|
|
|
comment_style(line, normalize_comments) == *self
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
2017-07-09 12:24:59 -05:00
|
|
|
CommentStyle::DoubleBullet | CommentStyle::SingleBullet | CommentStyle::Exclamation => {
|
2017-05-28 05:10:05 -05:00
|
|
|
line.trim_left().starts_with(self.closer().trim_left()) ||
|
2017-06-11 22:58:58 -05:00
|
|
|
line.trim_left().starts_with(self.line_start().trim_left()) ||
|
|
|
|
comment_style(line, normalize_comments) == *self
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
2017-05-29 18:15:12 -05:00
|
|
|
CommentStyle::Custom(opener) => line.trim_left().starts_with(opener.trim_right()),
|
2017-05-28 05:10:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn comment_style(orig: &str, normalize_comments: bool) -> CommentStyle {
|
|
|
|
if !normalize_comments {
|
|
|
|
if orig.starts_with("/**") && !orig.starts_with("/**/") {
|
|
|
|
CommentStyle::DoubleBullet
|
|
|
|
} else if orig.starts_with("/*!") {
|
|
|
|
CommentStyle::Exclamation
|
|
|
|
} else if orig.starts_with("/*") {
|
|
|
|
CommentStyle::SingleBullet
|
2017-05-29 18:15:12 -05:00
|
|
|
} else if orig.starts_with("///") && orig.chars().nth(3).map_or(true, |c| c != '/') {
|
2017-05-28 05:10:05 -05:00
|
|
|
CommentStyle::TripleSlash
|
|
|
|
} else if orig.starts_with("//!") {
|
|
|
|
CommentStyle::Doc
|
2017-05-29 18:15:12 -05:00
|
|
|
} else if is_custom_comment(orig) {
|
|
|
|
CommentStyle::Custom(custom_opener(orig))
|
2017-05-28 05:10:05 -05:00
|
|
|
} else {
|
|
|
|
CommentStyle::DoubleSlash
|
|
|
|
}
|
2017-05-29 18:15:12 -05:00
|
|
|
} else if (orig.starts_with("///") && orig.chars().nth(3).map_or(true, |c| c != '/')) ||
|
2017-07-19 08:50:28 -05:00
|
|
|
(orig.starts_with("/**") && !orig.starts_with("/**/"))
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2017-05-28 05:10:05 -05:00
|
|
|
CommentStyle::TripleSlash
|
|
|
|
} else if orig.starts_with("//!") || orig.starts_with("/*!") {
|
|
|
|
CommentStyle::Doc
|
|
|
|
} else if is_custom_comment(orig) {
|
2017-05-29 18:15:12 -05:00
|
|
|
CommentStyle::Custom(custom_opener(orig))
|
2017-05-28 05:10:05 -05:00
|
|
|
} else {
|
|
|
|
CommentStyle::DoubleSlash
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-11 03:52:13 -05:00
|
|
|
pub fn combine_strs_with_missing_comments(
|
|
|
|
context: &RewriteContext,
|
|
|
|
prev_str: &str,
|
|
|
|
next_str: &str,
|
|
|
|
span: Span,
|
|
|
|
shape: Shape,
|
|
|
|
allow_extend: bool,
|
|
|
|
) -> Option<String> {
|
|
|
|
let mut allow_one_line = !prev_str.contains('\n') && !next_str.contains('\n');
|
|
|
|
let first_sep = if prev_str.is_empty() || next_str.is_empty() {
|
|
|
|
""
|
|
|
|
} else {
|
|
|
|
" "
|
|
|
|
};
|
|
|
|
let mut one_line_width =
|
|
|
|
last_line_width(prev_str) + first_line_width(next_str) + first_sep.len();
|
|
|
|
|
|
|
|
let original_snippet = context.snippet(span);
|
|
|
|
let trimmed_snippet = original_snippet.trim();
|
|
|
|
let indent_str = shape.indent.to_string(context.config);
|
|
|
|
|
|
|
|
if trimmed_snippet.is_empty() {
|
|
|
|
if allow_extend && prev_str.len() + first_sep.len() + next_str.len() <= shape.width {
|
|
|
|
return Some(format!("{}{}{}", prev_str, first_sep, next_str));
|
|
|
|
} else {
|
|
|
|
let sep = if prev_str.is_empty() {
|
|
|
|
String::new()
|
|
|
|
} else {
|
|
|
|
String::from("\n") + &indent_str
|
|
|
|
};
|
|
|
|
return Some(format!("{}{}{}", prev_str, sep, next_str));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We have a missing comment between the first expression and the second expression.
|
|
|
|
|
|
|
|
// Peek the the original source code and find out whether there is a newline between the first
|
|
|
|
// expression and the second expression or the missing comment. We will preserve the orginal
|
|
|
|
// layout whenever possible.
|
|
|
|
let prefer_same_line = if let Some(pos) = original_snippet.chars().position(|c| c == '/') {
|
|
|
|
!original_snippet[..pos].contains('\n')
|
|
|
|
} else {
|
|
|
|
!original_snippet.contains('\n')
|
|
|
|
};
|
|
|
|
|
|
|
|
let missing_comment = try_opt!(rewrite_comment(
|
|
|
|
trimmed_snippet,
|
|
|
|
false,
|
|
|
|
shape,
|
|
|
|
context.config
|
|
|
|
));
|
|
|
|
one_line_width -= first_sep.len();
|
|
|
|
let first_sep = if prev_str.is_empty() || missing_comment.is_empty() {
|
|
|
|
String::new()
|
|
|
|
} else {
|
|
|
|
let one_line_width = last_line_width(prev_str) + first_line_width(&missing_comment) + 1;
|
|
|
|
if prefer_same_line && one_line_width <= shape.width {
|
|
|
|
String::from(" ")
|
|
|
|
} else {
|
|
|
|
format!("\n{}", indent_str)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let second_sep = if missing_comment.is_empty() || next_str.is_empty() {
|
|
|
|
String::new()
|
|
|
|
} else {
|
|
|
|
if missing_comment.starts_with("//") {
|
|
|
|
format!("\n{}", indent_str)
|
|
|
|
} else {
|
|
|
|
one_line_width += missing_comment.len() + first_sep.len() + 1;
|
|
|
|
allow_one_line &= !missing_comment.starts_with("//") && !missing_comment.contains('\n');
|
|
|
|
if prefer_same_line && allow_one_line && one_line_width <= shape.width {
|
|
|
|
String::from(" ")
|
|
|
|
} else {
|
|
|
|
format!("\n{}", indent_str)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
Some(format!(
|
|
|
|
"{}{}{}{}{}",
|
|
|
|
prev_str,
|
|
|
|
first_sep,
|
|
|
|
missing_comment,
|
|
|
|
second_sep,
|
|
|
|
next_str,
|
|
|
|
))
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn rewrite_comment(
|
|
|
|
orig: &str,
|
|
|
|
block_style: bool,
|
|
|
|
shape: Shape,
|
|
|
|
config: &Config,
|
|
|
|
) -> Option<String> {
|
2017-01-15 22:58:51 -06:00
|
|
|
// If there are lines without a starting sigil, we won't format them correctly
|
2017-05-16 03:47:09 -05:00
|
|
|
// so in that case we won't even re-align (if !config.normalize_comments()) and
|
2017-01-15 22:58:51 -06:00
|
|
|
// we should stop now.
|
|
|
|
let num_bare_lines = orig.lines()
|
|
|
|
.map(|line| line.trim())
|
2017-06-11 22:58:58 -05:00
|
|
|
.filter(|l| {
|
|
|
|
!(l.starts_with('*') || l.starts_with("//") || l.starts_with("/*"))
|
|
|
|
})
|
2017-01-15 22:58:51 -06:00
|
|
|
.count();
|
2017-05-16 03:47:09 -05:00
|
|
|
if num_bare_lines > 0 && !config.normalize_comments() {
|
2017-01-15 22:58:51 -06:00
|
|
|
return Some(orig.to_owned());
|
|
|
|
}
|
2017-05-16 03:47:09 -05:00
|
|
|
if !config.normalize_comments() && !config.wrap_comments() {
|
2017-01-30 13:28:48 -06:00
|
|
|
return light_rewrite_comment(orig, shape.indent, config);
|
2017-01-15 22:58:51 -06:00
|
|
|
}
|
2015-06-23 08:58:58 -05:00
|
|
|
|
2017-05-28 05:10:05 -05:00
|
|
|
identify_comment(orig, block_style, shape, config)
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn identify_comment(
|
|
|
|
orig: &str,
|
|
|
|
block_style: bool,
|
|
|
|
shape: Shape,
|
|
|
|
config: &Config,
|
|
|
|
) -> Option<String> {
|
2017-05-28 05:10:05 -05:00
|
|
|
let style = comment_style(orig, false);
|
|
|
|
let first_group = orig.lines()
|
2017-05-29 18:15:12 -05:00
|
|
|
.take_while(|l| style.line_with_same_comment_style(l, false))
|
2017-05-28 05:10:05 -05:00
|
|
|
.collect::<Vec<_>>()
|
|
|
|
.join("\n");
|
|
|
|
let rest = orig.lines()
|
|
|
|
.skip(first_group.lines().count())
|
|
|
|
.collect::<Vec<_>>()
|
|
|
|
.join("\n");
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
let first_group_str = try_opt!(rewrite_comment_inner(
|
|
|
|
&first_group,
|
|
|
|
block_style,
|
|
|
|
style,
|
|
|
|
shape,
|
|
|
|
config,
|
|
|
|
));
|
2017-05-28 05:10:05 -05:00
|
|
|
if rest.is_empty() {
|
|
|
|
Some(first_group_str)
|
|
|
|
} else {
|
|
|
|
identify_comment(&rest, block_style, shape, config).map(|rest_str| {
|
2017-06-11 22:58:58 -05:00
|
|
|
format!(
|
|
|
|
"{}\n{}{}",
|
|
|
|
first_group_str,
|
|
|
|
shape.indent.to_string(config),
|
|
|
|
rest_str
|
|
|
|
)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn rewrite_comment_inner(
|
|
|
|
orig: &str,
|
|
|
|
block_style: bool,
|
|
|
|
style: CommentStyle,
|
|
|
|
shape: Shape,
|
|
|
|
config: &Config,
|
|
|
|
) -> Option<String> {
|
2017-05-13 07:08:10 -05:00
|
|
|
let (opener, closer, line_start) = if block_style {
|
2017-05-29 18:15:12 -05:00
|
|
|
CommentStyle::SingleBullet.to_str_tuplet()
|
2017-05-13 07:08:10 -05:00
|
|
|
} else {
|
2017-05-29 18:15:12 -05:00
|
|
|
comment_style(orig, config.normalize_comments()).to_str_tuplet()
|
2017-05-13 07:08:10 -05:00
|
|
|
};
|
2015-06-23 08:58:58 -05:00
|
|
|
|
2017-03-27 17:14:47 -05:00
|
|
|
let max_chars = shape
|
|
|
|
.width
|
|
|
|
.checked_sub(closer.len() + opener.len())
|
|
|
|
.unwrap_or(1);
|
2017-01-30 13:28:48 -06:00
|
|
|
let indent_str = shape.indent.to_string(config);
|
2015-07-15 20:31:20 -05:00
|
|
|
let fmt = StringFormat {
|
|
|
|
opener: "",
|
|
|
|
closer: "",
|
|
|
|
line_start: line_start,
|
|
|
|
line_end: "",
|
2017-01-30 13:28:48 -06:00
|
|
|
shape: Shape::legacy(max_chars, shape.indent + (opener.len() - line_start.len())),
|
2015-07-15 20:31:20 -05:00
|
|
|
trim_end: true,
|
2015-09-06 00:39:28 -05:00
|
|
|
config: config,
|
2015-07-15 20:31:20 -05:00
|
|
|
};
|
2015-06-23 08:58:58 -05:00
|
|
|
|
2017-04-24 02:50:11 -05:00
|
|
|
let line_breaks = orig.trim_right().chars().filter(|&c| c == '\n').count();
|
2017-01-15 22:58:51 -06:00
|
|
|
let lines = orig.lines()
|
2016-04-22 02:03:36 -05:00
|
|
|
.enumerate()
|
|
|
|
.map(|(i, mut line)| {
|
|
|
|
line = line.trim();
|
|
|
|
// Drop old closer.
|
|
|
|
if i == line_breaks && line.ends_with("*/") && !line.starts_with("//") {
|
2017-01-15 22:58:51 -06:00
|
|
|
line = &line[..(line.len() - 2)].trim_right();
|
2016-04-22 02:03:36 -05:00
|
|
|
}
|
|
|
|
|
2017-01-15 22:58:51 -06:00
|
|
|
line
|
2016-04-22 02:03:36 -05:00
|
|
|
})
|
2017-05-29 18:15:12 -05:00
|
|
|
.map(|s| left_trim_comment_line(s, &style))
|
2016-11-20 13:37:35 -06:00
|
|
|
.map(|line| if orig.starts_with("/*") && line_breaks == 0 {
|
2017-06-11 22:58:58 -05:00
|
|
|
line.trim_left()
|
|
|
|
} else {
|
|
|
|
line
|
|
|
|
});
|
2015-09-25 05:53:25 -05:00
|
|
|
|
|
|
|
let mut result = opener.to_owned();
|
|
|
|
for line in lines {
|
2015-12-07 22:04:40 -06:00
|
|
|
if result == opener {
|
2016-08-23 09:14:45 -05:00
|
|
|
if line.is_empty() {
|
2015-12-07 22:04:40 -06:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
} else {
|
2015-09-25 05:53:25 -05:00
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&indent_str);
|
|
|
|
result.push_str(line_start);
|
|
|
|
}
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
if config.wrap_comments() && line.len() > max_chars {
|
2016-04-11 13:45:47 -05:00
|
|
|
let rewrite = rewrite_string(line, &fmt).unwrap_or(line.to_owned());
|
2015-09-25 05:53:25 -05:00
|
|
|
result.push_str(&rewrite);
|
|
|
|
} else {
|
2017-05-29 18:15:12 -05:00
|
|
|
if line.is_empty() && result.ends_with(' ') {
|
2015-10-19 14:41:47 -05:00
|
|
|
// Remove space if this is an empty comment or a doc comment.
|
|
|
|
result.pop();
|
2015-09-25 05:53:25 -05:00
|
|
|
}
|
2015-10-19 14:41:47 -05:00
|
|
|
result.push_str(line);
|
2015-09-25 05:53:25 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
result.push_str(closer);
|
2017-05-29 18:15:12 -05:00
|
|
|
if result == opener && result.ends_with(' ') {
|
2015-12-07 22:04:40 -06:00
|
|
|
// Trailing space.
|
|
|
|
result.pop();
|
|
|
|
}
|
2015-09-25 05:53:25 -05:00
|
|
|
|
|
|
|
Some(result)
|
2015-06-23 08:58:58 -05:00
|
|
|
}
|
|
|
|
|
2017-08-27 10:10:46 -05:00
|
|
|
/// Given the span, rewrite the missing comment inside it if available.
|
|
|
|
/// Note that the given span must only include comments (or leading/trailing whitespaces).
|
|
|
|
pub fn rewrite_missing_comment(
|
|
|
|
span: Span,
|
|
|
|
shape: Shape,
|
|
|
|
context: &RewriteContext,
|
|
|
|
) -> Option<String> {
|
|
|
|
let missing_snippet = context.snippet(span);
|
|
|
|
let trimmed_snippet = missing_snippet.trim();
|
|
|
|
if !trimmed_snippet.is_empty() {
|
|
|
|
rewrite_comment(trimmed_snippet, false, shape, context.config)
|
|
|
|
} else {
|
|
|
|
Some(String::new())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Recover the missing comments in the specified span, if available.
|
|
|
|
/// The layout of the comments will be preserved as long as it does not break the code
|
|
|
|
/// and its total width does not exceed the max width.
|
|
|
|
pub fn recover_missing_comment_in_span(
|
|
|
|
span: Span,
|
|
|
|
shape: Shape,
|
|
|
|
context: &RewriteContext,
|
|
|
|
used_width: usize,
|
|
|
|
) -> Option<String> {
|
|
|
|
let missing_comment = try_opt!(rewrite_missing_comment(span, shape, context));
|
|
|
|
if missing_comment.is_empty() {
|
|
|
|
Some(String::new())
|
|
|
|
} else {
|
|
|
|
let missing_snippet = context.snippet(span);
|
|
|
|
let pos = missing_snippet.chars().position(|c| c == '/').unwrap_or(0);
|
|
|
|
// 1 = ` `
|
|
|
|
let total_width = missing_comment.len() + used_width + 1;
|
|
|
|
let force_new_line_before_comment =
|
|
|
|
missing_snippet[..pos].contains('\n') || total_width > context.config.max_width();
|
|
|
|
let sep = if force_new_line_before_comment {
|
|
|
|
format!("\n{}", shape.indent.to_string(context.config))
|
|
|
|
} else {
|
|
|
|
String::from(" ")
|
|
|
|
};
|
|
|
|
Some(format!("{}{}", sep, missing_comment))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-15 22:58:51 -06:00
|
|
|
/// Trims whitespace and aligns to indent, but otherwise does not change comments.
|
|
|
|
fn light_rewrite_comment(orig: &str, offset: Indent, config: &Config) -> Option<String> {
|
|
|
|
let lines: Vec<&str> = orig.lines()
|
|
|
|
.map(|l| {
|
|
|
|
// This is basically just l.trim(), but in the case that a line starts
|
|
|
|
// with `*` we want to leave one space before it, so it aligns with the
|
|
|
|
// `*` in `/*`.
|
|
|
|
let first_non_whitespace = l.find(|c| !char::is_whitespace(c));
|
|
|
|
if let Some(fnw) = first_non_whitespace {
|
2017-05-23 08:13:29 -05:00
|
|
|
if l.as_bytes()[fnw] == '*' as u8 && fnw > 0 {
|
|
|
|
&l[fnw - 1..]
|
2017-01-15 22:58:51 -06:00
|
|
|
} else {
|
2017-05-23 08:13:29 -05:00
|
|
|
&l[fnw..]
|
2017-01-15 22:58:51 -06:00
|
|
|
}
|
2017-05-23 08:13:29 -05:00
|
|
|
} else {
|
|
|
|
""
|
|
|
|
}.trim_right()
|
2017-01-15 22:58:51 -06:00
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
Some(lines.join(&format!("\n{}", offset.to_string(config))))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Trims comment characters and possibly a single space from the left of a string.
|
|
|
|
/// Does not trim all whitespace.
|
2017-05-29 18:15:12 -05:00
|
|
|
fn left_trim_comment_line<'a>(line: &'a str, style: &CommentStyle) -> &'a str {
|
2015-12-07 22:04:40 -06:00
|
|
|
if line.starts_with("//! ") || line.starts_with("/// ") || line.starts_with("/*! ") ||
|
2017-06-11 22:58:58 -05:00
|
|
|
line.starts_with("/** ")
|
|
|
|
{
|
2015-10-20 04:12:52 -05:00
|
|
|
&line[4..]
|
2017-05-29 18:15:12 -05:00
|
|
|
} else if let &CommentStyle::Custom(opener) = style {
|
|
|
|
if line.starts_with(opener) {
|
|
|
|
&line[opener.len()..]
|
2016-09-29 14:34:46 -05:00
|
|
|
} else {
|
2017-05-29 18:15:12 -05:00
|
|
|
&line[opener.trim_right().len()..]
|
2016-09-29 14:34:46 -05:00
|
|
|
}
|
2017-06-14 06:39:07 -05:00
|
|
|
} else if line.starts_with("/* ") || line.starts_with("// ") || line.starts_with("//!") ||
|
2017-07-26 03:43:17 -05:00
|
|
|
line.starts_with("///") || line.starts_with("** ") ||
|
|
|
|
line.starts_with("/*!") ||
|
2017-07-19 08:50:28 -05:00
|
|
|
(line.starts_with("/**") && !line.starts_with("/**/"))
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2015-06-23 08:58:58 -05:00
|
|
|
&line[3..]
|
2015-12-07 22:04:40 -06:00
|
|
|
} else if line.starts_with("/*") || line.starts_with("* ") || line.starts_with("//") ||
|
2017-07-19 08:50:28 -05:00
|
|
|
line.starts_with("**")
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2015-06-23 08:58:58 -05:00
|
|
|
&line[2..]
|
2016-08-23 09:14:45 -05:00
|
|
|
} else if line.starts_with('*') {
|
2015-06-23 08:58:58 -05:00
|
|
|
&line[1..]
|
|
|
|
} else {
|
|
|
|
line
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub trait FindUncommented {
|
|
|
|
fn find_uncommented(&self, pat: &str) -> Option<usize>;
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FindUncommented for str {
|
|
|
|
fn find_uncommented(&self, pat: &str) -> Option<usize> {
|
|
|
|
let mut needle_iter = pat.chars();
|
2015-08-27 07:07:15 -05:00
|
|
|
for (kind, (i, b)) in CharClasses::new(self.char_indices()) {
|
2015-06-23 08:58:58 -05:00
|
|
|
match needle_iter.next() {
|
2015-08-27 07:07:15 -05:00
|
|
|
None => {
|
|
|
|
return Some(i - pat.len());
|
|
|
|
}
|
2017-07-11 07:53:10 -05:00
|
|
|
Some(c) => match kind {
|
|
|
|
FullCodeCharKind::Normal if b == c => {}
|
|
|
|
_ => {
|
|
|
|
needle_iter = pat.chars();
|
2015-06-23 08:58:58 -05:00
|
|
|
}
|
2017-07-11 07:53:10 -05:00
|
|
|
},
|
2015-06-23 08:58:58 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Handle case where the pattern is a suffix of the search string
|
|
|
|
match needle_iter.next() {
|
|
|
|
Some(_) => None,
|
2015-08-15 22:58:17 -05:00
|
|
|
None => Some(self.len() - pat.len()),
|
2015-06-23 08:58:58 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns the first byte position after the first comment. The given string
|
|
|
|
// is expected to be prefixed by a comment, including delimiters.
|
|
|
|
// Good: "/* /* inner */ outer */ code();"
|
|
|
|
// Bad: "code(); // hello\n world!"
|
|
|
|
pub fn find_comment_end(s: &str) -> Option<usize> {
|
2015-08-27 07:07:15 -05:00
|
|
|
let mut iter = CharClasses::new(s.char_indices());
|
|
|
|
for (kind, (i, _c)) in &mut iter {
|
2016-01-10 08:12:15 -06:00
|
|
|
if kind == FullCodeCharKind::Normal {
|
2015-08-27 07:07:15 -05:00
|
|
|
return Some(i);
|
2015-06-23 08:58:58 -05:00
|
|
|
}
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
2015-06-23 08:58:58 -05:00
|
|
|
|
2015-08-27 07:07:15 -05:00
|
|
|
// Handle case where the comment ends at the end of s.
|
|
|
|
if iter.status == CharClassesStatus::Normal {
|
|
|
|
Some(s.len())
|
|
|
|
} else {
|
2015-06-23 08:58:58 -05:00
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-27 07:07:15 -05:00
|
|
|
/// Returns true if text contains any comment.
|
|
|
|
pub fn contains_comment(text: &str) -> bool {
|
2016-01-10 08:12:15 -06:00
|
|
|
CharClasses::new(text.chars()).any(|(kind, _)| kind.is_comment())
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
|
|
|
|
2015-10-19 14:41:47 -05:00
|
|
|
struct CharClasses<T>
|
2017-06-11 22:58:58 -05:00
|
|
|
where
|
|
|
|
T: Iterator,
|
|
|
|
T::Item: RichChar,
|
2015-08-27 07:07:15 -05:00
|
|
|
{
|
|
|
|
base: iter::Peekable<T>,
|
|
|
|
status: CharClassesStatus,
|
|
|
|
}
|
|
|
|
|
2015-10-19 14:41:47 -05:00
|
|
|
trait RichChar {
|
2015-08-27 07:07:15 -05:00
|
|
|
fn get_char(&self) -> char;
|
|
|
|
}
|
|
|
|
|
|
|
|
impl RichChar for char {
|
|
|
|
fn get_char(&self) -> char {
|
|
|
|
*self
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl RichChar for (usize, char) {
|
|
|
|
fn get_char(&self) -> char {
|
|
|
|
self.1
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(PartialEq, Eq, Debug, Clone, Copy)]
|
|
|
|
enum CharClassesStatus {
|
|
|
|
Normal,
|
|
|
|
LitString,
|
|
|
|
LitStringEscape,
|
|
|
|
LitChar,
|
|
|
|
LitCharEscape,
|
|
|
|
// The u32 is the nesting deepness of the comment
|
|
|
|
BlockComment(u32),
|
2015-10-19 14:40:00 -05:00
|
|
|
// Status when the '/' has been consumed, but not yet the '*', deepness is
|
|
|
|
// the new deepness (after the comment opening).
|
2015-08-27 07:07:15 -05:00
|
|
|
BlockCommentOpening(u32),
|
2015-10-19 14:40:00 -05:00
|
|
|
// Status when the '*' has been consumed, but not yet the '/', deepness is
|
|
|
|
// the new deepness (after the comment closing).
|
2015-08-27 07:07:15 -05:00
|
|
|
BlockCommentClosing(u32),
|
|
|
|
LineComment,
|
|
|
|
}
|
|
|
|
|
2016-11-02 23:22:16 -05:00
|
|
|
/// Distinguish between functional part of code and comments
|
2015-08-27 07:07:15 -05:00
|
|
|
#[derive(PartialEq, Eq, Debug, Clone, Copy)]
|
2015-10-19 14:40:00 -05:00
|
|
|
pub enum CodeCharKind {
|
2015-08-27 07:07:15 -05:00
|
|
|
Normal,
|
|
|
|
Comment,
|
|
|
|
}
|
|
|
|
|
2016-11-02 23:22:16 -05:00
|
|
|
/// Distinguish between functional part of code and comments,
|
2016-01-10 15:04:30 -06:00
|
|
|
/// describing opening and closing of comments for ease when chunking
|
|
|
|
/// code from tagged characters
|
2016-01-10 08:12:15 -06:00
|
|
|
#[derive(PartialEq, Eq, Debug, Clone, Copy)]
|
|
|
|
enum FullCodeCharKind {
|
|
|
|
Normal,
|
2016-01-10 15:04:30 -06:00
|
|
|
/// The first character of a comment, there is only one for a comment (always '/')
|
2016-01-10 08:12:15 -06:00
|
|
|
StartComment,
|
2016-01-10 15:04:30 -06:00
|
|
|
/// Any character inside a comment including the second character of comment
|
|
|
|
/// marks ("//", "/*")
|
2016-01-10 08:12:15 -06:00
|
|
|
InComment,
|
2016-01-10 15:04:30 -06:00
|
|
|
/// Last character of a comment, '\n' for a line comment, '/' for a block comment.
|
2016-01-10 08:12:15 -06:00
|
|
|
EndComment,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FullCodeCharKind {
|
|
|
|
fn is_comment(&self) -> bool {
|
|
|
|
match *self {
|
|
|
|
FullCodeCharKind::Normal => false,
|
|
|
|
FullCodeCharKind::StartComment |
|
|
|
|
FullCodeCharKind::InComment |
|
|
|
|
FullCodeCharKind::EndComment => true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn to_codecharkind(&self) -> CodeCharKind {
|
|
|
|
if self.is_comment() {
|
|
|
|
CodeCharKind::Comment
|
|
|
|
} else {
|
|
|
|
CodeCharKind::Normal
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-22 17:02:54 -06:00
|
|
|
impl<T> CharClasses<T>
|
2017-06-11 22:58:58 -05:00
|
|
|
where
|
|
|
|
T: Iterator,
|
|
|
|
T::Item: RichChar,
|
2015-11-22 17:02:54 -06:00
|
|
|
{
|
2015-10-19 14:41:47 -05:00
|
|
|
fn new(base: T) -> CharClasses<T> {
|
2015-09-26 01:29:48 -05:00
|
|
|
CharClasses {
|
|
|
|
base: base.peekable(),
|
|
|
|
status: CharClassesStatus::Normal,
|
|
|
|
}
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-22 17:02:54 -06:00
|
|
|
impl<T> Iterator for CharClasses<T>
|
2017-06-11 22:58:58 -05:00
|
|
|
where
|
|
|
|
T: Iterator,
|
|
|
|
T::Item: RichChar,
|
2015-11-22 17:02:54 -06:00
|
|
|
{
|
2016-01-10 08:12:15 -06:00
|
|
|
type Item = (FullCodeCharKind, T::Item);
|
2015-08-27 07:07:15 -05:00
|
|
|
|
2016-01-10 08:12:15 -06:00
|
|
|
fn next(&mut self) -> Option<(FullCodeCharKind, T::Item)> {
|
2015-08-27 07:07:15 -05:00
|
|
|
let item = try_opt!(self.base.next());
|
|
|
|
let chr = item.get_char();
|
|
|
|
self.status = match self.status {
|
2017-07-11 07:53:10 -05:00
|
|
|
CharClassesStatus::LitString => match chr {
|
|
|
|
'"' => CharClassesStatus::Normal,
|
|
|
|
'\\' => CharClassesStatus::LitStringEscape,
|
|
|
|
_ => CharClassesStatus::LitString,
|
|
|
|
},
|
2015-08-27 07:07:15 -05:00
|
|
|
CharClassesStatus::LitStringEscape => CharClassesStatus::LitString,
|
2017-07-11 07:53:10 -05:00
|
|
|
CharClassesStatus::LitChar => match chr {
|
|
|
|
'\\' => CharClassesStatus::LitCharEscape,
|
|
|
|
'\'' => CharClassesStatus::Normal,
|
|
|
|
_ => CharClassesStatus::LitChar,
|
|
|
|
},
|
2015-08-27 07:07:15 -05:00
|
|
|
CharClassesStatus::LitCharEscape => CharClassesStatus::LitChar,
|
2017-07-11 07:53:10 -05:00
|
|
|
CharClassesStatus::Normal => match chr {
|
|
|
|
'"' => CharClassesStatus::LitString,
|
|
|
|
'\'' => CharClassesStatus::LitChar,
|
|
|
|
'/' => match self.base.peek() {
|
|
|
|
Some(next) if next.get_char() == '*' => {
|
|
|
|
self.status = CharClassesStatus::BlockCommentOpening(1);
|
|
|
|
return Some((FullCodeCharKind::StartComment, item));
|
|
|
|
}
|
|
|
|
Some(next) if next.get_char() == '/' => {
|
|
|
|
self.status = CharClassesStatus::LineComment;
|
|
|
|
return Some((FullCodeCharKind::StartComment, item));
|
2015-11-20 14:05:10 -06:00
|
|
|
}
|
2015-08-27 07:07:15 -05:00
|
|
|
_ => CharClassesStatus::Normal,
|
2017-07-11 07:53:10 -05:00
|
|
|
},
|
|
|
|
_ => CharClassesStatus::Normal,
|
|
|
|
},
|
2015-08-27 07:07:15 -05:00
|
|
|
CharClassesStatus::BlockComment(deepness) => {
|
2016-01-10 08:12:15 -06:00
|
|
|
assert!(deepness != 0);
|
2015-08-27 07:07:15 -05:00
|
|
|
self.status = match self.base.peek() {
|
2015-11-20 14:05:10 -06:00
|
|
|
Some(next) if next.get_char() == '/' && chr == '*' => {
|
|
|
|
CharClassesStatus::BlockCommentClosing(deepness - 1)
|
|
|
|
}
|
|
|
|
Some(next) if next.get_char() == '*' && chr == '/' => {
|
|
|
|
CharClassesStatus::BlockCommentOpening(deepness + 1)
|
|
|
|
}
|
2015-08-27 07:07:15 -05:00
|
|
|
_ => CharClassesStatus::BlockComment(deepness),
|
|
|
|
};
|
2016-01-10 08:12:15 -06:00
|
|
|
return Some((FullCodeCharKind::InComment, item));
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
|
|
|
CharClassesStatus::BlockCommentOpening(deepness) => {
|
|
|
|
assert_eq!(chr, '*');
|
|
|
|
self.status = CharClassesStatus::BlockComment(deepness);
|
2016-01-10 08:12:15 -06:00
|
|
|
return Some((FullCodeCharKind::InComment, item));
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
|
|
|
CharClassesStatus::BlockCommentClosing(deepness) => {
|
|
|
|
assert_eq!(chr, '/');
|
2016-01-10 08:12:15 -06:00
|
|
|
if deepness == 0 {
|
|
|
|
self.status = CharClassesStatus::Normal;
|
|
|
|
return Some((FullCodeCharKind::EndComment, item));
|
2015-08-27 07:07:15 -05:00
|
|
|
} else {
|
2016-01-10 08:12:15 -06:00
|
|
|
self.status = CharClassesStatus::BlockComment(deepness);
|
|
|
|
return Some((FullCodeCharKind::InComment, item));
|
|
|
|
}
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
2017-07-11 07:53:10 -05:00
|
|
|
CharClassesStatus::LineComment => match chr {
|
|
|
|
'\n' => {
|
|
|
|
self.status = CharClassesStatus::Normal;
|
|
|
|
return Some((FullCodeCharKind::EndComment, item));
|
2016-01-10 08:12:15 -06:00
|
|
|
}
|
2017-07-11 07:53:10 -05:00
|
|
|
_ => {
|
|
|
|
self.status = CharClassesStatus::LineComment;
|
|
|
|
return Some((FullCodeCharKind::InComment, item));
|
|
|
|
}
|
|
|
|
},
|
2016-01-10 08:12:15 -06:00
|
|
|
};
|
|
|
|
Some((FullCodeCharKind::Normal, item))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Iterator over functional and commented parts of a string. Any part of a string is either
|
|
|
|
/// functional code, either *one* block comment, either *one* line comment. Whitespace between
|
|
|
|
/// comments is functional code. Line comments contain their ending newlines.
|
|
|
|
struct UngroupedCommentCodeSlices<'a> {
|
|
|
|
slice: &'a str,
|
|
|
|
iter: iter::Peekable<CharClasses<std::str::CharIndices<'a>>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> UngroupedCommentCodeSlices<'a> {
|
|
|
|
fn new(code: &'a str) -> UngroupedCommentCodeSlices<'a> {
|
|
|
|
UngroupedCommentCodeSlices {
|
|
|
|
slice: code,
|
|
|
|
iter: CharClasses::new(code.char_indices()).peekable(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Iterator for UngroupedCommentCodeSlices<'a> {
|
|
|
|
type Item = (CodeCharKind, usize, &'a str);
|
|
|
|
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
|
|
let (kind, (start_idx, _)) = try_opt!(self.iter.next());
|
|
|
|
match kind {
|
|
|
|
FullCodeCharKind::Normal => {
|
|
|
|
// Consume all the Normal code
|
|
|
|
while let Some(&(FullCodeCharKind::Normal, (_, _))) = self.iter.peek() {
|
|
|
|
let _ = self.iter.next();
|
|
|
|
}
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
2016-01-10 08:12:15 -06:00
|
|
|
FullCodeCharKind::StartComment => {
|
|
|
|
// Consume the whole comment
|
|
|
|
while let Some((FullCodeCharKind::InComment, (_, _))) = self.iter.next() {}
|
|
|
|
}
|
|
|
|
_ => panic!(),
|
|
|
|
}
|
|
|
|
let slice = match self.iter.peek() {
|
|
|
|
Some(&(_, (end_idx, _))) => &self.slice[start_idx..end_idx],
|
|
|
|
None => &self.slice[start_idx..],
|
2015-08-27 07:07:15 -05:00
|
|
|
};
|
2017-06-11 22:58:58 -05:00
|
|
|
Some((
|
|
|
|
if kind.is_comment() {
|
|
|
|
CodeCharKind::Comment
|
|
|
|
} else {
|
|
|
|
CodeCharKind::Normal
|
|
|
|
},
|
|
|
|
start_idx,
|
|
|
|
slice,
|
|
|
|
))
|
2015-08-27 07:07:15 -05:00
|
|
|
}
|
|
|
|
}
|
2015-08-31 22:39:37 -05:00
|
|
|
|
2016-01-10 08:12:15 -06:00
|
|
|
|
|
|
|
|
|
|
|
|
2015-10-19 14:41:47 -05:00
|
|
|
/// Iterator over an alternating sequence of functional and commented parts of
|
|
|
|
/// a string. The first item is always a, possibly zero length, subslice of
|
|
|
|
/// functional text. Line style comments contain their ending newlines.
|
2015-10-19 14:41:18 -05:00
|
|
|
pub struct CommentCodeSlices<'a> {
|
2015-10-19 14:40:00 -05:00
|
|
|
slice: &'a str,
|
2015-10-19 14:41:47 -05:00
|
|
|
last_slice_kind: CodeCharKind,
|
2015-10-19 14:40:00 -05:00
|
|
|
last_slice_end: usize,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CommentCodeSlices<'a> {
|
2015-10-19 14:41:18 -05:00
|
|
|
pub fn new(slice: &'a str) -> CommentCodeSlices<'a> {
|
2015-10-19 14:40:00 -05:00
|
|
|
CommentCodeSlices {
|
|
|
|
slice: slice,
|
2015-10-19 14:41:47 -05:00
|
|
|
last_slice_kind: CodeCharKind::Comment,
|
2015-10-19 14:40:00 -05:00
|
|
|
last_slice_end: 0,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Iterator for CommentCodeSlices<'a> {
|
2015-10-19 14:41:18 -05:00
|
|
|
type Item = (CodeCharKind, usize, &'a str);
|
2015-10-19 14:40:00 -05:00
|
|
|
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
|
|
if self.last_slice_end == self.slice.len() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let mut sub_slice_end = self.last_slice_end;
|
2015-10-19 14:41:47 -05:00
|
|
|
let mut first_whitespace = None;
|
|
|
|
let subslice = &self.slice[self.last_slice_end..];
|
|
|
|
let mut iter = CharClasses::new(subslice.char_indices());
|
|
|
|
|
|
|
|
for (kind, (i, c)) in &mut iter {
|
|
|
|
let is_comment_connector = self.last_slice_kind == CodeCharKind::Normal &&
|
2017-06-11 22:58:58 -05:00
|
|
|
&subslice[..2] == "//" &&
|
|
|
|
[' ', '\t'].contains(&c);
|
2015-10-19 14:41:47 -05:00
|
|
|
|
|
|
|
if is_comment_connector && first_whitespace.is_none() {
|
|
|
|
first_whitespace = Some(i);
|
|
|
|
}
|
|
|
|
|
2016-01-10 08:12:15 -06:00
|
|
|
if kind.to_codecharkind() == self.last_slice_kind && !is_comment_connector {
|
2015-10-19 14:41:47 -05:00
|
|
|
let last_index = match first_whitespace {
|
|
|
|
Some(j) => j,
|
|
|
|
None => i,
|
|
|
|
};
|
|
|
|
sub_slice_end = self.last_slice_end + last_index;
|
2015-10-19 14:40:00 -05:00
|
|
|
break;
|
|
|
|
}
|
2015-10-19 14:41:47 -05:00
|
|
|
|
|
|
|
if !is_comment_connector {
|
|
|
|
first_whitespace = None;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if let (None, true) = (iter.next(), sub_slice_end == self.last_slice_end) {
|
|
|
|
// This was the last subslice.
|
|
|
|
sub_slice_end = match first_whitespace {
|
|
|
|
Some(i) => self.last_slice_end + i,
|
|
|
|
None => self.slice.len(),
|
|
|
|
};
|
2015-10-19 14:40:00 -05:00
|
|
|
}
|
|
|
|
|
2015-10-19 14:41:47 -05:00
|
|
|
let kind = match self.last_slice_kind {
|
2015-10-19 14:40:00 -05:00
|
|
|
CodeCharKind::Comment => CodeCharKind::Normal,
|
|
|
|
CodeCharKind::Normal => CodeCharKind::Comment,
|
|
|
|
};
|
2017-06-11 22:58:58 -05:00
|
|
|
let res = (
|
|
|
|
kind,
|
|
|
|
self.last_slice_end,
|
|
|
|
&self.slice[self.last_slice_end..sub_slice_end],
|
|
|
|
);
|
2015-10-19 14:41:47 -05:00
|
|
|
self.last_slice_end = sub_slice_end;
|
|
|
|
self.last_slice_kind = kind;
|
2015-10-19 14:40:00 -05:00
|
|
|
|
2015-10-19 14:41:47 -05:00
|
|
|
Some(res)
|
2015-10-19 14:40:00 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-01-10 08:12:15 -06:00
|
|
|
/// Checks is `new` didn't miss any comment from `span`, if it removed any, return previous text
|
|
|
|
/// (if it fits in the width/offset, else return None), else return `new`
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn recover_comment_removed(
|
|
|
|
new: String,
|
|
|
|
span: Span,
|
|
|
|
context: &RewriteContext,
|
|
|
|
shape: Shape,
|
|
|
|
) -> Option<String> {
|
2016-01-10 08:12:15 -06:00
|
|
|
let snippet = context.snippet(span);
|
|
|
|
if changed_comment_content(&snippet, &new) {
|
|
|
|
// We missed some comments
|
|
|
|
// Keep previous formatting if it satisfies the constrains
|
2017-05-16 03:47:09 -05:00
|
|
|
wrap_str(snippet, context.config.max_width(), shape)
|
2016-01-10 08:12:15 -06:00
|
|
|
} else {
|
|
|
|
Some(new)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Return true if the two strings of code have the same payload of comments.
|
|
|
|
/// The payload of comments is everything in the string except:
|
2016-05-02 03:54:25 -05:00
|
|
|
/// - actual code (not comments)
|
|
|
|
/// - comment start/end marks
|
|
|
|
/// - whitespace
|
|
|
|
/// - '*' at the beginning of lines in block comments
|
2016-01-10 08:12:15 -06:00
|
|
|
fn changed_comment_content(orig: &str, new: &str) -> bool {
|
|
|
|
// Cannot write this as a fn since we cannot return types containing closures
|
|
|
|
let code_comment_content = |code| {
|
|
|
|
let slices = UngroupedCommentCodeSlices::new(code);
|
2017-03-27 17:14:47 -05:00
|
|
|
slices
|
|
|
|
.filter(|&(ref kind, _, _)| *kind == CodeCharKind::Comment)
|
|
|
|
.flat_map(|(_, _, s)| CommentReducer::new(s))
|
2016-01-10 08:12:15 -06:00
|
|
|
};
|
|
|
|
let res = code_comment_content(orig).ne(code_comment_content(new));
|
2017-06-11 22:58:58 -05:00
|
|
|
debug!(
|
|
|
|
"comment::changed_comment_content: {}\norig: '{}'\nnew: '{}'\nraw_old: {}\nraw_new: {}",
|
|
|
|
res,
|
|
|
|
orig,
|
|
|
|
new,
|
|
|
|
code_comment_content(orig).collect::<String>(),
|
|
|
|
code_comment_content(new).collect::<String>()
|
|
|
|
);
|
2016-01-10 08:12:15 -06:00
|
|
|
res
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/// Iterator over the 'payload' characters of a comment.
|
|
|
|
/// It skips whitespace, comment start/end marks, and '*' at the beginning of lines.
|
|
|
|
/// The comment must be one comment, ie not more than one start mark (no multiple line comments,
|
|
|
|
/// for example).
|
|
|
|
struct CommentReducer<'a> {
|
|
|
|
is_block: bool,
|
|
|
|
at_start_line: bool,
|
|
|
|
iter: std::str::Chars<'a>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CommentReducer<'a> {
|
|
|
|
fn new(comment: &'a str) -> CommentReducer<'a> {
|
|
|
|
let is_block = comment.starts_with("/*");
|
|
|
|
let comment = remove_comment_header(comment);
|
|
|
|
CommentReducer {
|
|
|
|
is_block: is_block,
|
|
|
|
at_start_line: false, // There are no supplementary '*' on the first line
|
|
|
|
iter: comment.chars(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Iterator for CommentReducer<'a> {
|
|
|
|
type Item = char;
|
|
|
|
fn next(&mut self) -> Option<Self::Item> {
|
|
|
|
loop {
|
|
|
|
let mut c = try_opt!(self.iter.next());
|
|
|
|
if self.is_block && self.at_start_line {
|
|
|
|
while c.is_whitespace() {
|
|
|
|
c = try_opt!(self.iter.next());
|
|
|
|
}
|
|
|
|
// Ignore leading '*'
|
|
|
|
if c == '*' {
|
|
|
|
c = try_opt!(self.iter.next());
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if c == '\n' {
|
|
|
|
self.at_start_line = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if !c.is_whitespace() {
|
|
|
|
return Some(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn remove_comment_header(comment: &str) -> &str {
|
|
|
|
if comment.starts_with("///") || comment.starts_with("//!") {
|
|
|
|
&comment[3..]
|
|
|
|
} else if comment.starts_with("//") {
|
|
|
|
&comment[2..]
|
2016-07-09 08:41:28 -05:00
|
|
|
} else if (comment.starts_with("/**") && !comment.starts_with("/**/")) ||
|
2017-07-19 08:50:28 -05:00
|
|
|
comment.starts_with("/*!")
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2016-01-10 08:12:15 -06:00
|
|
|
&comment[3..comment.len() - 2]
|
|
|
|
} else {
|
2017-06-11 22:58:58 -05:00
|
|
|
assert!(
|
|
|
|
comment.starts_with("/*"),
|
|
|
|
format!("string '{}' is not a comment", comment)
|
|
|
|
);
|
2016-01-10 08:12:15 -06:00
|
|
|
&comment[2..comment.len() - 2]
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-31 22:39:37 -05:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
2017-07-13 04:42:14 -05:00
|
|
|
use super::{contains_comment, rewrite_comment, CharClasses, CodeCharKind, CommentCodeSlices,
|
|
|
|
FindUncommented, FullCodeCharKind};
|
2017-01-30 13:28:48 -06:00
|
|
|
use {Indent, Shape};
|
2015-09-25 05:53:25 -05:00
|
|
|
|
2015-10-19 14:41:47 -05:00
|
|
|
#[test]
|
|
|
|
fn char_classes() {
|
|
|
|
let mut iter = CharClasses::new("//\n\n".chars());
|
|
|
|
|
2016-01-10 08:12:15 -06:00
|
|
|
assert_eq!((FullCodeCharKind::StartComment, '/'), iter.next().unwrap());
|
|
|
|
assert_eq!((FullCodeCharKind::InComment, '/'), iter.next().unwrap());
|
|
|
|
assert_eq!((FullCodeCharKind::EndComment, '\n'), iter.next().unwrap());
|
|
|
|
assert_eq!((FullCodeCharKind::Normal, '\n'), iter.next().unwrap());
|
2015-10-19 14:41:47 -05:00
|
|
|
assert_eq!(None, iter.next());
|
|
|
|
}
|
|
|
|
|
2015-10-19 14:40:00 -05:00
|
|
|
#[test]
|
|
|
|
fn comment_code_slices() {
|
|
|
|
let input = "code(); /* test */ 1 + 1";
|
|
|
|
let mut iter = CommentCodeSlices::new(input);
|
|
|
|
|
2015-10-19 14:41:18 -05:00
|
|
|
assert_eq!((CodeCharKind::Normal, 0, "code(); "), iter.next().unwrap());
|
2017-06-11 22:58:58 -05:00
|
|
|
assert_eq!(
|
|
|
|
(CodeCharKind::Comment, 8, "/* test */"),
|
|
|
|
iter.next().unwrap()
|
|
|
|
);
|
2015-10-19 14:41:18 -05:00
|
|
|
assert_eq!((CodeCharKind::Normal, 18, " 1 + 1"), iter.next().unwrap());
|
2015-10-19 14:40:00 -05:00
|
|
|
assert_eq!(None, iter.next());
|
|
|
|
}
|
|
|
|
|
2015-10-19 14:41:47 -05:00
|
|
|
#[test]
|
|
|
|
fn comment_code_slices_two() {
|
|
|
|
let input = "// comment\n test();";
|
|
|
|
let mut iter = CommentCodeSlices::new(input);
|
|
|
|
|
|
|
|
assert_eq!((CodeCharKind::Normal, 0, ""), iter.next().unwrap());
|
2017-06-11 22:58:58 -05:00
|
|
|
assert_eq!(
|
|
|
|
(CodeCharKind::Comment, 0, "// comment\n"),
|
|
|
|
iter.next().unwrap()
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
(CodeCharKind::Normal, 11, " test();"),
|
|
|
|
iter.next().unwrap()
|
|
|
|
);
|
2015-10-19 14:41:47 -05:00
|
|
|
assert_eq!(None, iter.next());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn comment_code_slices_three() {
|
|
|
|
let input = "1 // comment\n // comment2\n\n";
|
|
|
|
let mut iter = CommentCodeSlices::new(input);
|
|
|
|
|
|
|
|
assert_eq!((CodeCharKind::Normal, 0, "1 "), iter.next().unwrap());
|
2017-06-11 22:58:58 -05:00
|
|
|
assert_eq!(
|
|
|
|
(CodeCharKind::Comment, 2, "// comment\n // comment2\n"),
|
|
|
|
iter.next().unwrap()
|
|
|
|
);
|
2015-10-19 14:41:47 -05:00
|
|
|
assert_eq!((CodeCharKind::Normal, 29, "\n"), iter.next().unwrap());
|
|
|
|
assert_eq!(None, iter.next());
|
|
|
|
}
|
|
|
|
|
2015-08-31 22:39:37 -05:00
|
|
|
#[test]
|
2015-10-22 16:35:42 -05:00
|
|
|
#[cfg_attr(rustfmt, rustfmt_skip)]
|
2015-08-31 22:39:37 -05:00
|
|
|
fn format_comments() {
|
2015-11-09 13:03:01 -06:00
|
|
|
let mut config: ::config::Config = Default::default();
|
2017-05-17 23:37:29 -05:00
|
|
|
config.set().wrap_comments(true);
|
|
|
|
config.set().normalize_comments(true);
|
2016-04-11 13:45:47 -05:00
|
|
|
|
2017-01-30 13:28:48 -06:00
|
|
|
let comment = rewrite_comment(" //test",
|
|
|
|
true,
|
|
|
|
Shape::legacy(100, Indent::new(0, 100)),
|
|
|
|
&config).unwrap();
|
2016-04-11 13:45:47 -05:00
|
|
|
assert_eq!("/* test */", comment);
|
|
|
|
|
|
|
|
let comment = rewrite_comment("// comment on a",
|
|
|
|
false,
|
2017-01-30 13:28:48 -06:00
|
|
|
Shape::legacy(10, Indent::empty()),
|
2016-04-11 13:45:47 -05:00
|
|
|
&config).unwrap();
|
|
|
|
assert_eq!("// comment\n// on a", comment);
|
|
|
|
|
|
|
|
let comment = rewrite_comment("// A multi line comment\n // between args.",
|
|
|
|
false,
|
2017-01-30 13:28:48 -06:00
|
|
|
Shape::legacy(60, Indent::new(0, 12)),
|
2016-04-11 13:45:47 -05:00
|
|
|
&config).unwrap();
|
|
|
|
assert_eq!("// A multi line comment\n // between args.", comment);
|
2015-08-31 22:39:37 -05:00
|
|
|
|
|
|
|
let input = "// comment";
|
2015-09-17 13:21:06 -05:00
|
|
|
let expected =
|
2016-04-11 13:45:47 -05:00
|
|
|
"/* comment */";
|
2017-01-30 13:28:48 -06:00
|
|
|
let comment = rewrite_comment(input,
|
|
|
|
true,
|
|
|
|
Shape::legacy(9, Indent::new(0, 69)),
|
|
|
|
&config).unwrap();
|
2016-04-11 13:45:47 -05:00
|
|
|
assert_eq!(expected, comment);
|
|
|
|
|
|
|
|
let comment = rewrite_comment("/* trimmed */",
|
|
|
|
true,
|
2017-01-30 13:28:48 -06:00
|
|
|
Shape::legacy(100, Indent::new(0, 100)),
|
2016-04-11 13:45:47 -05:00
|
|
|
&config).unwrap();
|
|
|
|
assert_eq!("/* trimmed */", comment);
|
2015-08-31 22:39:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// This is probably intended to be a non-test fn, but it is not used. I'm
|
|
|
|
// keeping it around unless it helps us test stuff.
|
|
|
|
fn uncommented(text: &str) -> String {
|
2015-09-09 16:14:09 -05:00
|
|
|
CharClasses::new(text.chars())
|
2016-11-20 13:37:35 -06:00
|
|
|
.filter_map(|(s, c)| match s {
|
2017-06-11 22:58:58 -05:00
|
|
|
FullCodeCharKind::Normal => Some(c),
|
|
|
|
_ => None,
|
|
|
|
})
|
2015-09-09 16:14:09 -05:00
|
|
|
.collect()
|
2015-08-31 22:39:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_uncommented() {
|
|
|
|
assert_eq!(&uncommented("abc/*...*/"), "abc");
|
2017-06-11 22:58:58 -05:00
|
|
|
assert_eq!(
|
|
|
|
&uncommented("// .... /* \n../* /* *** / */ */a/* // */c\n"),
|
|
|
|
"..ac\n"
|
|
|
|
);
|
2015-10-06 15:13:14 -05:00
|
|
|
assert_eq!(&uncommented("abc \" /* */\" qsdf"), "abc \" /* */\" qsdf");
|
2015-08-31 22:39:37 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_contains_comment() {
|
|
|
|
assert_eq!(contains_comment("abc"), false);
|
|
|
|
assert_eq!(contains_comment("abc // qsdf"), true);
|
|
|
|
assert_eq!(contains_comment("abc /* kqsdf"), true);
|
|
|
|
assert_eq!(contains_comment("abc \" /* */\" qsdf"), false);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_find_uncommented() {
|
|
|
|
fn check(haystack: &str, needle: &str, expected: Option<usize>) {
|
|
|
|
assert_eq!(expected, haystack.find_uncommented(needle));
|
|
|
|
}
|
|
|
|
|
|
|
|
check("/*/ */test", "test", Some(6));
|
|
|
|
check("//test\ntest", "test", Some(7));
|
|
|
|
check("/* comment only */", "whatever", None);
|
2017-06-11 22:58:58 -05:00
|
|
|
check(
|
|
|
|
"/* comment */ some text /* more commentary */ result",
|
|
|
|
"result",
|
|
|
|
Some(46),
|
|
|
|
);
|
2015-08-31 22:39:37 -05:00
|
|
|
check("sup // sup", "p", Some(2));
|
|
|
|
check("sup", "x", None);
|
2015-09-01 13:42:07 -05:00
|
|
|
check(r#"π? /**/ π is nice!"#, r#"π is nice"#, Some(9));
|
2015-08-31 22:39:37 -05:00
|
|
|
check("/*sup yo? \n sup*/ sup", "p", Some(20));
|
|
|
|
check("hel/*lohello*/lo", "hello", None);
|
|
|
|
check("acb", "ab", None);
|
|
|
|
check(",/*A*/ ", ",", Some(0));
|
|
|
|
check("abc", "abc", Some(0));
|
|
|
|
check("/* abc */", "abc", None);
|
|
|
|
check("/**/abc/* */", "abc", Some(4));
|
|
|
|
check("\"/* abc */\"", "abc", Some(4));
|
|
|
|
check("\"/* abc", "abc", Some(4));
|
|
|
|
}
|
|
|
|
}
|