forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #104

This commit is contained in:
Hackerpilot 2015-03-20 14:06:16 -07:00
parent 78c8b14ee8
commit e815a8e1d2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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 * ```--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. the same line as the previous token.
* ```--braces=allman```: Use ["Allman Style"](https://en.wikipedia.org/wiki/Indent_style#Allman_style), * ```--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 placing opening braces on their own line. This is the default.
* ```--tabs```: Use tabs for indentation instead of spaces * ```--tabs```: Use tabs for indentation instead of spaces.

2
src/dfmt/formatter.d
View File

@ -519,7 +519,7 @@ private:
if (!justAddedExtraNewline && !peekBackIsOneOf(false, tok!"{", if (!justAddedExtraNewline && !peekBackIsOneOf(false, tok!"{",
tok!"}", tok!";", tok!";")) tok!"}", tok!";", tok!";"))
{ {
if (config.braceStyle == BraceStyle.otbs) if (config.braceStyle != BraceStyle.allman)
{ {
if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index) if (!astInformation.structInitStartLocations.canFindIndex(tokens[index].index)
&& !astInformation.funLitStartLocations.canFindIndex( && !astInformation.funLitStartLocations.canFindIndex(