Initial implementation of hard tab indentation.

Author: SiegeLordEx

src/chains.rs

@@ -19,6 +19,7 @@
 // we put each subexpression on a separate, much like the (default) function
 // argument function argument strategy.
 
+use Indent;
 use rewrite::{Rewrite, RewriteContext};
 use utils::{first_line_width, make_indent};
 use expr::rewrite_call;
@@ -30,7 +31,7 @@ use syntax::print::pprust;
 pub fn rewrite_chain(mut expr: &ast::Expr,
                      context: &RewriteContext,
                      width: usize,
-                     offset: usize)
+                     offset: Indent)
                      -> Option<String> {
     let total_span = expr.span;
     let mut subexpr_list = vec![expr];
@@ -116,7 +117,7 @@ pub fn rewrite_chain(mut expr: &ast::Expr,
     let connector = if fits_single_line {
         String::new()
     } else {
-        format!("\n{}", make_indent(indent))
+        format!("\n{}", make_indent(indent, context.config))
     };
 
     let first_connector = if extend {
@@ -145,7 +146,7 @@ fn rewrite_chain_expr(expr: &ast::Expr,
                       span: Span,
                       context: &RewriteContext,
                       width: usize,
-                      offset: usize)
+                      offset: Indent)
                       -> Option<String> {
     match expr.node {
         ast::Expr_::ExprMethodCall(ref method_name, ref types, ref expressions) => {
@@ -179,7 +180,7 @@ fn rewrite_method_call(method_name: ast::Ident,
                        span: Span,
                        context: &RewriteContext,
                        width: usize,
-                       offset: usize)
+                       offset: Indent)
                        -> Option<String> {
     let type_str = if types.is_empty() {
         String::new()

src/comment.rs

@@ -12,10 +12,17 @@
 
 use std::iter;
 
+use Indent;
+use config::Config;
 use string::{StringFormat, rewrite_string};
 use utils::make_indent;
 
-pub fn rewrite_comment(orig: &str, block_style: bool, width: usize, offset: usize) -> String {
+pub fn rewrite_comment(orig: &str,
+                       block_style: bool,
+                       width: usize,
+                       offset: Indent,
+                       config: &Config)
+                       -> String {
     let s = orig.trim();
 
     // Edge case: block comments. Let's not trim their lines (for now).
@@ -33,11 +40,12 @@ pub fn rewrite_comment(orig: &str, block_style: bool, width: usize, offset: usiz
         line_start: line_start,
         line_end: "",
         width: max_chars,
-        offset: offset + opener.len() - line_start.len(),
+        offset: offset + (opener.len() - line_start.len()),
         trim_end: true,
+        config: config,
     };
 
-    let indent_str = make_indent(offset);
+    let indent_str = make_indent(offset, config);
     let line_breaks = s.chars().filter(|&c| c == '\n').count();
 
     let (_, mut s) = s.lines()
@@ -288,24 +296,33 @@ impl<T> Iterator for CharClasses<T> where T: Iterator, T::Item: RichChar {
 mod test {
     use super::{CharClasses, CodeCharKind, contains_comment, rewrite_comment, FindUncommented};
 
+    use std::default::Default;
+
+    use Indent;
+
     #[test]
     fn format_comments() {
-        assert_eq!("/* test */", rewrite_comment(" //test", true, 100, 100));
-        assert_eq!("// comment\n// on a", rewrite_comment("// comment on a", false, 10, 0));
+        let config = Default::default();
+        assert_eq!("/* test */", rewrite_comment(" //test", true, 100, Indent::new(0, 100),
+                                                 &config));
+        assert_eq!("// comment\n// on a", rewrite_comment("// comment on a", false, 10,
+                                                          Indent::new(0, 0), &config));
 
         assert_eq!("//  A multi line comment\n            // between args.",
                    rewrite_comment("//  A multi line comment\n             // between args.",
                                    false,
                                    60,
-                                   12));
+                                   Indent::new(0, 12),
+                                   &config));
 
         let input = "// comment";
         let expected = "/* com\n                                                                      \
                         * men\n                                                                      \
                         * t */";
-        assert_eq!(expected, rewrite_comment(input, true, 9, 69));
+        assert_eq!(expected, rewrite_comment(input, true, 9, Indent::new(0, 69), &config));
 
-        assert_eq!("/* trimmed */", rewrite_comment("/*   trimmed    */", true, 100, 100));
+        assert_eq!("/* trimmed */", rewrite_comment("/*   trimmed    */", true, 100,
+                                                    Indent::new(0, 100), &config));
     }
 
     // This is probably intended to be a non-test fn, but it is not used. I'm

src/config.rs

@@ -152,6 +152,7 @@ create_config! {
     chains_overflow_last: bool,
     take_source_hints: bool, // Retain some formatting characteristics from
                              // the source code.
+    hard_tabs: bool,
 }
 
 impl Default for Config {
@@ -185,6 +186,7 @@ impl Default for Config {
             format_strings: true,
             chains_overflow_last: true,
             take_source_hints: true,
+            hard_tabs: false,
         }
     }
 }