Merge pull request #24 from Koihik/fix-indent-use-tab

fix: incorrect indent when use tab

Author: Koihik

src/Config.cpp

@@ -12,6 +12,7 @@ Config::Config() {
     map_["column_limit"] = "80";
     map_["indent_width"] = "4";
     map_["use_tab"] = "false";
+    map_["tab_width"] = "4";
     map_["continuation_indent_width"] = "4";
 
     map_["keep_simple_block_one_line"] = "true";

src/Config.h

@@ -26,6 +26,7 @@ class Config {
     BIND_INT(column_limit);
     BIND_INT(indent_width);
     BIND_BOOL(use_tab);
+    BIND_INT(tab_width);
     BIND_INT(continuation_indent_width);
 
     BIND_BOOL(keep_simple_block_one_line);

src/FormatVisitor.cpp

@@ -1616,10 +1616,16 @@ string FormatVisitor::indent() {
 
 string FormatVisitor::indentWithAlign() {
     stringstream ss;
-    for (int i = 0; i < indent_ + indentForAlign_; i++) {
-        if (config_.use_tab()) {
+    if (config_.use_tab()) {
+        int indent = indent_;
+        int tabWidth = config_.tab_width();
+        indent += indentForAlign_ / tabWidth;
+        if (indentForAlign_ % tabWidth) indent++;
+        for (int i = 0; i < indent; i++) {
             ss << "\t";
-        } else {
+        }
+    } else {
+        for (int i = 0; i < indent_ + indentForAlign_; i++) {
             ss << " ";
         }
     }