Format all patterns (well, except macros)

Fixes #18
Fixes #672

diff --git a/src/imports.rs b/src/imports.rs
index 42d152fc6ac0b41e8b22aed1cfcb0e9e5a902a18..70351ca8d792ed10b368662affda1ae17820314d 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -51,7 +51,7 @@ fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Opt
 }
 
 fn rewrite_single_use_list(path_str: String, vpi: &ast::PathListItem) -> String {
-    let path_item_str = if let ast::PathListItem_::PathListIdent{ name, .. } = vpi.node {
+    let path_item_str = if let ast::PathListItem_::PathListIdent { name, .. } = vpi.node {
         // A name.
         if path_str.is_empty() {
             name.to_string()
@@ -74,8 +74,8 @@ fn rewrite_single_use_list(path_str: String, vpi: &ast::PathListItem) -> String
 
 fn rewrite_path_item(vpi: &&ast::PathListItem) -> Option<String> {
     let path_item_str = match vpi.node {
-        ast::PathListItem_::PathListIdent{ name, .. } => name.to_string(),
-        ast::PathListItem_::PathListMod{ .. } => "self".to_owned(),
+        ast::PathListItem_::PathListIdent { name, .. } => name.to_string(),
+        ast::PathListItem_::PathListMod { .. } => "self".to_owned(),
     };
 
     Some(append_alias(path_item_str, vpi))
@@ -83,8 +83,8 @@ fn rewrite_path_item(vpi: &&ast::PathListItem) -> Option<String> {
 
 fn append_alias(path_item_str: String, vpi: &ast::PathListItem) -> String {
     match vpi.node {
-        ast::PathListItem_::PathListIdent{ rename: Some(rename), .. } |
-        ast::PathListItem_::PathListMod{ rename: Some(rename), .. } => {
+        ast::PathListItem_::PathListIdent { rename: Some(rename), .. } |
+        ast::PathListItem_::PathListMod { rename: Some(rename), .. } => {
             format!("{} as {}", path_item_str, rename)
         }
         _ => path_item_str,

diff --git a/src/patterns.rs b/src/patterns.rs
index fdc418733fb22460104ec7e612f8a1344d5886f6..1aee4ae7a2188e7ccb78f790afcef7e3b55f96d5 100644 (file)
--- a/src/patterns.rs
+++ b/src/patterns.rs
@@ -15,20 +15,30 @@
 use expr::{rewrite_unary_prefix, rewrite_pair, rewrite_tuple};
 use types::rewrite_path;
 
-use syntax::ast::{BindingMode, Pat, Pat_};
+use syntax::ast::{BindingMode, Pat, Pat_, FieldPat};
 
-// FIXME(#18): implement pattern formatting.
 impl Rewrite for Pat {
     fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Option<String> {
         match self.node {
             Pat_::PatBox(ref pat) => rewrite_unary_prefix(context, "box ", &**pat, width, offset),
-            Pat_::PatIdent(binding_mode, ident, None) => {
+            Pat_::PatIdent(binding_mode, ident, ref sub_pat) => {
                 let (prefix, mutability) = match binding_mode {
                     BindingMode::BindByRef(mutability) => ("ref ", mutability),
                     BindingMode::BindByValue(mutability) => ("", mutability),
                 };
                 let mut_infix = format_mutability(mutability);
-                let result = format!("{}{}{}", prefix, mut_infix, ident.node);
+                let id_str = ident.node.to_string();
+
+                let sub_pat = match *sub_pat {
+                    Some(ref p) => {
+                        let width = try_opt!(width.checked_sub(prefix.len() + mut_infix.len() +
+                                                               id_str.len()));
+                        format!(" @ {}", try_opt!(p.rewrite(context, width, offset)))
+                    }
+                    None => "".to_owned(),
+                };
+
+                let result = format!("{}{}{}{}", prefix, mut_infix, id_str, sub_pat);
                 wrap_str(result, context.config.max_width, width, offset)
             }
             Pat_::PatWild => {
@@ -55,39 +65,105 @@ fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Opt
                               width,
                               offset)
             }
-            Pat_::PatEnum(ref path, Some(ref pat_vec)) => {
-                let path_str = try_opt!(::types::rewrite_path(context,
-                                                              true,
-                                                              None,
-                                                              path,
-                                                              width,
-                                                              offset));
+            Pat_::PatEnum(ref path, ref pat_vec) => {
+                let path_str = try_opt!(rewrite_path(context, true, None, path, width, offset));
 
-                if pat_vec.is_empty() {
-                    Some(path_str)
-                } else {
-                    // 1 = (
-                    let width = try_opt!(width.checked_sub(path_str.len() + 1));
-                    let offset = offset + path_str.len() + 1;
-                    let items = itemize_list(context.codemap,
-                                             pat_vec.iter(),
-                                             ")",
-                                             |item| item.span.lo,
-                                             |item| item.span.hi,
-                                             |item| item.rewrite(context, width, offset),
-                                             span_after(self.span, "(", context.codemap),
-                                             self.span.hi);
-                    Some(format!("{}({})",
-                                 path_str,
-                                 try_opt!(format_item_list(items, width, offset, context.config))))
+                match *pat_vec {
+                    Some(ref pat_vec) => {
+                        if pat_vec.is_empty() {
+                            Some(path_str)
+                        } else {
+                            // 1 = (
+                            let width = try_opt!(width.checked_sub(path_str.len() + 1));
+                            let offset = offset + path_str.len() + 1;
+                            let items = itemize_list(context.codemap,
+                                                     pat_vec.iter(),
+                                                     ")",
+                                                     |item| item.span.lo,
+                                                     |item| item.span.hi,
+                                                     |item| item.rewrite(context, width, offset),
+                                                     span_after(self.span, "(", context.codemap),
+                                                     self.span.hi);
+                            Some(format!("{}({})",
+                                         path_str,
+                                         try_opt!(format_item_list(items,
+                                                                   width,
+                                                                   offset,
+                                                                   context.config))))
+                        }
+                    }
+                    None => Some(format!("{}(..)", path_str)),
                 }
             }
             Pat_::PatLit(ref expr) => expr.rewrite(context, width, offset),
-            // FIXME(#8): format remaining pattern variants.
-            Pat_::PatIdent(_, _, Some(..)) |
-            Pat_::PatEnum(_, None) |
-            Pat_::PatStruct(..) |
-            Pat_::PatVec(..) |
+            Pat_::PatVec(ref prefix, ref slice_pat, ref suffix) => {
+                // Rewrite all the sub-patterns.
+                let prefix = prefix.iter().map(|p| p.rewrite(context, width, offset));
+                let slice_pat = slice_pat.as_ref().map(|p| {
+                    Some(format!("{}..", try_opt!(p.rewrite(context, width, offset))))
+                });
+                let suffix = suffix.iter().map(|p| p.rewrite(context, width, offset));
+
+                // Munge them together.
+                let pats = prefix.chain(slice_pat.into_iter()).chain(suffix);
+
+                // Check that all the rewrites succeeded, and if not return None.
+                let (somes, nones) = pats.partition::<Vec<Option<String>>, _>(Option::is_some);
+                if nones.len() > 0 {
+                    return None;
+                }
+
+                // Unwrap all the sub-strings and join them with commas.
+                let pats = somes.into_iter().map(|p| p.unwrap()).collect::<Vec<_>>().join(", ");
+                Some(format!("[{}]", pats))
+            }
+            Pat_::PatStruct(ref path, ref fields, elipses) => {
+                let path = try_opt!(rewrite_path(context, true, None, path, width, offset));
+
+                let (elipses_str, terminator) = if elipses {
+                    (", ..", "..")
+                } else {
+                    ("", "}")
+                };
+
+                let budget = try_opt!(width.checked_sub(path.len() + 5 + elipses_str.len()));
+                // FIXME Using visual indenting, should use block or visual to match
+                // struct lit preference (however, in practice I think it is rare
+                // for struct patterns to be multi-line).
+                let offset = offset + path.len() + 3;
+
+                let items = itemize_list(context.codemap,
+                                         fields.iter(),
+                                         terminator,
+                                         |f| f.span.lo,
+                                         |f| f.span.hi,
+                                         |f| f.node.rewrite(context, budget, offset),
+                                         span_after(self.span, "{", context.codemap),
+                                         self.span.hi);
+                let mut field_string = try_opt!(format_item_list(items,
+                                                                 budget,
+                                                                 offset,
+                                                                 context.config));
+                if elipses {
+                    if field_string.contains('\n') {
+                        field_string.push_str(",\n");
+                        field_string.push_str(&offset.to_string(context.config));
+                        field_string.push_str("..");
+                    } else {
+                        if field_string.len() > 0 {
+                            field_string.push_str(", ");
+                        }
+                        field_string.push_str("..");
+                    }
+                }
+
+                if field_string.len() == 0 {
+                    Some(format!("{} {{}}", path))
+                } else {
+                    Some(format!("{} {{ {} }}", path, field_string))
+                }
+            }
+            // FIXME(#819) format pattern macros.
             Pat_::PatMac(..) => {
                 wrap_str(context.snippet(self.span),
                          context.config.max_width,
@@ -97,3 +173,14 @@ fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Opt
         }
     }
 }
+
+impl Rewrite for FieldPat {
+    fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Option<String> {
+        let pat = self.pat.rewrite(context, width, offset);
+        if self.is_shorthand {
+            pat
+        } else {
+            Some(format!("{}: {}", self.ident.to_string(), try_opt!(pat)))
+        }
+    }
+}

diff --git a/tests/source/pattern.rs b/tests/source/pattern.rs
index 930ffe2258f637552342dc80d145c690865f174e..75f65806167b5aee82b2be66b129bae93b6c49a0 100644 (file)
--- a/tests/source/pattern.rs
+++ b/tests/source/pattern.rs
@@ -11,6 +11,20 @@ fn main() {
     let Some ( ref   xyz  /*   comment!   */) = opt;
 
     if let  None  =   opt2 { panic!("oh noes"); }
+
+    let foo@bar (f) = 42;
+    let a::foo ( ..) = 42;
+    let [ ] = 42;
+    let [a..,     b,c ] = 42;
+    let [ a,b,c.. ] = 42;
+    let [a,    b, c, d..,e,f,     g] = 42;
+    let foo {   } = 42;
+    let foo {..} = 42;
+    let foo { x, y: ref foo,     .. } = 42;
+    let foo { x, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo,     .. } = 42;
+    let foo { x,       yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo,      } = 42;
+    let foo { x, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo,     .. };
+    let foo { x,       yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo,      };
 }
 
 impl<'a,'b> ResolveGeneratedContentFragmentMutator<'a,'b> {

diff --git a/tests/system.rs b/tests/system.rs
index 497583f9d672c85a0ebf40dce50b7ab4e08da518..bc5298ae22db1de3744e55b0fad6545c38540754 100644 (file)
--- a/tests/system.rs
+++ b/tests/system.rs
@@ -287,6 +287,8 @@ fn handle_result(result: HashMap<String, String>,
 
         if fmt_text != text {
             let diff = make_diff(&text, &fmt_text, DIFF_CONTEXT_SIZE);
+            assert!(!diff.is_empty(),
+                    "Empty diff? Maybe due to a missing a newline at the end of a file?");
             failures.insert(file_name, diff);
         }
     }

diff --git a/tests/target/match.rs b/tests/target/match.rs
index 94f9bf8ae5e4fa507c4ebd572b7948bcced01ec2..defcc13ef51adacbaefff2e558ba522bffc331b8 100644 (file)
--- a/tests/target/match.rs
+++ b/tests/target/match.rs
@@ -251,7 +251,7 @@ fn issue280() {
 
 fn issue383() {
     match resolution.last_private {
-        LastImport{..} => false,
+        LastImport { .. } => false,
         _ => true,
     };
 }

diff --git a/tests/target/pattern.rs b/tests/target/pattern.rs
index eb42f9fde739e49e735ee013255b7d93747ad855..d77cb59f4984738b7d8b1b4147424b8e9582a308 100644 (file)
--- a/tests/target/pattern.rs
+++ b/tests/target/pattern.rs
@@ -13,6 +13,23 @@ fn main() {
     if let None = opt2 {
         panic!("oh noes");
     }
+
+    let foo @ bar(f) = 42;
+    let a::foo(..) = 42;
+    let [] = 42;
+    let [a.., b, c] = 42;
+    let [a, b, c..] = 42;
+    let [a, b, c, d.., e, f, g] = 42;
+    let foo {} = 42;
+    let foo { .. } = 42;
+    let foo { x, y: ref foo, .. } = 42;
+    let foo { x, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo, .. } = 42;
+    let foo { x, yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo } = 42;
+    let foo { x,
+              yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo,
+              .. };
+    let foo { x,
+              yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy: ref foo };
 }
 
 impl<'a, 'b> ResolveGeneratedContentFragmentMutator<'a, 'b> {