Implement #102

README.md

@@ -40,6 +40,7 @@ found in .editorconfig files.
 * **--space_after_cast**: See **dfmt_space_after_cast** below
 * **--split_operator_at_line_end**: See **dfmt_split_operator_at_line_end** below
 * **--tab_width**: See **tab_width** below
+* **--selective_import_space**: See **dfmt_selective_import_space** below
 
 ### Example
 ```
@@ -94,6 +95,7 @@ dfmt_outdent_attributes (Not yet implemented) | `true`, `false` | `true` | Decre
 dfmt_split_operator_at_line_end | `true`, `false` | `false` | Place operators on the end of the previous line when splitting lines
 dfmt_space_after_cast | `true`, `false` | `false` | Insert space after the closing paren of a `cast` expression
 dfmt_space_after_keywords (Not yet implemented) | `true`, `false` | `true` | Insert space after `if`, `while`, `foreach`, etc, and before the `(`
+dfmt_selective_import_space | `true`, `false` | `true` | Insert space after the module name and before the `:` for selective imports
 
 ## Terminology
 * Braces - `{` and `}`

src/dfmt/config.d

@@ -38,6 +38,8 @@ struct Config
     OptionalBoolean dfmt_space_after_keywords;
     ///
     OptionalBoolean dfmt_split_operator_at_line_end;
+    ///
+    OptionalBoolean dfmt_selective_import_space;
 
     mixin StandardEditorConfigFields;
 
@@ -62,6 +64,7 @@ struct Config
         dfmt_space_after_cast = OptionalBoolean.t;
         dfmt_space_after_keywords = OptionalBoolean.t;
         dfmt_split_operator_at_line_end = OptionalBoolean.f;
+        dfmt_selective_import_space = OptionalBoolean.t;
     }
 
     /**
@@ -74,7 +77,8 @@ struct Config
 
         if (dfmt_soft_max_line_length > max_line_length)
         {
-            stderr.writeln("Column hard limit must be greater than or equal to column soft limit");
+            stderr.writefln("Column hard limit (%d) must be greater than or equal to column soft limit (%d)",
+                max_line_length, dfmt_soft_max_line_length);
             return false;
         }
         return true;

src/dfmt/formatter.d

@@ -341,7 +341,7 @@ private:
                     break;
                 }
                 else if (t == tok!"import" && !currentIs(tok!"import") && !currentIs(tok!"}")
-						&& !(currentIs(tok!"public") && peekIs(tok!"import")))
+                        && !(currentIs(tok!"public") && peekIs(tok!"import")))
                 {
                     simpleNewline();
                     currentLineLength = 0;
@@ -352,6 +352,13 @@ private:
                     newline();
                 break;
             }
+            else if (currentIs(tok!":"))
+            {
+                if (config.dfmt_selective_import_space)
+                    write(" ");
+                writeToken();
+                write(" ");
+            }
             else if (currentIs(tok!","))
             {
                 // compute length until next ',' or ';'
@@ -668,7 +675,7 @@ private:
             || astInformation.conditionalWithElseLocations.canFindIndex(current.index);
         immutable bool c = b
             || astInformation.conditionalStatementLocations.canFindIndex(current.index);
-		immutable bool shouldPushIndent = c && !(currentIs(tok!"if") && indents.topIsWrap());
+        immutable bool shouldPushIndent = c && !(currentIs(tok!"if") && indents.topIsWrap());
         if (currentIs(tok!"out") && !peekBackIs(tok!"}"))
             newline();
         if (shouldPushIndent)

src/dfmt/main.d

@@ -47,6 +47,9 @@ else
             case "split_operator_at_line_end":
                 optConfig.dfmt_split_operator_at_line_end = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
                 break;
+            case "selective_import_space":
+                optConfig.dfmt_selective_import_space = value == "true" ? OptionalBoolean.t : OptionalBoolean.f;
+                break;
             default: assert(false, "Invalid command-line switch");
             }
         }
@@ -66,6 +69,7 @@ else
                 "outdent_attributes", &handleBooleans,
                 "outdent_labels", &handleBooleans,
                 "space_after_cast", &handleBooleans,
+                "selective_import_space", &handleBooleans,
                 "split_operator_at_line_end", &handleBooleans,
                 "tab_width", &optConfig.tab_width);
         }