Use concat() instead of join("")

[rust.git] / src / rewrite.rs

diff --git a/src/rewrite.rs b/src/rewrite.rs
index e3a239430a5e891ce3aee283db69761b31370098..17bb027bd5685b64a41fa0f2e1409aafc318e784 100644 (file)
--- a/src/rewrite.rs
+++ b/src/rewrite.rs
@@ -10,54 +10,66 @@
 
 // A generic trait to abstract the rewriting of an element (of the AST).
 
-use syntax::codemap::{CodeMap, Span};
+use syntax::parse::ParseSess;
+use syntax::ptr;
+use syntax::source_map::{SourceMap, Span};
 
-use config::Config;
+use config::{Config, IndentStyle};
+use shape::Shape;
+use visitor::SnippetProvider;
+use FormatReport;
+
+use std::cell::RefCell;
 
 pub trait Rewrite {
-    /// Rewrite self into offset and width.
-    /// `offset` is the indentation of the first line. The next lines
-    /// should begin with a least `offset` spaces (except backwards
-    /// indentation). The first line should not begin with indentation.
-    /// `width` is the maximum number of characters on the last line
-    /// (excluding offset). The width of other lines is not limited by
-    /// `width`.
-    fn rewrite(&self, context: &RewriteContext, width: usize, offset: usize) -> Option<String>;
+    /// Rewrite self into shape.
+    fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String>;
 }
 
+impl<T: Rewrite> Rewrite for ptr::P<T> {
+    fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
+        (**self).rewrite(context, shape)
+    }
+}
+
+#[derive(Clone)]
 pub struct RewriteContext<'a> {
-    pub codemap: &'a CodeMap,
+    pub parse_session: &'a ParseSess,
+    pub source_map: &'a SourceMap,
     pub config: &'a Config,
-
-    // Indentation due to nesting of blocks.
-    pub block_indent: usize,
-    // *Extra* indentation due to overflowing to the next line, e.g.,
-    // let foo =
-    //     bar();
-    // The extra 4 spaces when formatting `bar()` is overflow_indent.
-    pub overflow_indent: usize,
+    pub inside_macro: RefCell<bool>,
+    // Force block indent style even if we are using visual indent style.
+    pub use_block: RefCell<bool>,
+    // When `is_if_else_block` is true, unindent the comment on top
+    // of the `else` or `else if`.
+    pub is_if_else_block: RefCell<bool>,
+    // When rewriting chain, veto going multi line except the last element
+    pub force_one_line_chain: RefCell<bool>,
+    pub snippet_provider: &'a SnippetProvider<'a>,
+    // Used for `format_snippet`
+    pub(crate) macro_rewrite_failure: RefCell<bool>,
+    pub(crate) report: FormatReport,
 }
 
 impl<'a> RewriteContext<'a> {
-    pub fn nested_context(&self) -> RewriteContext<'a> {
-        RewriteContext {
-            codemap: self.codemap,
-            config: self.config,
-            block_indent: self.block_indent + self.config.tab_spaces,
-            overflow_indent: self.overflow_indent,
-        }
+    pub fn snippet(&self, span: Span) -> &str {
+        self.snippet_provider.span_to_snippet(span).unwrap()
+    }
+
+    /// Return true if we should use block indent style for rewriting function call.
+    pub fn use_block_indent(&self) -> bool {
+        self.config.indent_style() == IndentStyle::Block || *self.use_block.borrow()
+    }
+
+    pub fn budget(&self, used_width: usize) -> usize {
+        self.config.max_width().saturating_sub(used_width)
     }
 
-    pub fn overflow_context(&self) -> RewriteContext<'a> {
-        RewriteContext {
-            codemap: self.codemap,
-            config: self.config,
-            block_indent: self.block_indent,
-            overflow_indent: self.overflow_indent + self.config.tab_spaces,
-        }
+    pub fn inside_macro(&self) -> bool {
+        *self.inside_macro.borrow()
     }
 
-    pub fn snippet(&self, span: Span) -> String {
-        self.codemap.span_to_snippet(span).unwrap()
+    pub fn is_if_else_block(&self) -> bool {
+        *self.is_if_else_block.borrow()
     }
 }