2015-03-07 16:46:35 -06: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.
|
|
|
|
|
2015-03-08 23:18:48 -05:00
|
|
|
// TODO we're going to allocate a whole bunch of temp Strings, is it worth
|
|
|
|
// keeping some scratch mem for this and running our own StrPool?
|
2015-04-13 20:00:46 -05:00
|
|
|
// TODO for lint violations of names, emit a refactor script
|
|
|
|
|
2015-03-07 16:46:35 -06:00
|
|
|
#[macro_use]
|
|
|
|
extern crate log;
|
|
|
|
|
2017-05-03 03:23:50 -05:00
|
|
|
extern crate serde;
|
|
|
|
#[macro_use]
|
|
|
|
extern crate serde_derive;
|
|
|
|
extern crate serde_json;
|
|
|
|
|
2015-10-22 16:37:13 -05:00
|
|
|
extern crate syntex_syntax as syntax;
|
2016-09-15 22:19:18 -05:00
|
|
|
extern crate syntex_errors as errors;
|
2015-03-07 16:46:35 -06:00
|
|
|
|
2015-04-13 20:12:56 -05:00
|
|
|
extern crate strings;
|
|
|
|
|
2015-09-03 22:38:12 -05:00
|
|
|
extern crate unicode_segmentation;
|
|
|
|
extern crate regex;
|
2015-09-10 17:27:22 -05:00
|
|
|
extern crate diff;
|
|
|
|
extern crate term;
|
2015-09-03 22:38:12 -05:00
|
|
|
|
2016-09-15 22:19:18 -05:00
|
|
|
use errors::{Handler, DiagnosticBuilder};
|
|
|
|
use errors::emitter::{ColorConfig, EmitterWriter};
|
2015-04-21 04:01:19 -05:00
|
|
|
use syntax::ast;
|
2017-06-05 23:54:22 -05:00
|
|
|
use syntax::codemap::{CodeMap, Span, FilePathMapping};
|
2015-10-22 16:37:13 -05:00
|
|
|
use syntax::parse::{self, ParseSess};
|
2015-03-07 16:46:35 -06:00
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
use strings::string_buffer::StringBuffer;
|
|
|
|
|
|
|
|
use std::io::{self, stdout, Write};
|
2015-09-06 00:39:28 -05:00
|
|
|
use std::ops::{Add, Sub};
|
2016-04-02 13:56:37 -05:00
|
|
|
use std::path::{Path, PathBuf};
|
2016-03-01 16:27:19 -06:00
|
|
|
use std::rc::Rc;
|
2015-04-22 23:22:48 -05:00
|
|
|
use std::collections::HashMap;
|
2015-06-08 18:42:29 -05:00
|
|
|
use std::fmt;
|
2015-03-07 16:46:35 -06:00
|
|
|
|
2015-06-08 18:42:29 -05:00
|
|
|
use issues::{BadIssueSeeker, Issue};
|
2015-08-01 08:02:59 -05:00
|
|
|
use filemap::FileMap;
|
2015-04-21 04:01:19 -05:00
|
|
|
use visitor::FmtVisitor;
|
2016-04-14 18:51:50 -05:00
|
|
|
use config::Config;
|
2016-05-15 04:41:05 -05:00
|
|
|
use checkstyle::{output_header, output_footer};
|
2016-04-14 18:51:50 -05:00
|
|
|
|
|
|
|
pub use self::summary::Summary;
|
2015-03-07 16:46:35 -06:00
|
|
|
|
2015-06-08 13:23:24 -05:00
|
|
|
#[macro_use]
|
|
|
|
mod utils;
|
2015-07-20 16:29:25 -05:00
|
|
|
pub mod config;
|
2016-05-25 13:41:26 -05:00
|
|
|
pub mod codemap;
|
2015-09-17 13:21:06 -05:00
|
|
|
pub mod filemap;
|
2016-05-26 07:17:20 -05:00
|
|
|
pub mod file_lines;
|
2016-05-05 19:20:38 -05:00
|
|
|
pub mod visitor;
|
2016-01-12 23:22:30 -06:00
|
|
|
mod checkstyle;
|
2015-05-24 18:03:26 -05:00
|
|
|
mod items;
|
2015-04-20 23:47:15 -05:00
|
|
|
mod missed_spans;
|
|
|
|
mod lists;
|
2015-04-21 04:01:19 -05:00
|
|
|
mod types;
|
|
|
|
mod expr;
|
|
|
|
mod imports;
|
2015-06-08 18:42:29 -05:00
|
|
|
mod issues;
|
2015-06-16 10:29:05 -05:00
|
|
|
mod rewrite;
|
2015-06-23 08:58:58 -05:00
|
|
|
mod string;
|
|
|
|
mod comment;
|
2016-05-05 19:20:38 -05:00
|
|
|
pub mod modules;
|
2015-09-10 17:27:22 -05:00
|
|
|
pub mod rustfmt_diff;
|
2015-09-10 17:52:16 -05:00
|
|
|
mod chains;
|
2015-09-14 15:53:30 -05:00
|
|
|
mod macros;
|
2015-10-17 08:56:53 -05:00
|
|
|
mod patterns;
|
2016-04-14 18:51:50 -05:00
|
|
|
mod summary;
|
2015-03-07 16:46:35 -06:00
|
|
|
|
|
|
|
const MIN_STRING: usize = 10;
|
2015-04-22 23:22:48 -05:00
|
|
|
// When we get scoped annotations, we should have rustfmt::skip.
|
|
|
|
const SKIP_ANNOTATION: &'static str = "rustfmt_skip";
|
2015-04-20 19:02:30 -05:00
|
|
|
|
2015-10-17 08:56:53 -05:00
|
|
|
pub trait Spanned {
|
|
|
|
fn span(&self) -> Span;
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Spanned for ast::Expr {
|
|
|
|
fn span(&self) -> Span {
|
|
|
|
self.span
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Spanned for ast::Pat {
|
|
|
|
fn span(&self) -> Span {
|
|
|
|
self.span
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Spanned for ast::Ty {
|
|
|
|
fn span(&self) -> Span {
|
|
|
|
self.span
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-05 18:11:26 -06:00
|
|
|
impl Spanned for ast::Arg {
|
|
|
|
fn span(&self) -> Span {
|
|
|
|
if items::is_named_arg(self) {
|
2017-06-05 23:54:22 -05:00
|
|
|
utils::mk_sp(self.pat.span.lo, self.ty.span.hi)
|
2015-12-05 18:11:26 -06:00
|
|
|
} else {
|
|
|
|
self.ty.span
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-06 00:39:28 -05:00
|
|
|
#[derive(Copy, Clone, Debug)]
|
|
|
|
pub struct Indent {
|
2015-09-18 23:50:44 -05:00
|
|
|
// Width of the block indent, in characters. Must be a multiple of
|
|
|
|
// Config::tab_spaces.
|
2015-09-26 16:16:11 -05:00
|
|
|
pub block_indent: usize,
|
2015-09-18 23:50:44 -05:00
|
|
|
// Alignment in characters.
|
2015-09-26 16:16:11 -05:00
|
|
|
pub alignment: usize,
|
2015-09-06 00:39:28 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Indent {
|
|
|
|
pub fn new(block_indent: usize, alignment: usize) -> Indent {
|
2015-09-26 01:29:48 -05:00
|
|
|
Indent {
|
|
|
|
block_indent: block_indent,
|
|
|
|
alignment: alignment,
|
|
|
|
}
|
2015-09-06 00:39:28 -05:00
|
|
|
}
|
|
|
|
|
2015-09-18 23:50:44 -05:00
|
|
|
pub fn empty() -> Indent {
|
|
|
|
Indent::new(0, 0)
|
|
|
|
}
|
|
|
|
|
2017-02-20 19:43:43 -06:00
|
|
|
pub fn block_only(&self) -> Indent {
|
|
|
|
Indent {
|
|
|
|
block_indent: self.block_indent,
|
|
|
|
alignment: 0,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-18 23:50:44 -05:00
|
|
|
pub fn block_indent(mut self, config: &Config) -> Indent {
|
2017-05-16 03:47:09 -05:00
|
|
|
self.block_indent += config.tab_spaces();
|
2015-09-06 00:39:28 -05:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2015-09-18 23:50:44 -05:00
|
|
|
pub fn block_unindent(mut self, config: &Config) -> Indent {
|
2017-05-16 03:47:09 -05:00
|
|
|
self.block_indent -= config.tab_spaces();
|
2015-09-06 00:39:28 -05:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn width(&self) -> usize {
|
|
|
|
self.block_indent + self.alignment
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn to_string(&self, config: &Config) -> String {
|
2017-05-16 03:47:09 -05:00
|
|
|
let (num_tabs, num_spaces) = if config.hard_tabs() {
|
|
|
|
(self.block_indent / config.tab_spaces(), self.alignment)
|
2015-09-06 00:39:28 -05:00
|
|
|
} else {
|
2017-04-19 09:33:03 -05:00
|
|
|
(0, self.width())
|
2015-09-06 00:39:28 -05:00
|
|
|
};
|
|
|
|
let num_chars = num_tabs + num_spaces;
|
|
|
|
let mut indent = String::with_capacity(num_chars);
|
|
|
|
for _ in 0..num_tabs {
|
|
|
|
indent.push('\t')
|
|
|
|
}
|
|
|
|
for _ in 0..num_spaces {
|
|
|
|
indent.push(' ')
|
|
|
|
}
|
|
|
|
indent
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Add for Indent {
|
|
|
|
type Output = Indent;
|
|
|
|
|
|
|
|
fn add(self, rhs: Indent) -> Indent {
|
|
|
|
Indent {
|
|
|
|
block_indent: self.block_indent + rhs.block_indent,
|
|
|
|
alignment: self.alignment + rhs.alignment,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Sub for Indent {
|
|
|
|
type Output = Indent;
|
|
|
|
|
|
|
|
fn sub(self, rhs: Indent) -> Indent {
|
2015-09-23 18:01:01 -05:00
|
|
|
Indent::new(self.block_indent - rhs.block_indent,
|
|
|
|
self.alignment - rhs.alignment)
|
2015-09-06 00:39:28 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Add<usize> for Indent {
|
|
|
|
type Output = Indent;
|
|
|
|
|
|
|
|
fn add(self, rhs: usize) -> Indent {
|
2015-09-18 23:50:44 -05:00
|
|
|
Indent::new(self.block_indent, self.alignment + rhs)
|
2015-09-06 00:39:28 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-10-24 05:19:58 -05:00
|
|
|
impl Sub<usize> for Indent {
|
|
|
|
type Output = Indent;
|
|
|
|
|
|
|
|
fn sub(self, rhs: usize) -> Indent {
|
|
|
|
Indent::new(self.block_indent, self.alignment - rhs)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-30 13:28:48 -06:00
|
|
|
#[derive(Copy, Clone, Debug)]
|
|
|
|
pub struct Shape {
|
|
|
|
pub width: usize,
|
2017-02-20 19:43:43 -06:00
|
|
|
// The current indentation of code.
|
2017-01-30 13:28:48 -06:00
|
|
|
pub indent: Indent,
|
2017-02-20 19:43:43 -06:00
|
|
|
// Indentation + any already emitted text on the first line of the current
|
|
|
|
// statement.
|
|
|
|
pub offset: usize,
|
2017-01-30 13:28:48 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Shape {
|
|
|
|
/// `indent` is the indentation of the first line. The next lines
|
|
|
|
/// should begin with at least `indent` spaces (except backwards
|
|
|
|
/// indentation). The first line should not begin with indentation.
|
|
|
|
/// `width` is the maximum number of characters on the last line
|
|
|
|
/// (excluding `indent`). The width of other lines is not limited by
|
|
|
|
/// `width`.
|
|
|
|
/// Note that in reality, we sometimes use width for lines other than the
|
|
|
|
/// last (i.e., we are conservative).
|
|
|
|
// .......*-------*
|
|
|
|
// | |
|
|
|
|
// | *-*
|
|
|
|
// *-----|
|
|
|
|
// |<------------>| max width
|
|
|
|
// |<---->| indent
|
|
|
|
// |<--->| width
|
|
|
|
pub fn legacy(width: usize, indent: Indent) -> Shape {
|
|
|
|
Shape {
|
|
|
|
width: width,
|
|
|
|
indent: indent,
|
2017-02-20 19:43:43 -06:00
|
|
|
offset: indent.alignment,
|
2017-01-30 13:28:48 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-07 17:24:12 -05:00
|
|
|
pub fn indented(indent: Indent, config: &Config) -> Shape {
|
|
|
|
Shape {
|
2017-05-16 03:47:09 -05:00
|
|
|
width: config.max_width().checked_sub(indent.width()).unwrap_or(0),
|
2017-05-07 17:24:12 -05:00
|
|
|
indent: indent,
|
|
|
|
offset: indent.alignment,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn with_max_width(&self, config: &Config) -> Shape {
|
|
|
|
Shape {
|
|
|
|
width: config
|
2017-05-16 03:47:09 -05:00
|
|
|
.max_width()
|
2017-05-07 17:24:12 -05:00
|
|
|
.checked_sub(self.indent.width())
|
|
|
|
.unwrap_or(0),
|
|
|
|
..*self
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-20 19:43:43 -06:00
|
|
|
pub fn offset(width: usize, indent: Indent, offset: usize) -> Shape {
|
2017-01-30 13:28:48 -06:00
|
|
|
Shape {
|
2017-02-20 19:43:43 -06:00
|
|
|
width: width,
|
|
|
|
indent: indent,
|
|
|
|
offset: offset,
|
|
|
|
}
|
2017-02-21 21:20:50 -06:00
|
|
|
}
|
2017-02-20 19:43:43 -06:00
|
|
|
|
|
|
|
pub fn visual_indent(&self, extra_width: usize) -> Shape {
|
|
|
|
let alignment = self.offset + extra_width;
|
|
|
|
Shape {
|
|
|
|
width: self.width,
|
2017-04-19 04:52:56 -05:00
|
|
|
indent: Indent::new(self.indent.block_indent, alignment),
|
2017-02-20 19:43:43 -06:00
|
|
|
offset: alignment,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn block_indent(&self, extra_width: usize) -> Shape {
|
|
|
|
if self.indent.alignment == 0 {
|
|
|
|
Shape {
|
|
|
|
width: self.width,
|
2017-04-19 04:52:56 -05:00
|
|
|
indent: Indent::new(self.indent.block_indent + extra_width, 0),
|
2017-02-20 19:43:43 -06:00
|
|
|
offset: 0,
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
Shape {
|
|
|
|
width: self.width,
|
2017-04-19 04:52:56 -05:00
|
|
|
indent: self.indent + extra_width,
|
2017-02-20 19:43:43 -06:00
|
|
|
offset: self.indent.alignment + extra_width,
|
|
|
|
}
|
2017-01-30 13:28:48 -06:00
|
|
|
}
|
|
|
|
}
|
2017-02-20 19:43:43 -06:00
|
|
|
|
2017-05-04 21:29:18 -05:00
|
|
|
pub fn block_left(&self, width: usize) -> Option<Shape> {
|
2017-05-07 17:24:32 -05:00
|
|
|
self.block_indent(width).sub_width(width)
|
2017-05-04 21:29:18 -05:00
|
|
|
}
|
|
|
|
|
2017-02-20 19:43:43 -06:00
|
|
|
pub fn add_offset(&self, extra_width: usize) -> Shape {
|
|
|
|
Shape {
|
|
|
|
offset: self.offset + extra_width,
|
2017-05-07 17:24:32 -05:00
|
|
|
..*self
|
2017-02-20 19:43:43 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn block(&self) -> Shape {
|
|
|
|
Shape {
|
2017-04-19 04:52:56 -05:00
|
|
|
indent: self.indent.block_only(),
|
2017-05-07 17:24:32 -05:00
|
|
|
..*self
|
2017-02-20 19:43:43 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn sub_width(&self, width: usize) -> Option<Shape> {
|
|
|
|
Some(Shape {
|
2017-02-21 21:20:50 -06:00
|
|
|
width: try_opt!(self.width.checked_sub(width)),
|
2017-05-07 17:24:32 -05:00
|
|
|
..*self
|
2017-02-21 21:20:50 -06:00
|
|
|
})
|
2017-02-20 19:43:43 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn shrink_left(&self, width: usize) -> Option<Shape> {
|
|
|
|
Some(Shape {
|
2017-02-21 21:20:50 -06:00
|
|
|
width: try_opt!(self.width.checked_sub(width)),
|
|
|
|
indent: self.indent + width,
|
|
|
|
offset: self.offset + width,
|
|
|
|
})
|
2017-02-20 19:43:43 -06:00
|
|
|
}
|
|
|
|
|
2017-03-20 17:23:59 -05:00
|
|
|
pub fn offset_left(&self, width: usize) -> Option<Shape> {
|
2017-05-07 17:24:32 -05:00
|
|
|
self.add_offset(width).sub_width(width)
|
2017-03-20 17:23:59 -05:00
|
|
|
}
|
|
|
|
|
2017-02-20 19:43:43 -06:00
|
|
|
pub fn used_width(&self) -> usize {
|
|
|
|
self.indent.block_indent + self.offset
|
|
|
|
}
|
2017-01-30 13:28:48 -06:00
|
|
|
}
|
|
|
|
|
2015-09-17 13:21:06 -05:00
|
|
|
pub enum ErrorKind {
|
2017-01-08 20:57:11 -06:00
|
|
|
// Line has exceeded character limit (found, maximum)
|
|
|
|
LineOverflow(usize, usize),
|
2015-06-08 18:42:29 -05:00
|
|
|
// Line ends in whitespace
|
|
|
|
TrailingWhitespace,
|
|
|
|
// TO-DO or FIX-ME item without an issue number
|
|
|
|
BadIssue(Issue),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for ErrorKind {
|
|
|
|
fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
|
|
|
|
match *self {
|
2017-01-08 20:57:11 -06:00
|
|
|
ErrorKind::LineOverflow(found, maximum) => {
|
|
|
|
write!(fmt,
|
|
|
|
"line exceeded maximum length (maximum: {}, found: {})",
|
|
|
|
maximum,
|
|
|
|
found)
|
|
|
|
}
|
2015-11-14 14:57:31 -06:00
|
|
|
ErrorKind::TrailingWhitespace => write!(fmt, "left behind trailing whitespace"),
|
|
|
|
ErrorKind::BadIssue(issue) => write!(fmt, "found {}", issue),
|
2015-06-08 18:42:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-17 13:21:06 -05:00
|
|
|
// Formatting errors that are identified *after* rustfmt has run.
|
|
|
|
pub struct FormattingError {
|
2015-06-08 18:42:29 -05:00
|
|
|
line: u32,
|
|
|
|
kind: ErrorKind,
|
|
|
|
}
|
|
|
|
|
2015-07-15 21:17:07 -05:00
|
|
|
impl FormattingError {
|
|
|
|
fn msg_prefix(&self) -> &str {
|
|
|
|
match self.kind {
|
2017-01-08 20:57:11 -06:00
|
|
|
ErrorKind::LineOverflow(..) |
|
2015-07-15 21:17:07 -05:00
|
|
|
ErrorKind::TrailingWhitespace => "Rustfmt failed at",
|
|
|
|
ErrorKind::BadIssue(_) => "WARNING:",
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn msg_suffix(&self) -> &str {
|
|
|
|
match self.kind {
|
2017-01-08 20:57:11 -06:00
|
|
|
ErrorKind::LineOverflow(..) |
|
2015-07-15 21:17:07 -05:00
|
|
|
ErrorKind::TrailingWhitespace => "(sorry)",
|
|
|
|
ErrorKind::BadIssue(_) => "",
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-17 13:21:06 -05:00
|
|
|
pub struct FormatReport {
|
|
|
|
// Maps stringified file paths to their associated formatting errors.
|
2015-06-08 18:42:29 -05:00
|
|
|
file_error_map: HashMap<String, Vec<FormattingError>>,
|
|
|
|
}
|
|
|
|
|
2015-09-17 13:21:06 -05:00
|
|
|
impl FormatReport {
|
2016-04-14 18:51:50 -05:00
|
|
|
fn new() -> FormatReport {
|
|
|
|
FormatReport { file_error_map: HashMap::new() }
|
|
|
|
}
|
|
|
|
|
2015-09-17 13:21:06 -05:00
|
|
|
pub fn warning_count(&self) -> usize {
|
2017-03-06 14:40:08 -06:00
|
|
|
self.file_error_map
|
|
|
|
.iter()
|
|
|
|
.map(|(_, errors)| errors.len())
|
|
|
|
.fold(0, |acc, x| acc + x)
|
2015-09-17 13:21:06 -05:00
|
|
|
}
|
2016-04-14 18:51:50 -05:00
|
|
|
|
|
|
|
pub fn has_warnings(&self) -> bool {
|
|
|
|
self.warning_count() > 0
|
|
|
|
}
|
2015-09-17 13:21:06 -05:00
|
|
|
}
|
|
|
|
|
2015-06-08 18:42:29 -05:00
|
|
|
impl fmt::Display for FormatReport {
|
|
|
|
// Prints all the formatting errors.
|
|
|
|
fn fmt(&self, fmt: &mut fmt::Formatter) -> Result<(), fmt::Error> {
|
2015-09-04 16:39:33 -05:00
|
|
|
for (file, errors) in &self.file_error_map {
|
2015-06-08 18:42:29 -05:00
|
|
|
for error in errors {
|
2017-05-07 23:13:49 -05:00
|
|
|
write!(fmt,
|
|
|
|
"{} {}:{}: {} {}\n",
|
|
|
|
error.msg_prefix(),
|
|
|
|
file,
|
|
|
|
error.line,
|
|
|
|
error.kind,
|
|
|
|
error.msg_suffix())?;
|
2015-06-08 18:42:29 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-03-07 16:46:35 -06:00
|
|
|
// Formatting which depends on the AST.
|
2016-05-15 04:41:05 -05:00
|
|
|
fn format_ast<F>(krate: &ast::Crate,
|
2017-06-10 00:16:12 -05:00
|
|
|
mut parse_session: &mut ParseSess,
|
2016-05-15 04:41:05 -05:00
|
|
|
main_file: &Path,
|
|
|
|
config: &Config,
|
2017-06-10 00:16:12 -05:00
|
|
|
codemap: &Rc<CodeMap>,
|
2016-05-15 04:41:05 -05:00
|
|
|
mut after_file: F)
|
2016-06-20 13:42:29 -05:00
|
|
|
-> Result<(FileMap, bool), io::Error>
|
|
|
|
where F: FnMut(&str, &mut StringBuffer) -> Result<bool, io::Error>
|
2016-05-15 04:41:05 -05:00
|
|
|
{
|
|
|
|
let mut result = FileMap::new();
|
2016-06-20 13:42:29 -05:00
|
|
|
// diff mode: check if any files are differing
|
|
|
|
let mut has_diff = false;
|
2016-05-15 04:41:05 -05:00
|
|
|
|
2016-04-28 00:38:04 -05:00
|
|
|
// We always skip children for the "Plain" write mode, since there is
|
|
|
|
// nothing to distinguish the nested module contents.
|
2017-05-16 03:47:09 -05:00
|
|
|
let skip_children = config.skip_children() || config.write_mode() == config::WriteMode::Plain;
|
2015-10-28 01:41:32 -05:00
|
|
|
for (path, module) in modules::list_files(krate, parse_session.codemap()) {
|
2016-04-28 00:38:04 -05:00
|
|
|
if skip_children && path.as_path() != main_file {
|
2015-12-23 08:25:49 -06:00
|
|
|
continue;
|
|
|
|
}
|
2015-07-26 07:05:43 -05:00
|
|
|
let path = path.to_str().unwrap();
|
2017-05-16 03:47:09 -05:00
|
|
|
if config.verbose() {
|
2015-11-15 00:41:41 -06:00
|
|
|
println!("Formatting {}", path);
|
|
|
|
}
|
2017-06-10 00:16:12 -05:00
|
|
|
{
|
|
|
|
let mut visitor = FmtVisitor::from_codemap(parse_session, config);
|
|
|
|
visitor.format_separate_mod(module);
|
2016-05-15 04:41:05 -05:00
|
|
|
|
2017-06-10 00:16:12 -05:00
|
|
|
has_diff |= after_file(path, &mut visitor.buffer)?;
|
2016-05-15 04:41:05 -05:00
|
|
|
|
2017-06-10 00:16:12 -05:00
|
|
|
result.push((path.to_owned(), visitor.buffer));
|
|
|
|
}
|
|
|
|
// Reset the error count.
|
|
|
|
if parse_session.span_diagnostic.has_errors() {
|
2017-06-12 19:18:14 -05:00
|
|
|
let silent_emitter = Box::new(EmitterWriter::new(Box::new(Vec::new()),
|
|
|
|
Some(codemap.clone())));
|
|
|
|
parse_session.span_diagnostic = Handler::with_emitter(true, false, silent_emitter);
|
2017-06-10 00:16:12 -05:00
|
|
|
}
|
2015-07-26 05:55:25 -05:00
|
|
|
}
|
2016-05-15 04:41:05 -05:00
|
|
|
|
2016-06-20 13:42:29 -05:00
|
|
|
Ok((result, has_diff))
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
|
|
|
|
2015-04-21 05:50:43 -05:00
|
|
|
// Formatting done on a char by char or line by line basis.
|
2016-05-15 04:41:05 -05:00
|
|
|
// FIXME(#209) warn on bad license
|
|
|
|
// FIXME(#20) other stuff for parity with make tidy
|
|
|
|
fn format_lines(text: &mut StringBuffer, name: &str, config: &Config, report: &mut FormatReport) {
|
2015-08-01 08:02:59 -05:00
|
|
|
// Iterate over the chars in the file map.
|
2016-05-15 04:41:05 -05:00
|
|
|
let mut trims = vec![];
|
|
|
|
let mut last_wspace: Option<usize> = None;
|
|
|
|
let mut line_len = 0;
|
|
|
|
let mut cur_line = 1;
|
|
|
|
let mut newline_count = 0;
|
|
|
|
let mut errors = vec![];
|
2017-05-16 03:47:09 -05:00
|
|
|
let mut issue_seeker = BadIssueSeeker::new(config.report_todo(), config.report_fixme());
|
2016-05-15 04:41:05 -05:00
|
|
|
|
|
|
|
for (c, b) in text.chars() {
|
|
|
|
if c == '\r' {
|
|
|
|
continue;
|
|
|
|
}
|
2015-06-08 18:42:29 -05:00
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let format_line = config.file_lines().contains_line(name, cur_line as usize);
|
2016-05-15 04:41:05 -05:00
|
|
|
|
2017-05-06 14:14:44 -05:00
|
|
|
if format_line {
|
|
|
|
// Add warnings for bad todos/ fixmes
|
|
|
|
if let Some(issue) = issue_seeker.inspect(c) {
|
2015-09-26 01:29:48 -05:00
|
|
|
errors.push(FormattingError {
|
2017-02-21 21:20:50 -06:00
|
|
|
line: cur_line,
|
2017-05-06 14:14:44 -05:00
|
|
|
kind: ErrorKind::BadIssue(issue),
|
2017-02-21 21:20:50 -06:00
|
|
|
});
|
2015-06-08 18:42:29 -05:00
|
|
|
}
|
2017-05-06 14:14:44 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if c == '\n' {
|
|
|
|
if format_line {
|
|
|
|
// Check for (and record) trailing whitespace.
|
|
|
|
if let Some(lw) = last_wspace {
|
|
|
|
trims.push((cur_line, lw, b));
|
|
|
|
line_len -= 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check for any line width errors we couldn't correct.
|
2017-05-16 03:47:09 -05:00
|
|
|
if config.error_on_line_overflow() && line_len > config.max_width() {
|
2017-05-06 14:14:44 -05:00
|
|
|
errors.push(FormattingError {
|
|
|
|
line: cur_line,
|
2017-05-16 03:47:09 -05:00
|
|
|
kind: ErrorKind::LineOverflow(line_len, config.max_width()),
|
2017-05-06 14:14:44 -05:00
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
line_len = 0;
|
|
|
|
cur_line += 1;
|
|
|
|
newline_count += 1;
|
|
|
|
last_wspace = None;
|
|
|
|
} else {
|
|
|
|
newline_count = 0;
|
2017-04-18 06:31:53 -05:00
|
|
|
line_len += 1;
|
2016-05-15 04:41:05 -05:00
|
|
|
if c.is_whitespace() {
|
|
|
|
if last_wspace.is_none() {
|
|
|
|
last_wspace = Some(b);
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
|
|
|
} else {
|
2016-05-15 04:41:05 -05:00
|
|
|
last_wspace = None;
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
|
|
|
}
|
2016-05-15 04:41:05 -05:00
|
|
|
}
|
2015-03-07 16:46:35 -06:00
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
if newline_count > 1 {
|
|
|
|
debug!("track truncate: {} {}", text.len, newline_count);
|
|
|
|
let line = text.len - newline_count + 1;
|
|
|
|
text.truncate(line);
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
2015-04-23 01:02:55 -05:00
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
for &(l, _, _) in &trims {
|
|
|
|
errors.push(FormattingError {
|
2017-02-21 21:20:50 -06:00
|
|
|
line: l,
|
|
|
|
kind: ErrorKind::TrailingWhitespace,
|
|
|
|
});
|
2015-04-23 01:02:55 -05:00
|
|
|
}
|
2015-06-08 18:42:29 -05:00
|
|
|
|
2017-03-27 17:25:59 -05:00
|
|
|
report.file_error_map.insert(name.to_owned(), errors);
|
2015-03-07 16:46:35 -06:00
|
|
|
}
|
|
|
|
|
2016-04-27 14:08:44 -05:00
|
|
|
fn parse_input(input: Input,
|
|
|
|
parse_session: &ParseSess)
|
|
|
|
-> Result<ast::Crate, Option<DiagnosticBuilder>> {
|
|
|
|
let result = match input {
|
2017-01-17 22:22:01 -06:00
|
|
|
Input::File(file) => {
|
|
|
|
let mut parser = parse::new_parser_from_file(parse_session, &file);
|
|
|
|
parser.cfg_mods = false;
|
|
|
|
parser.parse_crate_mod()
|
|
|
|
}
|
2016-04-11 11:49:56 -05:00
|
|
|
Input::Text(text) => {
|
2017-01-17 22:22:01 -06:00
|
|
|
let mut parser =
|
|
|
|
parse::new_parser_from_source_str(parse_session, "stdin".to_owned(), text);
|
|
|
|
parser.cfg_mods = false;
|
|
|
|
parser.parse_crate_mod()
|
2016-04-11 11:49:56 -05:00
|
|
|
}
|
2016-04-27 14:08:44 -05:00
|
|
|
};
|
|
|
|
|
2016-05-17 16:58:51 -05:00
|
|
|
match result {
|
|
|
|
Ok(c) => {
|
|
|
|
if parse_session.span_diagnostic.has_errors() {
|
|
|
|
// Bail out if the parser recovered from an error.
|
|
|
|
Err(None)
|
|
|
|
} else {
|
|
|
|
Ok(c)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Err(e) => Err(Some(e)),
|
2016-04-14 18:51:50 -05:00
|
|
|
}
|
2015-11-02 13:45:45 -06:00
|
|
|
}
|
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
pub fn format_input<T: Write>(input: Input,
|
|
|
|
config: &Config,
|
|
|
|
mut out: Option<&mut T>)
|
|
|
|
-> Result<(Summary, FileMap, FormatReport), (io::Error, Summary)> {
|
2016-04-14 18:51:50 -05:00
|
|
|
let mut summary = Summary::new();
|
2017-05-16 03:47:09 -05:00
|
|
|
if config.disable_all_formatting() {
|
2017-02-06 22:11:47 -06:00
|
|
|
return Ok((summary, FileMap::new(), FormatReport::new()));
|
|
|
|
}
|
2017-06-05 23:54:22 -05:00
|
|
|
let codemap = Rc::new(CodeMap::new(FilePathMapping::empty()));
|
2016-03-01 16:27:19 -06:00
|
|
|
|
2016-05-12 14:50:43 -05:00
|
|
|
let tty_handler =
|
2016-09-15 22:19:18 -05:00
|
|
|
Handler::with_tty_emitter(ColorConfig::Auto, true, false, Some(codemap.clone()));
|
2016-03-01 16:27:19 -06:00
|
|
|
let mut parse_session = ParseSess::with_span_handler(tty_handler, codemap.clone());
|
|
|
|
|
2016-04-11 11:49:56 -05:00
|
|
|
let main_file = match input {
|
|
|
|
Input::File(ref file) => file.clone(),
|
|
|
|
Input::Text(..) => PathBuf::from("stdin"),
|
|
|
|
};
|
|
|
|
|
|
|
|
let krate = match parse_input(input, &parse_session) {
|
|
|
|
Ok(krate) => krate,
|
2016-04-27 14:08:44 -05:00
|
|
|
Err(diagnostic) => {
|
|
|
|
if let Some(mut diagnostic) = diagnostic {
|
|
|
|
diagnostic.emit();
|
|
|
|
}
|
2016-04-14 18:51:50 -05:00
|
|
|
summary.add_parsing_error();
|
2016-05-15 04:41:05 -05:00
|
|
|
return Ok((summary, FileMap::new(), FormatReport::new()));
|
2016-04-11 11:49:56 -05:00
|
|
|
}
|
|
|
|
};
|
2015-10-28 01:41:32 -05:00
|
|
|
|
2016-04-14 18:51:50 -05:00
|
|
|
if parse_session.span_diagnostic.has_errors() {
|
|
|
|
summary.add_parsing_error();
|
|
|
|
}
|
|
|
|
|
2015-10-28 01:41:32 -05:00
|
|
|
// Suppress error output after parsing.
|
2016-09-15 22:19:18 -05:00
|
|
|
let silent_emitter = Box::new(EmitterWriter::new(Box::new(Vec::new()), Some(codemap.clone())));
|
2016-03-01 16:27:19 -06:00
|
|
|
parse_session.span_diagnostic = Handler::with_emitter(true, false, silent_emitter);
|
2015-10-28 01:41:32 -05:00
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
let mut report = FormatReport::new();
|
|
|
|
|
2017-05-31 22:08:09 -05:00
|
|
|
match format_ast(
|
|
|
|
&krate,
|
2017-06-10 00:16:12 -05:00
|
|
|
&mut parse_session,
|
2017-05-31 22:08:09 -05:00
|
|
|
&main_file,
|
|
|
|
config,
|
2017-06-10 00:16:12 -05:00
|
|
|
&codemap,
|
2017-05-31 22:08:09 -05:00
|
|
|
|file_name, file| {
|
|
|
|
// For some reason, the codemap does not include terminating
|
|
|
|
// newlines so we must add one on for each file. This is sad.
|
|
|
|
filemap::append_newline(file);
|
|
|
|
|
|
|
|
format_lines(file, file_name, config, &mut report);
|
|
|
|
|
|
|
|
if let Some(ref mut out) = out {
|
|
|
|
return filemap::write_file(file, file_name, out, config);
|
|
|
|
}
|
|
|
|
Ok(false)
|
2017-06-03 08:50:44 -05:00
|
|
|
},
|
2017-05-31 22:08:09 -05:00
|
|
|
) {
|
2016-06-20 13:42:29 -05:00
|
|
|
Ok((file_map, has_diff)) => {
|
2016-05-15 04:41:05 -05:00
|
|
|
if report.has_warnings() {
|
|
|
|
summary.add_formatting_error();
|
|
|
|
}
|
2015-09-16 14:52:32 -05:00
|
|
|
|
2016-06-20 13:42:29 -05:00
|
|
|
if has_diff {
|
|
|
|
summary.add_diff();
|
|
|
|
}
|
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
Ok((summary, file_map, report))
|
|
|
|
}
|
|
|
|
Err(e) => Err((e, summary)),
|
2016-04-14 18:51:50 -05:00
|
|
|
}
|
2016-04-02 13:56:37 -05:00
|
|
|
}
|
2015-09-16 14:52:32 -05:00
|
|
|
|
2016-05-25 13:41:26 -05:00
|
|
|
#[derive(Debug)]
|
2016-04-02 13:56:37 -05:00
|
|
|
pub enum Input {
|
|
|
|
File(PathBuf),
|
|
|
|
Text(String),
|
2015-04-22 23:22:48 -05:00
|
|
|
}
|
2015-11-02 13:45:45 -06:00
|
|
|
|
2016-04-14 18:51:50 -05:00
|
|
|
pub fn run(input: Input, config: &Config) -> Summary {
|
2016-05-15 04:41:05 -05:00
|
|
|
let mut out = &mut stdout();
|
2017-05-16 03:47:09 -05:00
|
|
|
output_header(out, config.write_mode()).ok();
|
2016-05-15 04:41:05 -05:00
|
|
|
match format_input(input, config, Some(out)) {
|
|
|
|
Ok((summary, _, report)) => {
|
2017-05-16 03:47:09 -05:00
|
|
|
output_footer(out, config.write_mode()).ok();
|
2016-05-15 04:41:05 -05:00
|
|
|
|
|
|
|
if report.has_warnings() {
|
|
|
|
msg!("{}", report);
|
|
|
|
}
|
2015-11-02 13:45:45 -06:00
|
|
|
|
2016-05-15 04:41:05 -05:00
|
|
|
summary
|
|
|
|
}
|
|
|
|
Err((msg, mut summary)) => {
|
|
|
|
msg!("Error writing files: {}", msg);
|
|
|
|
summary.add_operational_error();
|
|
|
|
summary
|
|
|
|
}
|
2015-11-02 13:45:45 -06:00
|
|
|
}
|
|
|
|
}
|
2017-03-05 12:50:04 -06:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn indent_add_sub() {
|
|
|
|
let indent = Indent::new(4, 8) + Indent::new(8, 12);
|
|
|
|
assert_eq!(12, indent.block_indent);
|
|
|
|
assert_eq!(20, indent.alignment);
|
|
|
|
|
|
|
|
let indent = indent - Indent::new(4, 4);
|
|
|
|
assert_eq!(8, indent.block_indent);
|
|
|
|
assert_eq!(16, indent.alignment);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn indent_add_sub_alignment() {
|
|
|
|
let indent = Indent::new(4, 8) + 4;
|
|
|
|
assert_eq!(4, indent.block_indent);
|
|
|
|
assert_eq!(12, indent.alignment);
|
|
|
|
|
|
|
|
let indent = indent - 4;
|
|
|
|
assert_eq!(4, indent.block_indent);
|
|
|
|
assert_eq!(8, indent.alignment);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn indent_to_string_spaces() {
|
|
|
|
let config = Config::default();
|
|
|
|
let indent = Indent::new(4, 8);
|
|
|
|
|
|
|
|
// 12 spaces
|
|
|
|
assert_eq!(" ", indent.to_string(&config));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn indent_to_string_hard_tabs() {
|
|
|
|
let mut config = Config::default();
|
2017-05-17 23:37:29 -05:00
|
|
|
config.set().hard_tabs(true);
|
2017-03-05 12:50:04 -06:00
|
|
|
let indent = Indent::new(8, 4);
|
|
|
|
|
|
|
|
// 2 tabs + 4 spaces
|
|
|
|
assert_eq!("\t\t ", indent.to_string(&config));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn shape_visual_indent() {
|
|
|
|
let config = Config::default();
|
|
|
|
let indent = Indent::new(4, 8);
|
2017-05-16 03:47:09 -05:00
|
|
|
let shape = Shape::legacy(config.max_width(), indent);
|
2017-03-05 12:50:04 -06:00
|
|
|
let shape = shape.visual_indent(20);
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
assert_eq!(config.max_width(), shape.width);
|
2017-03-05 12:50:04 -06:00
|
|
|
assert_eq!(4, shape.indent.block_indent);
|
2017-05-07 17:24:12 -05:00
|
|
|
assert_eq!(28, shape.indent.alignment);
|
|
|
|
assert_eq!(28, shape.offset);
|
2017-03-05 12:50:04 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn shape_block_indent_without_alignment() {
|
|
|
|
let config = Config::default();
|
|
|
|
let indent = Indent::new(4, 0);
|
2017-05-16 03:47:09 -05:00
|
|
|
let shape = Shape::legacy(config.max_width(), indent);
|
2017-03-05 12:50:04 -06:00
|
|
|
let shape = shape.block_indent(20);
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
assert_eq!(config.max_width(), shape.width);
|
2017-03-05 12:50:04 -06:00
|
|
|
assert_eq!(24, shape.indent.block_indent);
|
|
|
|
assert_eq!(0, shape.indent.alignment);
|
|
|
|
assert_eq!(0, shape.offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn shape_block_indent_with_alignment() {
|
|
|
|
let config = Config::default();
|
|
|
|
let indent = Indent::new(4, 8);
|
2017-05-16 03:47:09 -05:00
|
|
|
let shape = Shape::legacy(config.max_width(), indent);
|
2017-03-05 12:50:04 -06:00
|
|
|
let shape = shape.block_indent(20);
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
assert_eq!(config.max_width(), shape.width);
|
2017-03-05 12:50:04 -06:00
|
|
|
assert_eq!(4, shape.indent.block_indent);
|
|
|
|
assert_eq!(28, shape.indent.alignment);
|
|
|
|
assert_eq!(28, shape.offset);
|
|
|
|
}
|
|
|
|
}
|