From e815a8e1d2f7ba9e4b94d627be8a2bd62e719272 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 20 Mar 2015 14:06:16 -0700 Subject: [PATCH] Fix #104 --- README.md | 4 ++-- src/dfmt/formatter.d | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 86d7072..cb5cb48 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ file instead, and output will be written to ```stdout```. * ```--braces=otbs```: Use ["The One True Brace Style"](https://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS), placing open braces on the same line as the previous token. * ```--braces=allman```: Use ["Allman Style"](https://en.wikipedia.org/wiki/Indent_style#Allman_style), - placing opening braces on their own line. This is the default -* ```--tabs```: Use tabs for indentation instead of spaces + placing opening braces on their own line. This is the default. +* ```--tabs```: Use tabs for indentation instead of spaces. diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 19a6af2..1bef9d6 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -519,7 +519,7 @@ private: if (!justAddedExtraNewline && !peekBackIsOneOf(false, tok!"{", tok!"}", tok!";", tok!";")) { - if (config.braceStyle == BraceStyle.otbs) + if (config.braceStyle != BraceStyle.allman) { if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index) && !astInformation.funLitStartLocations.canFindIndex(