2016-05-30 09:10:12 -05:00
|
|
|
// Copyright 2016 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-05-26 07:17:20 -05:00
|
|
|
//! This module contains types and functions to support formatting specific line ranges.
|
2016-09-15 22:19:18 -05:00
|
|
|
|
2017-12-08 07:16:47 -06:00
|
|
|
use std::{cmp, iter, str};
|
2017-05-24 22:59:06 -05:00
|
|
|
use std::collections::HashMap;
|
2016-05-26 07:17:20 -05:00
|
|
|
|
2017-12-08 07:16:47 -06:00
|
|
|
use serde::de::{Deserialize, Deserializer};
|
2017-05-03 03:23:50 -05:00
|
|
|
use serde_json as json;
|
2016-05-26 07:17:20 -05:00
|
|
|
|
|
|
|
use codemap::LineRange;
|
2017-12-08 07:16:47 -06:00
|
|
|
use syntax::codemap::FileName;
|
2016-05-26 07:17:20 -05:00
|
|
|
|
|
|
|
/// A range that is inclusive of both ends.
|
2017-05-24 22:59:06 -05:00
|
|
|
#[derive(Clone, Copy, Debug, Eq, PartialEq, PartialOrd, Ord, Deserialize)]
|
2017-06-18 19:58:29 -05:00
|
|
|
pub struct Range {
|
2017-05-24 22:59:06 -05:00
|
|
|
lo: usize,
|
|
|
|
hi: usize,
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> From<&'a LineRange> for Range {
|
|
|
|
fn from(range: &'a LineRange) -> Range {
|
|
|
|
Range::new(range.lo, range.hi)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Range {
|
2017-06-19 07:14:33 -05:00
|
|
|
pub fn new(lo: usize, hi: usize) -> Range {
|
2016-05-26 07:17:20 -05:00
|
|
|
Range { lo: lo, hi: hi }
|
|
|
|
}
|
|
|
|
|
|
|
|
fn is_empty(self) -> bool {
|
|
|
|
self.lo > self.hi
|
|
|
|
}
|
|
|
|
|
|
|
|
fn contains(self, other: Range) -> bool {
|
|
|
|
if other.is_empty() {
|
|
|
|
true
|
|
|
|
} else {
|
|
|
|
!self.is_empty() && self.lo <= other.lo && self.hi >= other.hi
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn intersects(self, other: Range) -> bool {
|
|
|
|
if self.is_empty() || other.is_empty() {
|
|
|
|
false
|
|
|
|
} else {
|
2017-09-14 22:10:58 -05:00
|
|
|
(self.lo <= other.hi && other.hi <= self.hi)
|
|
|
|
|| (other.lo <= self.hi && self.hi <= other.hi)
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn adjacent_to(self, other: Range) -> bool {
|
|
|
|
if self.is_empty() || other.is_empty() {
|
|
|
|
false
|
|
|
|
} else {
|
|
|
|
self.hi + 1 == other.lo || other.hi + 1 == self.lo
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns a new `Range` with lines from `self` and `other` if they were adjacent or
|
|
|
|
/// intersect; returns `None` otherwise.
|
|
|
|
fn merge(self, other: Range) -> Option<Range> {
|
|
|
|
if self.adjacent_to(other) || self.intersects(other) {
|
2017-06-11 22:58:58 -05:00
|
|
|
Some(Range::new(
|
|
|
|
cmp::min(self.lo, other.lo),
|
|
|
|
cmp::max(self.hi, other.hi),
|
|
|
|
))
|
2016-05-26 07:17:20 -05:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// A set of lines in files.
|
|
|
|
///
|
|
|
|
/// It is represented as a multimap keyed on file names, with values a collection of
|
|
|
|
/// non-overlapping ranges sorted by their start point. An inner `None` is interpreted to mean all
|
|
|
|
/// lines in all files.
|
|
|
|
#[derive(Clone, Debug, Default)]
|
2017-12-08 07:16:47 -06:00
|
|
|
pub struct FileLines(Option<HashMap<FileName, Vec<Range>>>);
|
2016-05-26 07:17:20 -05:00
|
|
|
|
|
|
|
/// Normalizes the ranges so that the invariants for `FileLines` hold: ranges are non-overlapping,
|
|
|
|
/// and ordered by their start point.
|
2017-12-08 07:16:47 -06:00
|
|
|
fn normalize_ranges(ranges: &mut HashMap<FileName, Vec<Range>>) {
|
2017-05-24 22:59:06 -05:00
|
|
|
for ranges in ranges.values_mut() {
|
|
|
|
ranges.sort();
|
|
|
|
let mut result = vec![];
|
|
|
|
{
|
|
|
|
let mut iter = ranges.into_iter().peekable();
|
|
|
|
while let Some(next) = iter.next() {
|
2017-08-29 08:16:04 -05:00
|
|
|
let mut next = *next;
|
2017-05-24 22:59:06 -05:00
|
|
|
while let Some(&&mut peek) = iter.peek() {
|
|
|
|
if let Some(merged) = next.merge(peek) {
|
|
|
|
iter.next().unwrap();
|
|
|
|
next = merged;
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
result.push(next)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*ranges = result;
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FileLines {
|
|
|
|
/// Creates a `FileLines` that contains all lines in all files.
|
|
|
|
pub fn all() -> FileLines {
|
|
|
|
FileLines(None)
|
|
|
|
}
|
|
|
|
|
2017-12-08 07:16:47 -06:00
|
|
|
pub fn from_ranges(mut ranges: HashMap<FileName, Vec<Range>>) -> FileLines {
|
2017-05-24 22:59:06 -05:00
|
|
|
normalize_ranges(&mut ranges);
|
|
|
|
FileLines(Some(ranges))
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns an iterator over the files contained in `self`.
|
|
|
|
pub fn files(&self) -> Files {
|
2017-05-24 22:59:06 -05:00
|
|
|
Files(self.0.as_ref().map(|m| m.keys()))
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
|
2017-05-13 12:14:24 -05:00
|
|
|
/// Returns true if `self` includes all lines in all files. Otherwise runs `f` on all ranges in
|
|
|
|
/// the designated file (if any) and returns true if `f` ever does.
|
2017-12-08 07:16:47 -06:00
|
|
|
fn file_range_matches<F>(&self, file_name: &FileName, f: F) -> bool
|
2017-06-11 22:58:58 -05:00
|
|
|
where
|
|
|
|
F: FnMut(&Range) -> bool,
|
2017-05-13 12:14:24 -05:00
|
|
|
{
|
2016-05-26 07:17:20 -05:00
|
|
|
let map = match self.0 {
|
|
|
|
// `None` means "all lines in all files".
|
|
|
|
None => return true,
|
|
|
|
Some(ref map) => map,
|
|
|
|
};
|
|
|
|
|
2017-05-25 02:08:08 -05:00
|
|
|
match canonicalize_path_string(file_name).and_then(|file| map.get(&file)) {
|
2017-05-24 22:59:06 -05:00
|
|
|
Some(ranges) => ranges.iter().any(f),
|
|
|
|
None => false,
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-13 12:14:24 -05:00
|
|
|
/// Returns true if `range` is fully contained in `self`.
|
|
|
|
pub fn contains(&self, range: &LineRange) -> bool {
|
|
|
|
self.file_range_matches(range.file_name(), |r| r.contains(Range::from(range)))
|
|
|
|
}
|
|
|
|
|
2016-05-26 07:17:20 -05:00
|
|
|
/// Returns true if any lines in `range` are in `self`.
|
|
|
|
pub fn intersects(&self, range: &LineRange) -> bool {
|
2017-05-13 12:14:24 -05:00
|
|
|
self.file_range_matches(range.file_name(), |r| r.intersects(Range::from(range)))
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
|
2017-05-13 12:14:24 -05:00
|
|
|
/// Returns true if `line` from `file_name` is in `self`.
|
2017-12-08 07:16:47 -06:00
|
|
|
pub fn contains_line(&self, file_name: &FileName, line: usize) -> bool {
|
2017-05-13 12:14:24 -05:00
|
|
|
self.file_range_matches(file_name, |r| r.lo <= line && r.hi >= line)
|
2017-05-06 14:14:44 -05:00
|
|
|
}
|
2017-05-06 16:59:51 -05:00
|
|
|
|
2017-05-13 12:14:24 -05:00
|
|
|
/// Returns true if any of the lines between `lo` and `hi` from `file_name` are in `self`.
|
2017-12-08 07:16:47 -06:00
|
|
|
pub fn intersects_range(&self, file_name: &FileName, lo: usize, hi: usize) -> bool {
|
2017-05-13 12:14:24 -05:00
|
|
|
self.file_range_matches(file_name, |r| r.intersects(Range::new(lo, hi)))
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-29 08:16:04 -05:00
|
|
|
/// `FileLines` files iterator.
|
2017-12-08 07:16:47 -06:00
|
|
|
pub struct Files<'a>(Option<::std::collections::hash_map::Keys<'a, FileName, Vec<Range>>>);
|
2016-05-26 07:17:20 -05:00
|
|
|
|
|
|
|
impl<'a> iter::Iterator for Files<'a> {
|
2017-12-08 07:16:47 -06:00
|
|
|
type Item = &'a FileName;
|
2016-05-26 07:17:20 -05:00
|
|
|
|
2017-12-08 07:16:47 -06:00
|
|
|
fn next(&mut self) -> Option<&'a FileName> {
|
2016-05-26 07:17:20 -05:00
|
|
|
self.0.as_mut().and_then(Iterator::next)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-12-08 07:16:47 -06:00
|
|
|
fn canonicalize_path_string(file: &FileName) -> Option<FileName> {
|
|
|
|
match *file {
|
|
|
|
FileName::Real(ref path) => path.canonicalize().ok().map(FileName::Real),
|
|
|
|
_ => Some(file.clone()),
|
2016-07-18 16:05:01 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-26 07:17:20 -05:00
|
|
|
// This impl is needed for `Config::override_value` to work for use in tests.
|
|
|
|
impl str::FromStr for FileLines {
|
|
|
|
type Err = String;
|
|
|
|
|
|
|
|
fn from_str(s: &str) -> Result<FileLines, String> {
|
2017-05-07 23:13:49 -05:00
|
|
|
let v: Vec<JsonSpan> = json::from_str(s).map_err(|e| e.to_string())?;
|
2017-05-24 22:59:06 -05:00
|
|
|
let mut m = HashMap::new();
|
2017-08-29 08:16:04 -05:00
|
|
|
for js in v {
|
2017-05-24 22:59:06 -05:00
|
|
|
let (s, r) = JsonSpan::into_tuple(js)?;
|
2017-08-29 08:16:04 -05:00
|
|
|
m.entry(s).or_insert_with(|| vec![]).push(r);
|
2017-05-24 22:59:06 -05:00
|
|
|
}
|
|
|
|
Ok(FileLines::from_ranges(m))
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// For JSON decoding.
|
2017-05-03 03:23:50 -05:00
|
|
|
#[derive(Clone, Debug, Deserialize)]
|
2016-05-26 07:17:20 -05:00
|
|
|
struct JsonSpan {
|
2017-12-08 07:16:47 -06:00
|
|
|
#[serde(deserialize_with = "deserialize_filename")] file: FileName,
|
2016-05-26 07:17:20 -05:00
|
|
|
range: (usize, usize),
|
|
|
|
}
|
|
|
|
|
2017-12-08 07:16:47 -06:00
|
|
|
fn deserialize_filename<'de, D: Deserializer<'de>>(d: D) -> Result<FileName, D::Error> {
|
|
|
|
let s = String::deserialize(d)?;
|
|
|
|
if s == "stdin" {
|
|
|
|
Ok(FileName::Custom(s))
|
|
|
|
} else {
|
|
|
|
Ok(FileName::Real(s.into()))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-26 07:17:20 -05:00
|
|
|
impl JsonSpan {
|
2017-12-08 07:16:47 -06:00
|
|
|
fn into_tuple(self) -> Result<(FileName, Range), String> {
|
2016-05-26 07:17:20 -05:00
|
|
|
let (lo, hi) = self.range;
|
2017-06-15 18:49:49 -05:00
|
|
|
let canonical = canonicalize_path_string(&self.file)
|
|
|
|
.ok_or_else(|| format!("Can't canonicalize {}", &self.file))?;
|
2016-07-18 16:05:01 -05:00
|
|
|
Ok((canonical, Range::new(lo, hi)))
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// This impl is needed for inclusion in the `Config` struct. We don't have a toml representation
|
|
|
|
// for `FileLines`, so it will just panic instead.
|
2017-05-03 03:23:50 -05:00
|
|
|
impl<'de> ::serde::de::Deserialize<'de> for FileLines {
|
|
|
|
fn deserialize<D>(_: D) -> Result<Self, D::Error>
|
2017-06-11 22:58:58 -05:00
|
|
|
where
|
|
|
|
D: ::serde::de::Deserializer<'de>,
|
2017-05-03 03:23:50 -05:00
|
|
|
{
|
2017-06-11 22:58:58 -05:00
|
|
|
panic!(
|
|
|
|
"FileLines cannot be deserialized from a project rustfmt.toml file: please \
|
2017-06-18 08:45:08 -05:00
|
|
|
specify it via the `--file-lines` option instead"
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-16 06:08:24 -05:00
|
|
|
// We also want to avoid attempting to serialize a FileLines to toml. The
|
|
|
|
// `Config` struct should ensure this impl is never reached.
|
|
|
|
impl ::serde::ser::Serialize for FileLines {
|
|
|
|
fn serialize<S>(&self, _: S) -> Result<S::Ok, S::Error>
|
2017-06-11 22:58:58 -05:00
|
|
|
where
|
|
|
|
S: ::serde::ser::Serializer,
|
2017-05-16 06:08:24 -05:00
|
|
|
{
|
2017-05-17 05:16:35 -05:00
|
|
|
unreachable!("FileLines cannot be serialized. This is a rustfmt bug.");
|
2017-05-16 06:08:24 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-26 07:17:20 -05:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::Range;
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_range_intersects() {
|
|
|
|
assert!(Range::new(1, 2).intersects(Range::new(1, 1)));
|
|
|
|
assert!(Range::new(1, 2).intersects(Range::new(2, 2)));
|
|
|
|
assert!(!Range::new(1, 2).intersects(Range::new(0, 0)));
|
|
|
|
assert!(!Range::new(1, 2).intersects(Range::new(3, 10)));
|
|
|
|
assert!(!Range::new(1, 3).intersects(Range::new(5, 5)));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_range_adjacent_to() {
|
|
|
|
assert!(!Range::new(1, 2).adjacent_to(Range::new(1, 1)));
|
|
|
|
assert!(!Range::new(1, 2).adjacent_to(Range::new(2, 2)));
|
|
|
|
assert!(Range::new(1, 2).adjacent_to(Range::new(0, 0)));
|
|
|
|
assert!(Range::new(1, 2).adjacent_to(Range::new(3, 10)));
|
|
|
|
assert!(!Range::new(1, 3).adjacent_to(Range::new(5, 5)));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_range_contains() {
|
|
|
|
assert!(Range::new(1, 2).contains(Range::new(1, 1)));
|
|
|
|
assert!(Range::new(1, 2).contains(Range::new(2, 2)));
|
|
|
|
assert!(!Range::new(1, 2).contains(Range::new(0, 0)));
|
|
|
|
assert!(!Range::new(1, 2).contains(Range::new(3, 10)));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_range_merge() {
|
|
|
|
assert_eq!(None, Range::new(1, 3).merge(Range::new(5, 5)));
|
|
|
|
assert_eq!(None, Range::new(4, 7).merge(Range::new(0, 1)));
|
2017-06-11 22:58:58 -05:00
|
|
|
assert_eq!(
|
|
|
|
Some(Range::new(3, 7)),
|
|
|
|
Range::new(3, 5).merge(Range::new(4, 7))
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
Some(Range::new(3, 7)),
|
|
|
|
Range::new(3, 5).merge(Range::new(5, 7))
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
Some(Range::new(3, 7)),
|
|
|
|
Range::new(3, 5).merge(Range::new(6, 7))
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
Some(Range::new(3, 7)),
|
|
|
|
Range::new(3, 7).merge(Range::new(4, 5))
|
|
|
|
);
|
2016-05-26 07:17:20 -05:00
|
|
|
}
|
|
|
|
}
|