add indent option to cmdline formatter

pkg/analyzer/bin/formatter.dart

Index: pkg/analyzer/bin/formatter.dart
diff --git a/pkg/analyzer/bin/formatter.dart b/pkg/analyzer/bin/formatter.dart
index 400b309eff144d4f5e4a8aa19225ebe1e7fb9102..69674dbfbc333a1bbc65b55139fc405085490f60 100755
--- a/pkg/analyzer/bin/formatter.dart
+++ b/pkg/analyzer/bin/formatter.dart
@@ -34,6 +34,7 @@ const WRITE_FLAG = 'write';
 const SELECTION_FLAG = 'selection';
 const TRANSFORM_FLAG = 'transform';
 const MAX_LINE_FLAG = 'max_line_length';
+const INDENT_FLAG = 'indent';
 
 
 const FOLLOW_LINKS = false;
@@ -61,11 +62,29 @@ _readOptions(options) {
   machineFormat = options[MACHINE_FLAG];
   overwriteFileContents = options[WRITE_FLAG];
   selection = _parseSelection(options[SELECTION_FLAG]);
-  formatterSettings =
-      new FormatterOptions(codeTransforms: options[TRANSFORM_FLAG],
-          pageWidth: _parseLineLength(options[MAX_LINE_FLAG]));
+  formatterSettings = new FormatterOptions(
+      codeTransforms: options[TRANSFORM_FLAG],
+      tabsForIndent: _parseTabsForIndent(options[INDENT_FLAG]),
+      spacesPerIndent: _parseSpacesPerIndent(options[INDENT_FLAG]),
+      pageWidth: _parseLineLength(options[MAX_LINE_FLAG]));
 }
 
+/// Translate the indent option into spaces per indent.
+int _parseSpacesPerIndent(String indentOption) {
+  if (indentOption == 'tab') {
+    return 1;
+  }
+  int spacesPerIndent = _toInt(indentOption);
+  if (spacesPerIndent == null) {
+    throw new FormatterException('Indentation is specified as an Integer or '
+        'the value "tab".');
+  }
+  return spacesPerIndent;
+}
+
+/// Translate the indent option into tabs for indent.
+bool _parseTabsForIndent(String indentOption) => indentOption == 'tab';
+
 CodeKind _parseKind(kindOption) {
   switch(kindOption) {
     case 'stmt' :
@@ -176,6 +195,9 @@ ArgParser _initArgParser() {
   parser.addOption(MAX_LINE_FLAG, abbr: 'l', defaultsTo: '80',
       help: 'Wrap lines longer than this length. '
             'To never wrap, specify "Infinity" or "Inf" for short.');
+  parser.addOption(INDENT_FLAG, abbr: 'i', defaultsTo: '2',
+      help: 'Specify number of spaces per indentation. '
+            'To indent using tabs, specify "--$INDENT_FLAG tab".');

[pquitslund, 2014/03/07 19:21:45]

As discussed, let's make this option hidden.

Also worth confirming (maybe with Luke) that 'indent' is the best name for this
flag.

[danrubel, 2014/03/11 14:22:36]

Done.

   parser.addOption(KIND_FLAG, abbr: 'k', defaultsTo: 'cu',
       help: 'Specify source snippet kind ("stmt" or "cu") '
             '--- [PROVISIONAL API].', hide: true);