From 783410390ee38c35541c0db825906025e94be491 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 12 Mar 2015 11:48:53 -0700 Subject: [PATCH 1/4] Fix #92 --- src/dfmt.d | 10 ++++++++++ tests/issue0092.d | 12 ++++++++++++ tests/issue0092.d.ref | 12 ++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 tests/issue0092.d create mode 100644 tests/issue0092.d.ref diff --git a/src/dfmt.d b/src/dfmt.d index d8a9769..50647e0 100644 --- a/src/dfmt.d +++ b/src/dfmt.d @@ -954,6 +954,11 @@ private: } else if (currentIs(tok!"identifier") && peekIs(tok!":")) { + while ((peekBackIs(tok!"}", true) || peekBackIs(tok!";", true)) + && indents.length && isTempIndent(indents.top())) + { + indents.pop(); + } auto l = indents.indentToMostRecent(tok!"switch"); if (l != -1) { @@ -970,6 +975,11 @@ private: } else if (currentIs(tok!"case") || currentIs(tok!"default")) { + while ((peekBackIs(tok!"}", true) || peekBackIs(tok!";", true)) + && indents.length && isTempIndent(indents.top())) + { + indents.pop(); + } auto l = indents.indentToMostRecent(tok!"switch"); if (l != -1) indentLevel = l; diff --git a/tests/issue0092.d b/tests/issue0092.d new file mode 100644 index 0000000..64f2ab6 --- /dev/null +++ b/tests/issue0092.d @@ -0,0 +1,12 @@ +unittest +{ + switch (cast(uint) sz) + { + case 3: + if (!global.params.is64bit) + goto Lmemory; + case 4: + t1 = Type.tint32; + break; + } +} diff --git a/tests/issue0092.d.ref b/tests/issue0092.d.ref new file mode 100644 index 0000000..cdbff8c --- /dev/null +++ b/tests/issue0092.d.ref @@ -0,0 +1,12 @@ +unittest +{ + switch (cast(uint) sz) + { + case 3: + if (!global.params.is64bit) + goto Lmemory; + case 4: + t1 = Type.tint32; + break; + } +} From 5bca694cca3bbc6db3f520134234b9f0bec59253 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 12 Mar 2015 12:24:47 -0700 Subject: [PATCH 2/4] Fix #94 --- src/dfmt.d | 61 ++++++++++++++++++++++++++++++++++++++----- tests/issue0094.d | 6 +++++ tests/issue0094.d.ref | 6 +++++ 3 files changed, 66 insertions(+), 7 deletions(-) create mode 100644 tests/issue0094.d create mode 100644 tests/issue0094.d.ref diff --git a/src/dfmt.d b/src/dfmt.d index 50647e0..921190d 100644 --- a/src/dfmt.d +++ b/src/dfmt.d @@ -236,6 +236,7 @@ private: else if ((t == tok!"import" && !currentIs(tok!"import"))) { write("\n"); + currentLineLength = 0; justAddedExtraNewline = true; newline(); } @@ -490,6 +491,14 @@ private: { writeToken(); } + else if (assumeSorted(astInformation.funLitStartLocations) + .equalRange(tokens[index].index).length) + { + if (peekBackIs(tok!")")) + write(" "); + writeToken(); + write(" "); + } else { if (!justAddedExtraNewline && !peekBackIs(tok!"{") @@ -513,6 +522,12 @@ private: { writeToken(); } + else if (assumeSorted(astInformation.funLitEndLocations) + .equalRange(tokens[index].index).length) + { + write(" "); + writeToken(); + } else { // Silly hack to format enums better. @@ -523,13 +538,19 @@ private: assumeSorted(astInformation.doubleNewlineLocations) .equalRange(tokens[index].index).length && !peekIs(tok!"}")) { - output.put("\n"); + write("\n"); + currentLineLength = 0; justAddedExtraNewline = true; } if (config.braceStyle == BraceStyle.otbs && currentIs(tok!"else")) write(" "); - index++; - newline(); + if (!peekIs(tok!",") && !peekIs(tok!")")) + { + index++; + newline(); + } + else + index++; } break; case tok!".": @@ -711,12 +732,11 @@ private: { if (currentIs(tok!";")) { - if (!(peekIs(tok!";") || peekIs(tok!")"))) + if (!(peekIs(tok!";") || peekIs(tok!")") || peekIs(tok!"}"))) write("; "); else write(";"); index++; - continue; } else if (currentIs(tok!"(")) { @@ -731,7 +751,6 @@ private: newline(); } regenLineBreakHintsIfNecessary(index - 1); - continue; } else if (currentIs(tok!")")) { @@ -933,8 +952,17 @@ private: if (currentIs(tok!"comment") && current.line == tokenEndLine(tokens[index - 1])) return; - output.put("\n"); immutable bool hasCurrent = index + 1 < tokens.length; + + if (hasCurrent && tokens[index].type == tok!"}" && !assumeSorted( + astInformation.funLitEndLocations).equalRange(tokens[index].index).empty) + { + write(" "); + return; + } + + output.put("\n"); + if (!justAddedExtraNewline && index > 0 && hasCurrent && tokens[index].line - tokenEndLine(tokens[index - 1]) > 1) { @@ -986,6 +1014,8 @@ private: } else if (currentIs(tok!"{") && assumeSorted( astInformation.structInitStartLocations).equalRange( + tokens[index].index).empty && assumeSorted( + astInformation.funLitStartLocations).equalRange( tokens[index].index).empty) { while (indents.length && isWrapIndent(indents.top)) @@ -1142,6 +1172,8 @@ struct ASTInformation sort(caseEndLocations); sort(structInitStartLocations); sort(structInitEndLocations); + sort(funLitStartLocations); + sort(funLitEndLocations); } /// Locations of end braces for struct bodies @@ -1164,6 +1196,12 @@ struct ASTInformation /// Closing braces of struct initializers size_t[] structInitEndLocations; + + /// Opening braces of function literals + size_t[] funLitStartLocations; + + /// Closing braces of function literals + size_t[] funLitEndLocations; } /// Collects information from the AST that is useful for the formatter @@ -1175,6 +1213,15 @@ final class FormatVisitor : ASTVisitor this.astInformation = astInformation; } + override void visit(const FunctionLiteralExpression funcLit) + { + astInformation.funLitStartLocations ~= funcLit.functionBody + .blockStatement.startLocation; + astInformation.funLitEndLocations ~= funcLit.functionBody + .blockStatement.endLocation; + funcLit.accept(this); + } + override void visit(const DefaultStatement defaultStatement) { astInformation.caseEndLocations ~= defaultStatement.colonLocation; diff --git a/tests/issue0094.d b/tests/issue0094.d new file mode 100644 index 0000000..0a70537 --- /dev/null +++ b/tests/issue0094.d @@ -0,0 +1,6 @@ +void test() +{ + fun((int x) { writeln(x); }, (int x) { writeln(x); }); + + return; +} diff --git a/tests/issue0094.d.ref b/tests/issue0094.d.ref new file mode 100644 index 0000000..0a70537 --- /dev/null +++ b/tests/issue0094.d.ref @@ -0,0 +1,6 @@ +void test() +{ + fun((int x) { writeln(x); }, (int x) { writeln(x); }); + + return; +} From c3cb505dfe17756d9d69a10148a94d75bf07e294 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 12 Mar 2015 12:32:27 -0700 Subject: [PATCH 3/4] Update test case for #92 --- tests/issue0092.d | 5 +++++ tests/issue0092.d.ref | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/tests/issue0092.d b/tests/issue0092.d index 64f2ab6..8cc1dfa 100644 --- a/tests/issue0092.d +++ b/tests/issue0092.d @@ -8,5 +8,10 @@ unittest case 4: t1 = Type.tint32; break; + case 5: + if (!global.params.is64bit) + goto Lmemory; + default: + break; } } diff --git a/tests/issue0092.d.ref b/tests/issue0092.d.ref index cdbff8c..20ce17a 100644 --- a/tests/issue0092.d.ref +++ b/tests/issue0092.d.ref @@ -8,5 +8,10 @@ unittest case 4: t1 = Type.tint32; break; + case 5: + if (!global.params.is64bit) + goto Lmemory; + default: + break; } } From 98d397cd22da83f75c957e4941ce177ae28d6c6d Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 12 Mar 2015 12:46:21 -0700 Subject: [PATCH 4/4] Fix #93 --- src/dfmt.d | 21 ++++++++++++--------- tests/issue0039.d.ref | 3 ++- tests/issue0093.d | 12 ++++++++++++ tests/issue0093.d.ref | 12 ++++++++++++ 4 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 tests/issue0093.d create mode 100644 tests/issue0093.d.ref diff --git a/src/dfmt.d b/src/dfmt.d index 921190d..a3179f9 100644 --- a/src/dfmt.d +++ b/src/dfmt.d @@ -300,8 +300,7 @@ private: writeToken(); // switch write(" "); } - else if ((currentIs(tok!"version") || currentIs(tok!"extern")) - && peekIs(tok!"(")) + else if (currentIs(tok!"extern") && peekIs(tok!"(")) { writeToken(); write(" "); @@ -326,13 +325,13 @@ private: if (currentIs(tok!"if") || (currentIs(tok!"static") && peekIs(tok!"if")) || currentIs(tok!"version")) { - if (indents.top() == tok!"if") + if (indents.top() == tok!"if" || indents.top == tok!"version") indents.pop(); write(" "); } else if (!currentIs(tok!"{") && !currentIs(tok!"comment")) { - if (indents.top() == tok!"if") + if (indents.top() == tok!"if" || indents.top == tok!"version") indents.pop(); indents.push(tok!"else"); newline(); @@ -941,13 +940,14 @@ private: auto t = tokens[i + index].type; return t == tok!"for" || t == tok!"foreach" || t == tok!"foreach_reverse" || t == tok!"while" - || t == tok!"if" || t == tok!"out" + || t == tok!"if" || t == tok!"out" || t == tok!"version" || t == tok!"catch" || t == tok!"with"; } void newline() { import std.range : assumeSorted; + import std.algorithm : max; if (currentIs(tok!"comment") && current.line == tokenEndLine(tokens[index - 1])) return; @@ -976,9 +976,11 @@ private: bool switchLabel = false; if (currentIs(tok!"else")) { - auto l = indents.indentToMostRecent(tok!"if"); - if (l != -1) - indentLevel = l; + auto i = indents.indentToMostRecent(tok!"if"); + auto v = indents.indentToMostRecent(tok!"version"); + auto mostRecent = max(i, v); + if (mostRecent != -1) + indentLevel = mostRecent; } else if (currentIs(tok!"identifier") && peekIs(tok!":")) { @@ -1037,7 +1039,8 @@ private: indents.pop(); } while (indents.length && isTempIndent(indents.top) - && (indents.top != tok!"if" || !peekIs(tok!"else"))) + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) { indents.pop(); } diff --git a/tests/issue0039.d.ref b/tests/issue0039.d.ref index 206b331..2e19d4a 100644 --- a/tests/issue0039.d.ref +++ b/tests/issue0039.d.ref @@ -1 +1,2 @@ -version (AArch64) int x = 10; +version (AArch64) + int x = 10; diff --git a/tests/issue0093.d b/tests/issue0093.d new file mode 100644 index 0000000..193ea29 --- /dev/null +++ b/tests/issue0093.d @@ -0,0 +1,12 @@ +unittest +{ + if (x) + { + version (none) + { + } + else + { + } + } +} diff --git a/tests/issue0093.d.ref b/tests/issue0093.d.ref new file mode 100644 index 0000000..193ea29 --- /dev/null +++ b/tests/issue0093.d.ref @@ -0,0 +1,12 @@ +unittest +{ + if (x) + { + version (none) + { + } + else + { + } + } +}