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

Merge pull request #305 from stefan-koch-sociomantic/fix-301 

Fix issue #301
merged-on-behalf-of: stefan-koch-sociomantic <stefan-koch-sociomantic@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-11-28 11:57:31 +01:00 committed by GitHub
parent b227c66146 b69e966df6
commit 5ed20e0a3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dfmt/formatter.d
View File

@ -458,7 +458,10 @@ private:
else if (currentIs(tok!"{") && config.dfmt_brace_style == BraceStyle.allman) else if (currentIs(tok!"{") && config.dfmt_brace_style == BraceStyle.allman)
break; break;
else if (t == tok!"import" && !currentIs(tok!"import") else if (t == tok!"import" && !currentIs(tok!"import")
&& !currentIs(tok!"}") && !(currentIs(tok!"public") && !currentIs(tok!"}")
&& !((currentIs(tok!"public")
|| currentIs(tok!"private")
|| currentIs(tok!"static"))
&& peekIs(tok!"import")) && !indents.topIsOneOf(tok!"if", && peekIs(tok!"import")) && !indents.topIsOneOf(tok!"if",
tok!"debug", tok!"version")) tok!"debug", tok!"version"))
{ {