From dc8e7a087c5d305e44da5a635ba56a85c63c4625 Mon Sep 17 00:00:00 2001 From: BBasile Date: Fri, 2 Nov 2018 06:05:52 +0100 Subject: [PATCH 01/92] Prevent running CI twice when PR originated from origin (#408) Prevent running CI twice when PR originated from origin merged-on-behalf-of: BBasile --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3ce2881..41fc3ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,10 @@ os: - linux # - osx # disabled until travis has more mac resources +branches: + only: + - master + env: - BUILD= - BUILD=dub From 67664c28351d13ac66e36d8b6b2e92908c761aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= Date: Tue, 6 Nov 2018 16:40:25 +0100 Subject: [PATCH 02/92] Don't put spaces inside empty braces --- src/dfmt/formatter.d | 5 +++-- tests/allman/issue0119.d.ref | 4 ++-- tests/allman/issue0287.d.ref | 2 +- tests/otbs/issue0119.d.ref | 4 ++-- tests/otbs/issue0287.d.ref | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 19b5312..bd47b93 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -805,7 +805,8 @@ private: else { niBraceDepth++; - write(" "); + if (!currentIs(tok!"}")) + write(" "); } } else @@ -872,7 +873,7 @@ private: { if (niBraceDepth > 0) { - if (!peekBackIsSlashSlash()) + if (!peekBackIsSlashSlash() && !peekBackIs(tok!"{")) write(" "); niBraceDepth--; } diff --git a/tests/allman/issue0119.d.ref b/tests/allman/issue0119.d.ref index cf1d9c3..57fcdd0 100644 --- a/tests/allman/issue0119.d.ref +++ b/tests/allman/issue0119.d.ref @@ -1,5 +1,5 @@ -auto fun = function() { }; -auto fun = () { }; +auto fun = function() {}; +auto fun = () {}; auto fun = {}; auto fun = { int i; }; diff --git a/tests/allman/issue0287.d.ref b/tests/allman/issue0287.d.ref index 461addf..9966542 100644 --- a/tests/allman/issue0287.d.ref +++ b/tests/allman/issue0287.d.ref @@ -1,3 +1,3 @@ alias foo = typeof({ import std.math; }); alias bar = typeof({ write("aaa"); }); -alias baz = typeof({ }); +alias baz = typeof({}); diff --git a/tests/otbs/issue0119.d.ref b/tests/otbs/issue0119.d.ref index 7ca23f6..9f0d8d1 100644 --- a/tests/otbs/issue0119.d.ref +++ b/tests/otbs/issue0119.d.ref @@ -1,5 +1,5 @@ -auto fun = function() { }; -auto fun = () { }; +auto fun = function() {}; +auto fun = () {}; auto fun = {}; auto fun = { int i; }; diff --git a/tests/otbs/issue0287.d.ref b/tests/otbs/issue0287.d.ref index 461addf..9966542 100644 --- a/tests/otbs/issue0287.d.ref +++ b/tests/otbs/issue0287.d.ref @@ -1,3 +1,3 @@ alias foo = typeof({ import std.math; }); alias bar = typeof({ write("aaa"); }); -alias baz = typeof({ }); +alias baz = typeof({}); From f4417dc1b54149076749179307860b57667e88db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= Date: Sat, 10 Nov 2018 14:02:31 +0100 Subject: [PATCH 03/92] Update libdparse to v0.10.x (#410) Update libdparse to v0.10.x merged-on-behalf-of: BBasile --- dub.json | 2 +- libdparse | 2 +- src/dfmt/ast_info.d | 28 ++++++++++++++++++---------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dub.json b/dub.json index 65bcaf5..f48228a 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.9.10" + "libdparse": "~>0.10.7" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index f8460d0..15c8d2e 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit f8460d0d3581bebd41ee8629bd3e253c94c8a387 +Subproject commit 15c8d2ef166b633825e971eb914d4d78eb33b3ac diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index bfc8d8f..e8157b9 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -214,9 +214,9 @@ final class FormatVisitor : ASTVisitor override void visit(const FunctionLiteralExpression funcLit) { - if (funcLit.functionBody !is null) + if (funcLit.specifiedFunctionBody !is null) { - const bs = funcLit.functionBody.blockStatement; + const bs = funcLit.specifiedFunctionBody.blockStatement; astInformation.funLitStartLocations ~= bs.startLocation; astInformation.funLitEndLocations ~= bs.endLocation; @@ -244,15 +244,11 @@ final class FormatVisitor : ASTVisitor caseRangeStatement.accept(this); } - override void visit(const FunctionBody functionBody) + override void visit(const SpecifiedFunctionBody specifiedFunctionBody) { - if (functionBody.blockStatement !is null) - astInformation.doubleNewlineLocations ~= functionBody.blockStatement.endLocation; - if (functionBody.bodyStatement !is null && functionBody.bodyStatement - .blockStatement !is null) - astInformation.doubleNewlineLocations - ~= functionBody.bodyStatement.blockStatement.endLocation; - functionBody.accept(this); + if (specifiedFunctionBody.blockStatement !is null) + astInformation.doubleNewlineLocations ~= specifiedFunctionBody.blockStatement.endLocation; + specifiedFunctionBody.accept(this); } override void visit(const StructInitializer structInitializer) @@ -367,12 +363,24 @@ final class FormatVisitor : ASTVisitor storageClass.accept(this); } + override void visit(const InContractExpression inContractExpression) + { + astInformation.contractLocations ~= inContractExpression.inTokenLocation; + inContractExpression.accept(this); + } + override void visit(const InStatement inStatement) { astInformation.contractLocations ~= inStatement.inTokenLocation; inStatement.accept(this); } + override void visit(const OutContractExpression outContractExpression) + { + astInformation.contractLocations ~= outContractExpression.outTokenLocation; + outContractExpression.accept(this); + } + override void visit(const OutStatement outStatement) { astInformation.contractLocations ~= outStatement.outTokenLocation; From 5508e9ced1259bdde3868e98e3f9560d8847bea8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= Date: Wed, 14 Nov 2018 17:32:27 +0100 Subject: [PATCH 04/92] Fix #407 - `dub run dfmt` keeps building dfmt anew each time --- dub.json | 2 +- dubhash.d | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 dubhash.d diff --git a/dub.json b/dub.json index f48228a..f51d6ce 100644 --- a/dub.json +++ b/dub.json @@ -15,6 +15,6 @@ "built_with_dub" ], "preGenerateCommands" : [ - "rdmd --eval=\"auto dir=environment.get(\\\"DUB_PACKAGE_DIR\\\"); dir.buildPath(\\\"bin\\\").mkdirRecurse; auto gitVer = (\\\"git -C \\\"~dir~\\\" describe --tags\\\").executeShell; (gitVer.status == 0 ? gitVer.output.strip : \\\"v\\\" ~ dir.dirName.baseName.findSplitAfter(environment.get(\\\"DUB_ROOT_PACKAGE\\\")~\\\"-\\\")[1]).ifThrown(\\\"0.0.0\\\").chain(newline).to!string.toFile(dir.buildPath(\\\"bin\\\", \\\"dubhash.txt\\\"));\"" + "rdmd dubhash.d" ] } diff --git a/dubhash.d b/dubhash.d new file mode 100644 index 0000000..7f11ca5 --- /dev/null +++ b/dubhash.d @@ -0,0 +1,23 @@ +import std.algorithm; +import std.ascii; +import std.conv; +import std.exception; +import std.file; +import std.path; +import std.process; +import std.range; +import std.string; + +void main() +{ + auto dir = environment.get("DUB_PACKAGE_DIR"); + auto hashFile = dir.buildPath("bin", "dubhash.txt"); + auto gitVer = executeShell("git -C " ~ dir ~ " describe --tags"); + auto ver = (gitVer.status == 0 ? gitVer.output.strip + : "v" ~ dir.dirName.baseName.findSplitAfter( + environment.get("DUB_ROOT_PACKAGE") ~ "-")[1]).ifThrown("0.0.0") + .chain(newline).to!string.strip; + dir.buildPath("bin").mkdirRecurse; + if (!hashFile.exists || ver != hashFile.readText.strip) + hashFile.write(ver); +} From ced64acae07bcd7704796dbc8a54fd921962757a Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Sun, 9 Dec 2018 12:56:38 +0100 Subject: [PATCH 05/92] fix dub dependency build (fix #413) (#414) --- dub.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dub.json b/dub.json index f51d6ce..5235238 100644 --- a/dub.json +++ b/dub.json @@ -15,6 +15,6 @@ "built_with_dub" ], "preGenerateCommands" : [ - "rdmd dubhash.d" + "rdmd $PACKAGE_DIR/dubhash.d" ] } From 909164708a24465bd4f56248a49d915ea827bb11 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Thu, 27 Dec 2018 16:37:32 +0100 Subject: [PATCH 06/92] Build tagged releases in CIs --- .travis.yml | 1 + appveyor.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 41fc3ef..a4103ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ os: branches: only: - master + - /^v\d+\.\d+\.\d+([+-]\S*)*$/ env: - BUILD= diff --git a/appveyor.yml b/appveyor.yml index 0efb6ac..20eb3ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,6 +24,7 @@ skip_tags: false branches: only: - master + - /^v\d+\.\d+\.\d+([+-]\S*)*$/ install: - ps: function ResolveLatestDMD From c3537a5d51c0d94389a5cb82dfa623726426e767 Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Mon, 31 Dec 2018 02:00:47 +0100 Subject: [PATCH 07/92] Upgrade to libdparse 0.10.12 (#419) Upgrade to libdparse 0.10.12 merged-on-behalf-of: BBasile --- dub.json | 2 +- libdparse | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index 5235238..4b354bb 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.10.7" + "libdparse": "~>0.10.12" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index 15c8d2e..ea63487 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 15c8d2ef166b633825e971eb914d4d78eb33b3ac +Subproject commit ea63487efde96b6f169065d801bbcb8d7ed5dbb4 From 460096728b6b11cf7317bb0a9e26e0e4d30352f6 Mon Sep 17 00:00:00 2001 From: BBasile Date: Wed, 2 Jan 2019 16:20:15 +0100 Subject: [PATCH 08/92] Cleanup, remove socimantic stuff, close #406 (#418) Cleanup, remove sociomantic stuff, close #406 merged-on-behalf-of: BBasile --- .gitmodules | 6 ------ .travis.yml | 29 +---------------------------- beaver | 1 - beaver.Dockerfile | 6 ------ makd | 1 - pkg/dfmt.pkg | 31 ------------------------------- 6 files changed, 1 insertion(+), 73 deletions(-) delete mode 160000 beaver delete mode 100644 beaver.Dockerfile delete mode 160000 makd delete mode 100644 pkg/dfmt.pkg diff --git a/.gitmodules b/.gitmodules index 9395750..621577b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,6 @@ [submodule "libdparse"] path = libdparse url = https://github.com/dlang-community/libdparse.git -[submodule "makd"] - path = makd - url = https://github.com/sociomantic-tsunami/makd -[submodule "beaver"] - path = beaver - url = https://github.com/sociomantic-tsunami/beaver.git [submodule "stdx-allocator"] path = stdx-allocator url = https://github.com/dlang-community/stdx-allocator diff --git a/.travis.yml b/.travis.yml index a4103ad..904e4f1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,12 @@ sudo: false language: d d: - #- dmd-nightly - - dmd-beta - dmd - - ldc-beta - ldc os: - linux -# - osx # disabled until travis has more mac resources + - osx branches: only: @@ -24,30 +21,6 @@ script: ./.travis.sh jobs: include: - - stage: Build & Upload Package - if: tag IS present - # Which package to deploy - env: - - DMD=2.076.* - - DIST=xenial - - PATH="$(git config -f .gitmodules submodule.beaver.path)/bin:$PATH" - language: generic - sudo: required - services: - - docker - git: - submodules: false - before_install: git submodule update --init - install: beaver dlang install - script: - - beaver dlang make pkg - deploy: - provider: script - script: beaver bintray upload -d dlang-community/apt/dfmt build/last/pkg/*.deb - skip_cleanup: true - on: - tags: true # must be a git tag - repo: dlang-community/dfmt # must be a tag on dlang-community - stage: GitHub Release #if: tag IS present d: ldc-1.8.0 diff --git a/beaver b/beaver deleted file mode 160000 index 82f8c8f..0000000 --- a/beaver +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82f8c8f6bbd9f0fbd9753a134377bec134a5956c diff --git a/beaver.Dockerfile b/beaver.Dockerfile deleted file mode 100644 index 8fc905b..0000000 --- a/beaver.Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright sociomantic labs GmbH 2017. -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -FROM sociomantictsunami/dlang:v4 diff --git a/makd b/makd deleted file mode 160000 index d735c1d..0000000 --- a/makd +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d735c1df67399693f699f8315418173a55de5313 diff --git a/pkg/dfmt.pkg b/pkg/dfmt.pkg deleted file mode 100644 index 94d5b38..0000000 --- a/pkg/dfmt.pkg +++ /dev/null @@ -1,31 +0,0 @@ -# dfmt packaging configuration -# ============================ - -dfmt_bindir='bin' - -#------------------------------------------------------------------------------- -# Define the keyword arguments to pass to fpm (via the OPTS dict) -#------------------------------------------------------------------------------- - -OPTS.update( - name = "dfmt", - url = 'https://github.com/dlang-community/dfmt', - maintainer = 'Stefan Koch ', - vendor = 'Sociomantic Labs GmbH', - provides = "dfmt", - description = '''\ -D source code formatter -''', - depends = FUN.autodeps('dfmt', path=dfmt_bindir), -) - -#------------------------------------------------------------------------------- -# Define the positional arguments to pass to fpm (via the ARGS list) -#------------------------------------------------------------------------------- - -ARGS.extend(FUN.mapfiles(dfmt_bindir, '/usr/bin', 'dfmt')) -ARGS.extend([ - 'bash-completion/completions/dfmt=/usr/share/bash-completion/completions/dfmt' -]) - -# vim: set ft=python tw=80 : From 3b094b16d9e8d6d8ed98d8cf9799dcfcf5f11cd3 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 00:44:11 +0100 Subject: [PATCH 09/92] Add ArrayLiterals into arrayStartLocations list This is done to properly format arrays in function arguments --- src/dfmt/ast_info.d | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index e8157b9..c5bd3cc 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -45,6 +45,7 @@ struct ASTInformation sort(conditionalWithElseLocations); sort(conditionalStatementLocations); sort(arrayStartLocations); + sort(assocArrayStartLocations); sort(contractLocations); sort(constraintLocations); sort(constructorDestructorLocations); @@ -95,6 +96,9 @@ struct ASTInformation /// Locations of start locations of array initializers size_t[] arrayStartLocations; + /// Locations of start locations of associative array initializers + size_t[] assocArrayStartLocations; + /// Locations of "in" and "out" tokens that begin contracts size_t[] contractLocations; @@ -136,6 +140,19 @@ final class FormatVisitor : ASTVisitor arrayInitializer.accept(this); } + override void visit(const ArrayLiteral arrayLiteral) + { + astInformation.arrayStartLocations ~= arrayLiteral.tokens[0].index; + arrayLiteral.accept(this); + } + + override void visit(const AssocArrayLiteral assocArrayLiteral) + { + astInformation.arrayStartLocations ~= assocArrayLiteral.tokens[0].index; + astInformation.assocArrayStartLocations ~= assocArrayLiteral.tokens[0].index; + assocArrayLiteral.accept(this); + } + override void visit (const SharedStaticConstructor sharedStaticConstructor) { astInformation.sharedStaticConstructorDestructorLocations ~= sharedStaticConstructor.location; From 6e4136a353f737ead16bd74636efd6a8c0d63898 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 00:45:47 +0100 Subject: [PATCH 10/92] Make colon almost never break a line --- src/dfmt/tokens.d | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d index 952cc31..569c3dc 100644 --- a/src/dfmt/tokens.d +++ b/src/dfmt/tokens.d @@ -134,7 +134,6 @@ int breakCost(IdType p, IdType c) pure nothrow @safe @nogc case tok!"||": case tok!"&&": case tok!",": - case tok!":": case tok!"?": return 0; case tok!"(": @@ -184,6 +183,8 @@ int breakCost(IdType p, IdType c) pure nothrow @safe @nogc case tok!"~": case tok!"+=": return 200; + case tok!":": + return p == tok!"identifier" ? 0 : 300; case tok!".": return p == tok!")" ? 0 : 300; default: From 053b775cd1a80531b1476b2e15d5f5cd293aca8e Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 00:47:50 +0100 Subject: [PATCH 11/92] Add details to indentation stack This makes more advanced state handling easily possible. Also moved isWrapIndent/isTempIndent into this, which allows for exceptions for certain tokens and more control. --- src/dfmt/formatter.d | 25 ++++++++++++---- src/dfmt/indentation.d | 68 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 78 insertions(+), 15 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index bd47b93..b2716c7 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1240,8 +1240,13 @@ private: break; case tok!"]": indents.popWrapIndents(); - if (indents.topIs(tok!"]")) - newline(); + if (indents.topIsTemp(tok!"]")) + { + if (!indents.topDetails.mini) + newline(); + else + indents.pop(); + } writeToken(); if (currentIs(tok!"identifier")) write(" "); @@ -1402,7 +1407,7 @@ private: : tokens[i .. $].countUntil!(t => t.index == r.front) + i; immutable size_t j = min(expressionEndIndex(i), ufcsBreakLocation); // Use magical negative value for array literals and wrap indents - immutable inLvl = (indents.topIsWrap() || indents.topIs(tok!"]")) ? -indentLevel + immutable inLvl = (indents.topIsWrap() || indents.topIsTemp(tok!"]")) ? -indentLevel : indentLevel; linebreakHints = chooseLineBreakTokens(i, tokens[i .. j], depths[i .. j], config, currentLineLength, inLvl); @@ -1528,7 +1533,7 @@ private: else if (currentIs(tok!"]")) { indents.popWrapIndents(); - if (indents.topIs(tok!"]")) + if (indents.topIsTemp(tok!"]")) { indents.pop(); indentLevel = indents.indentLevel; @@ -1671,13 +1676,21 @@ private: void pushWrapIndent(IdType type = tok!"") { immutable t = type == tok!"" ? tokens[index].type : type; + IndentStack.Details detail; + detail.wrap = isWrapIndent(t); + detail.temp = isTempIndent(t); + pushWrapIndent(t, detail); + } + + void pushWrapIndent(IdType type, IndentStack.Details detail) + { if (parenDepth == 0) { if (indents.wrapIndents == 0) - indents.push(t); + indents.push(type, detail); } else if (indents.wrapIndents < 1) - indents.push(t); + indents.push(type, detail); } const pure @safe @nogc: diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d index 8eeacea..d2be341 100644 --- a/src/dfmt/indentation.d +++ b/src/dfmt/indentation.d @@ -7,6 +7,8 @@ module dfmt.indentation; import dparse.lexer; +import std.bitmanip : bitfields; + /** * Returns: true if the given token type is a wrap indent type */ @@ -29,6 +31,20 @@ bool isTempIndent(IdType type) pure nothrow @nogc @safe */ struct IndentStack { + static struct Details + { + mixin(bitfields!( + // generally true for all operators except {, case, @, ], (, ) + bool, "wrap", 1, + // temporary indentation which get's reverted when a block starts + // generally true for all tokens except ), {, case, @ + bool, "temp", 1, + // emit minimal newlines + bool, "mini", 1, + bool, "isAA", 1, + uint, "", 28)); + } + /** * Get the indent size at the most recent occurrence of the given indent type */ @@ -55,7 +71,7 @@ struct IndentStack int tempIndentCount = 0; for (size_t i = index; i > 0; i--) { - if (!isWrapIndent(arr[i - 1]) && arr[i - 1] != tok!"]") + if (!details[i - 1].wrap && arr[i - 1] != tok!"]") break; tempIndentCount++; } @@ -66,8 +82,20 @@ struct IndentStack * Pushes the given indent type on to the stack. */ void push(IdType item) pure nothrow + { + Details detail; + detail.wrap = isWrapIndent(item); + detail.temp = isTempIndent(item); + push(item, detail); + } + + /** + * Pushes the given indent type on to the stack. + */ + void push(IdType item, Details detail) pure nothrow { arr[index] = item; + details[index] = detail; //FIXME this is actually a bad thing to do, //we should not just override when the stack is //at it's limit @@ -91,7 +119,7 @@ struct IndentStack */ void popWrapIndents() pure nothrow @safe @nogc { - while (index > 0 && isWrapIndent(arr[index - 1])) + while (index > 0 && details[index - 1].wrap) index--; } @@ -100,7 +128,7 @@ struct IndentStack */ void popTempIndents() pure nothrow @safe @nogc { - while (index > 0 && isTempIndent(arr[index - 1])) + while (index > 0 && details[index - 1].temp) index--; } @@ -125,7 +153,15 @@ struct IndentStack */ bool topIsTemp() { - return index > 0 && index <= arr.length && isTempIndent(arr[index - 1]); + return index > 0 && index <= arr.length && details[index - 1].temp; + } + + /** + * Returns: `true` if the top of the indent stack is a temporary indent with the specified token + */ + bool topIsTemp(IdType item) + { + return index > 0 && index <= arr.length && arr[index - 1] == item && details[index - 1].temp; } /** @@ -133,7 +169,15 @@ struct IndentStack */ bool topIsWrap() { - return index > 0 && index <= arr.length && isWrapIndent(arr[index - 1]); + return index > 0 && index <= arr.length && details[index - 1].wrap; + } + + /** + * Returns: `true` if the top of the indent stack is a temporary indent with the specified token + */ + bool topIsWrap(IdType item) + { + return index > 0 && index <= arr.length && arr[index - 1] == item && details[index - 1].wrap; } /** @@ -156,6 +200,11 @@ struct IndentStack return arr[index - 1]; } + Details topDetails() const pure nothrow @property @safe @nogc + { + return details[index - 1]; + } + int indentLevel() const pure nothrow @property @safe @nogc { return indentSize(); @@ -183,6 +232,7 @@ private: size_t index; IdType[256] arr; + Details[arr.length] details; int indentSize(const size_t k = size_t.max) const pure nothrow @safe @nogc { @@ -196,17 +246,17 @@ private: { immutable int pc = (arr[i] == tok!"!" || arr[i] == tok!"(" || arr[i] == tok!")") ? parenCount + 1 : parenCount; - if ((isWrapIndent(arr[i]) || arr[i] == tok!"(") && parenCount > 1) + if ((details[i].wrap || arr[i] == tok!"(") && parenCount > 1) { parenCount = pc; continue; } if (i + 1 < index) { - if (arr[i] == tok!"]") + if (arr[i] == tok!"]" && details[i].temp) continue; - immutable currentIsNonWrapTemp = !isWrapIndent(arr[i]) - && isTempIndent(arr[i]) && arr[i] != tok!")" && arr[i] != tok!"!"; + immutable currentIsNonWrapTemp = !details[i].wrap + && details[i].temp && arr[i] != tok!")" && arr[i] != tok!"!"; if (arr[i] == tok!"static" && arr[i + 1].among!(tok!"if", tok!"else", tok!"foreach", tok!"foreach_reverse") && (i + 2 >= index || arr[i + 2] != tok!"{")) From 85c7d57167be4e6ce583d82e062e60fbcf5e1d7b Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 00:48:59 +0100 Subject: [PATCH 12/92] make multiline checking code modular Arrays and delegates now use the check whether a line is longer than the max line length using easy to reuse code --- src/dfmt/formatter.d | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index b2716c7..c8bbe18 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -569,9 +569,9 @@ private: // No heuristics apply if we can't look before the opening paren/bracket if (index < 1) return; - immutable bool arrayInitializerStart = p == tok!"[" && linebreakHints.length != 0 + immutable bool arrayInitializerStart = p == tok!"[" && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); - if (arrayInitializerStart) + if (arrayInitializerStart && isMultilineAt(index)) { // Use the close bracket as the indent token to distinguish // the array initialiazer from an array index in the newline @@ -790,12 +790,7 @@ private: sBraceDepth++; if (peekBackIsOneOf(true, tok!")", tok!"identifier")) write(" "); - auto e = expressionEndIndex(index); - immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)) - .sum(); - immutable bool multiline = l > config.dfmt_soft_max_line_length - || tokens[index .. e].canFind!(a => a.type == tok!"comment" - || isBlockHeaderToken(a.type))(); + immutable bool multiline = isMultilineAt(index); writeToken(); if (multiline) { @@ -1698,6 +1693,7 @@ const pure @safe @nogc: size_t expressionEndIndex(size_t i) nothrow { immutable bool braces = i < tokens.length && tokens[i].type == tok!"{"; + immutable bool brackets = i < tokens.length && tokens[i].type == tok!"["; immutable d = depths[i]; while (true) { @@ -1705,13 +1701,23 @@ const pure @safe @nogc: break; if (depths[i] < d) break; - if (!braces && (tokens[i].type == tok!";" || tokens[i].type == tok!"{")) + if (!braces && !brackets && (tokens[i].type == tok!";" || tokens[i].type == tok!"{")) break; i++; } return i; } + bool isMultilineAt(size_t i) + { + import std.algorithm : map, sum, canFind; + + auto e = expressionEndIndex(i); + immutable int l = currentLineLength + tokens[i .. e].map!(a => tokenLength(a)).sum(); + return l > config.dfmt_soft_max_line_length + || tokens[i .. e].canFind!(a => a.type == tok!"comment" || isBlockHeaderToken(a.type))(); + } + bool peekIsKeyword() nothrow { return index + 1 < tokens.length && isKeyword(tokens[index + 1].type); From fcad21ba614152b3875d20c701d60999337826e8 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 00:50:50 +0100 Subject: [PATCH 13/92] Improve AA formatting fix #143, fix Pure-D/code-d#188 --- README.md | 2 ++ src/dfmt/config.d | 3 +++ src/dfmt/formatter.d | 30 ++++++++++++++++++++++++++-- src/dfmt/main.d | 5 +++++ tests/allman/associative_array.d.ref | 26 ++++++++++++++++++++++++ tests/associative_array.d | 26 ++++++++++++++++++++++++ tests/issue0128.args | 1 + tests/otbs/associative_array.d.ref | 25 +++++++++++++++++++++++ 8 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 tests/allman/associative_array.d.ref create mode 100644 tests/associative_array.d create mode 100644 tests/issue0128.args create mode 100644 tests/otbs/associative_array.d.ref diff --git a/README.md b/README.md index b97e46f..3020f32 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ found in .editorconfig files. * **--selective_import_space**: See **dfmt_selective_import_space** below * **--compact_labeled_statements**: See **dfmt_compact_labeled_statements** below * **--template_constraint_style**: See **dfmt_template_constraint_style** below +* **--space_before_aa_colon**: See **dfmt_space_before_aa_colon** below ### Example ``` @@ -107,6 +108,7 @@ dfmt_selective_import_space | `true`, `false` | `true` | Insert space after the dfmt_compact_labeled_statements | `true`, `false` | `true` | Place labels on the same line as the labeled `switch`, `for`, `foreach`, or `while` statement. dfmt_template_constraint_style | `conditional_newline_indent` `conditional_newline` `always_newline` `always_newline_indent` | `conditional_newline_indent` | Control the formatting of template constraints. dfmt_single_template_constraint_indent | `true`, `false` | `false` | Set if the constraints are indented by a single tab instead of two. Has only an effect for if indentation style if set to `always_newline_indent` or `conditional_newline_indent`. +dfmt_space_before_aa_colon | `true`, `false` | `false` | Adds a space after an associative array key before the `:` like in older dfmt versions. ## Terminology * Braces - `{` and `}` diff --git a/src/dfmt/config.d b/src/dfmt/config.d index a9e59a3..66d9b77 100644 --- a/src/dfmt/config.d +++ b/src/dfmt/config.d @@ -55,6 +55,8 @@ struct Config TemplateConstraintStyle dfmt_template_constraint_style; /// OptionalBoolean dfmt_single_template_constraint_indent; + /// + OptionalBoolean dfmt_space_before_aa_colon; mixin StandardEditorConfigFields; @@ -82,6 +84,7 @@ struct Config dfmt_compact_labeled_statements = OptionalBoolean.t; dfmt_template_constraint_style = TemplateConstraintStyle.conditional_newline_indent; dfmt_single_template_constraint_indent = OptionalBoolean.f; + dfmt_space_before_aa_colon = OptionalBoolean.f; } /** diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index c8bbe18..1d0c3d6 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -576,12 +576,28 @@ private: // Use the close bracket as the indent token to distinguish // the array initialiazer from an array index in the newline // handling code - pushWrapIndent(tok!"]"); + IndentStack.Details detail; + detail.wrap = false; + detail.temp = true; + detail.isAA = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); + pushWrapIndent(tok!"]", detail); + newline(); immutable size_t j = expressionEndIndex(index); linebreakHints = chooseLineBreakTokens(index, tokens[index .. j], depths[index .. j], config, currentLineLength, indentLevel); } + else if (arrayInitializerStart) + { + // This is a short (non-breaking) AA value + IndentStack.Details detail; + detail.wrap = false; + detail.temp = true; + detail.isAA = true; + detail.mini = true; + + pushWrapIndent(tok!"]", detail); + } else if (!currentIs(tok!")") && !currentIs(tok!"]") && (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) @@ -700,7 +716,12 @@ private: } else { - write(" : "); + const inAA = indents.topIs(tok!"]") && indents.topDetails.isAA; + + if (inAA && !config.dfmt_space_before_aa_colon) + write(": "); + else + write(" : "); index++; } } @@ -1368,6 +1389,11 @@ private: writeToken(); newline(); } + else if (indents.topIsTemp(tok!"]") && indents.topDetails.isAA && !indents.topDetails.mini) + { + writeToken(); + newline(); + } else if (!peekIs(tok!"}") && (linebreakHints.canFind(index) || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) { diff --git a/src/dfmt/main.d b/src/dfmt/main.d index 1e39bb3..6844cfc 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -89,6 +89,9 @@ else case "single_template_constraint_indent": optConfig.dfmt_single_template_constraint_indent = optVal; break; + case "space_before_aa_colon": + optConfig.dfmt_space_before_aa_colon = optVal; + break; default: assert(false, "Invalid command-line switch"); } @@ -116,6 +119,7 @@ else "split_operator_at_line_end", &handleBooleans, "compact_labeled_statements", &handleBooleans, "single_template_constraint_indent", &handleBooleans, + "space_before_aa_colon", &handleBooleans, "tab_width", &optConfig.tab_width, "template_constraint_style", &optConfig.dfmt_template_constraint_style); // dfmt on @@ -314,6 +318,7 @@ Formatting Options: --split_operator_at_line_end --compact_labeled_statements --template_constraint_style + --space_before_aa_colon `, optionsToString!(typeof(Config.dfmt_template_constraint_style))); } diff --git a/tests/allman/associative_array.d.ref b/tests/allman/associative_array.d.ref new file mode 100644 index 0000000..0a0e9d8 --- /dev/null +++ b/tests/allman/associative_array.d.ref @@ -0,0 +1,26 @@ +unittest +{ + Bson base = Bson([ + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]; +} diff --git a/tests/associative_array.d b/tests/associative_array.d new file mode 100644 index 0000000..d38762c --- /dev/null +++ b/tests/associative_array.d @@ -0,0 +1,26 @@ +unittest +{ + Bson base = Bson([ + "maps": Bson([ + Bson([ + "id": Bson(4), + "comment": Bson("hello") + ]), + Bson([ + "id": Bson(49), + "comment": Bson(null) + ]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0]; +} diff --git a/tests/issue0128.args b/tests/issue0128.args new file mode 100644 index 0000000..03f0da5 --- /dev/null +++ b/tests/issue0128.args @@ -0,0 +1 @@ +--space_before_aa_colon=true diff --git a/tests/otbs/associative_array.d.ref b/tests/otbs/associative_array.d.ref new file mode 100644 index 0000000..f167877 --- /dev/null +++ b/tests/otbs/associative_array.d.ref @@ -0,0 +1,25 @@ +unittest { + Bson base = Bson([ + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]; +} From 48b2b84c338d184d414e0fcc0a4607cd78203a83 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 01:11:03 +0100 Subject: [PATCH 14/92] Add documentation/comments & undo minor name change --- src/dfmt/formatter.d | 13 +++++++++---- src/dfmt/tokens.d | 2 ++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 1d0c3d6..a09db2b 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -579,6 +579,9 @@ private: IndentStack.Details detail; detail.wrap = false; detail.temp = true; + // wrap and temp are set manually to the values it would actually + // receive here because we want to set isAA for the ] token to know if + // we should definitely always new-line after every comma for a big AA detail.isAA = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); pushWrapIndent(tok!"]", detail); @@ -1256,7 +1259,7 @@ private: break; case tok!"]": indents.popWrapIndents(); - if (indents.topIsTemp(tok!"]")) + if (indents.topIs(tok!"]")) { if (!indents.topDetails.mini) newline(); @@ -1389,7 +1392,7 @@ private: writeToken(); newline(); } - else if (indents.topIsTemp(tok!"]") && indents.topDetails.isAA && !indents.topDetails.mini) + else if (indents.topIs(tok!"]") && indents.topDetails.isAA && !indents.topDetails.mini) { writeToken(); newline(); @@ -1428,7 +1431,7 @@ private: : tokens[i .. $].countUntil!(t => t.index == r.front) + i; immutable size_t j = min(expressionEndIndex(i), ufcsBreakLocation); // Use magical negative value for array literals and wrap indents - immutable inLvl = (indents.topIsWrap() || indents.topIsTemp(tok!"]")) ? -indentLevel + immutable inLvl = (indents.topIsWrap() || indents.topIs(tok!"]")) ? -indentLevel : indentLevel; linebreakHints = chooseLineBreakTokens(i, tokens[i .. j], depths[i .. j], config, currentLineLength, inLvl); @@ -1554,7 +1557,7 @@ private: else if (currentIs(tok!"]")) { indents.popWrapIndents(); - if (indents.topIsTemp(tok!"]")) + if (indents.topIs(tok!"]")) { indents.pop(); indentLevel = indents.indentLevel; @@ -1734,6 +1737,8 @@ const pure @safe @nogc: return i; } + /// Returns: true when the expression starting at index goes over the line length limit. + /// Uses matching `{}` or `[]` or otherwise takes everything up until a semicolon or opening brace using expressionEndIndex. bool isMultilineAt(size_t i) { import std.algorithm : map, sum, canFind; diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d index 569c3dc..8f918f6 100644 --- a/src/dfmt/tokens.d +++ b/src/dfmt/tokens.d @@ -184,6 +184,8 @@ int breakCost(IdType p, IdType c) pure nothrow @safe @nogc case tok!"+=": return 200; case tok!":": + // colon could be after a label or an import, where it should normally wrap like before + // for everything else (associative arrays) try not breaking around colons return p == tok!"identifier" ? 0 : 300; case tok!".": return p == tok!")" ? 0 : 300; From 1da1ca6545c3d8922e2c883e5c5ce6f1eb697f6e Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 20:19:50 +0100 Subject: [PATCH 15/92] Fix isMultilineAt for array + refactor right bracket Refactor formatRightBracket into own function --- src/dfmt/formatter.d | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index a09db2b..a7ab809 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -571,7 +571,7 @@ private: return; immutable bool arrayInitializerStart = p == tok!"[" && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); - if (arrayInitializerStart && isMultilineAt(index)) + if (arrayInitializerStart && isMultilineAt(index - 1)) { // Use the close bracket as the indent token to distinguish // the array initialiazer from an array index in the newline @@ -644,6 +644,26 @@ private: writeToken(); } + void formatRightBracket() + in + { + assert(currentIs(tok!"]")); + } + body + { + indents.popWrapIndents(); + if (indents.topIs(tok!"]")) + { + if (!indents.topDetails.mini) + newline(); + else + indents.pop(); + } + writeToken(); + if (currentIs(tok!"identifier")) + write(" "); + } + void formatAt() { immutable size_t atIndex = tokens[index].index; @@ -1258,17 +1278,7 @@ private: formatColon(); break; case tok!"]": - indents.popWrapIndents(); - if (indents.topIs(tok!"]")) - { - if (!indents.topDetails.mini) - newline(); - else - indents.pop(); - } - writeToken(); - if (currentIs(tok!"identifier")) - write(" "); + formatRightBracket(); break; case tok!";": formatSemicolon(); From 60b2cff18a43f4751f2e3021621561360a0a9bc0 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 20:22:30 +0100 Subject: [PATCH 16/92] Adjust issue0017 for now (minor improvement) --- tests/allman/issue0017.d.ref | 3 ++- tests/otbs/issue0017.d.ref | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/allman/issue0017.d.ref b/tests/allman/issue0017.d.ref index 8a32cec..67b8931 100644 --- a/tests/allman/issue0017.d.ref +++ b/tests/allman/issue0017.d.ref @@ -1,3 +1,4 @@ -immutable NameId[] namesA = [{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS +immutable NameId[] namesA = [ +{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; diff --git a/tests/otbs/issue0017.d.ref b/tests/otbs/issue0017.d.ref index 8a32cec..67b8931 100644 --- a/tests/otbs/issue0017.d.ref +++ b/tests/otbs/issue0017.d.ref @@ -1,3 +1,4 @@ -immutable NameId[] namesA = [{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS +immutable NameId[] namesA = [ +{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; From 733898e013826f303d0120deaa2d6d8b140d0f4a Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 22:04:52 +0100 Subject: [PATCH 17/92] more informative dump function --- src/dfmt/indentation.d | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d index d2be341..ce39c79 100644 --- a/src/dfmt/indentation.d +++ b/src/dfmt/indentation.d @@ -218,13 +218,16 @@ struct IndentStack /** * Dumps the current state of the indentation stack to `stderr`. Used for debugging. */ - void dump(string file = __FILE__, uint line = __LINE__) + void dump(size_t pos = size_t.max, string file = __FILE__, uint line = __LINE__) { import dparse.lexer : str; import std.algorithm.iteration : map; import std.stdio : stderr; - stderr.writefln("\033[31m%s:%d %(%s %)\033[0m", file, line, arr[0 .. index].map!(a => str(a))); + if (pos == size_t.max) + stderr.writefln("\033[31m%s:%d %(%s %)\033[0m", file, line, arr[0 .. index].map!(a => str(a))); + else + stderr.writefln("\033[31m%s:%d at %d %(%s %)\033[0m", file, line, pos, arr[0 .. index].map!(a => str(a))); } private: From eebd341343a72c6a0417ee299a1648746f912bb8 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 22:05:41 +0100 Subject: [PATCH 18/92] Allow multilineAt to stop at commas --- src/dfmt/formatter.d | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index a7ab809..846b5ff 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -809,11 +809,9 @@ private: if (astInformation.structInitStartLocations.canFindIndex(tIndex)) { sBraceDepth++; - auto e = expressionEndIndex(index); - immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)) - .sum(); + immutable bool multiline = isMultilineAt(index); writeToken(); - if (l > config.dfmt_soft_max_line_length) + if (multiline) { import std.algorithm.searching : find; @@ -1729,7 +1727,7 @@ private: const pure @safe @nogc: - size_t expressionEndIndex(size_t i) nothrow + size_t expressionEndIndex(size_t i, bool matchComma = false) nothrow { immutable bool braces = i < tokens.length && tokens[i].type == tok!"{"; immutable bool brackets = i < tokens.length && tokens[i].type == tok!"["; @@ -1740,6 +1738,8 @@ const pure @safe @nogc: break; if (depths[i] < d) break; + if (!braces && !brackets && matchComma && depths[i] == d && tokens[i].type == tok!",") + break; if (!braces && !brackets && (tokens[i].type == tok!";" || tokens[i].type == tok!"{")) break; i++; @@ -1749,14 +1749,14 @@ const pure @safe @nogc: /// Returns: true when the expression starting at index goes over the line length limit. /// Uses matching `{}` or `[]` or otherwise takes everything up until a semicolon or opening brace using expressionEndIndex. - bool isMultilineAt(size_t i) + bool isMultilineAt(size_t i, bool matchComma = false) { import std.algorithm : map, sum, canFind; - auto e = expressionEndIndex(i); + auto e = expressionEndIndex(i, matchComma); immutable int l = currentLineLength + tokens[i .. e].map!(a => tokenLength(a)).sum(); - return l > config.dfmt_soft_max_line_length - || tokens[i .. e].canFind!(a => a.type == tok!"comment" || isBlockHeaderToken(a.type))(); + return l > config.dfmt_soft_max_line_length || tokens[i .. e].canFind!( + a => a.type == tok!"comment" || isBlockHeaderToken(a.type))(); } bool peekIsKeyword() nothrow From 98cd73ec8035b703727dd8a6eb63fa07e7711dd2 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 22:06:57 +0100 Subject: [PATCH 19/92] Fix 2D (assoc) arrays & add tests Fix #312 --- src/dfmt/formatter.d | 47 ++++++++++++++------ src/dfmt/indentation.d | 12 +++-- tests/2d_arrays.d | 17 +++++++ tests/allman/2d_arrays.d.ref | 38 ++++++++++++++++ tests/allman/associative_array.d.ref | 20 ++++----- tests/allman/associative_array_complex.d.ref | 25 +++++++++++ tests/allman/issue0017.d.ref | 4 +- tests/allman/issue0023.d.ref | 41 +++++++++-------- tests/associative_array_complex.d | 11 +++++ tests/otbs/2d_arrays.d.ref | 21 +++++++++ tests/otbs/associative_array.d.ref | 20 ++++----- tests/otbs/associative_array_complex.d.ref | 24 ++++++++++ tests/otbs/issue0017.d.ref | 4 +- tests/otbs/issue0023.d.ref | 41 +++++++++-------- 14 files changed, 246 insertions(+), 79 deletions(-) create mode 100644 tests/2d_arrays.d create mode 100644 tests/allman/2d_arrays.d.ref create mode 100644 tests/allman/associative_array_complex.d.ref create mode 100644 tests/associative_array_complex.d create mode 100644 tests/otbs/2d_arrays.d.ref create mode 100644 tests/otbs/associative_array_complex.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 846b5ff..7b5f6a5 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -578,13 +578,16 @@ private: // handling code IndentStack.Details detail; detail.wrap = false; - detail.temp = true; - // wrap and temp are set manually to the values it would actually - // receive here because we want to set isAA for the ] token to know if - // we should definitely always new-line after every comma for a big AA - detail.isAA = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); - pushWrapIndent(tok!"]", detail); + detail.temp = false; + // wrap and temp are set manually to the values it would actually + // receive here because we want to set breakEveryItem for the ] token to know if + // we should definitely always new-line after every comma for a big AA + detail.breakEveryItem = astInformation.assocArrayStartLocations.canFindIndex( + tokens[index - 1].index); + detail.preferLongBreaking = true; + + indents.push(tok!"]", detail); newline(); immutable size_t j = expressionEndIndex(index); linebreakHints = chooseLineBreakTokens(index, tokens[index .. j], @@ -592,14 +595,21 @@ private: } else if (arrayInitializerStart) { - // This is a short (non-breaking) AA value + // This is a short (non-breaking) array/AA value IndentStack.Details detail; detail.wrap = false; - detail.temp = true; - detail.isAA = true; + detail.temp = false; + + detail.breakEveryItem = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); + // array of (possibly associative) array, let's put each item on its own line + if (!detail.breakEveryItem && index < tokens.length && current == tok!"[") + detail.breakEveryItem = true; + + // the '[' is immediately followed by an item instead of a newline here so + // we set mini, that the ']' also follows an item immediately without newline. detail.mini = true; - pushWrapIndent(tok!"]", detail); + indents.push(tok!"]", detail); } else if (!currentIs(tok!")") && !currentIs(tok!"]") && (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0 @@ -739,7 +749,7 @@ private: } else { - const inAA = indents.topIs(tok!"]") && indents.topDetails.isAA; + const inAA = indents.topIs(tok!"]") && indents.topDetails.breakEveryItem; if (inAA && !config.dfmt_space_before_aa_colon) write(": "); @@ -1400,10 +1410,21 @@ private: writeToken(); newline(); } - else if (indents.topIs(tok!"]") && indents.topDetails.isAA && !indents.topDetails.mini) + else if (indents.topIs(tok!"]") && indents.topDetails.breakEveryItem + && !indents.topDetails.mini) { writeToken(); newline(); + regenLineBreakHints(index - 1); + } + else if (indents.topIs(tok!"]") && indents.topDetails.preferLongBreaking + && !currentIs(tok!")") && !currentIs(tok!"]") && !currentIs(tok!"}") + && !currentIs(tok!"comment") && index + 1 < tokens.length + && isMultilineAt(index + 1, true)) + { + writeToken(); + newline(); + regenLineBreakHints(index - 1); } else if (!peekIs(tok!"}") && (linebreakHints.canFind(index) || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) @@ -1535,7 +1556,7 @@ private: else if (currentIs(tok!"{")) { indents.popWrapIndents(); - if (peekBackIsSlashSlash() && peekBack2Is(tok!";")) + if ((peekBackIsSlashSlash() && peekBack2Is(tok!";")) || indents.topIs(tok!"]")) { indents.popTempIndents(); indentLevel = indents.indentLevel; diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d index ce39c79..c80c86c 100644 --- a/src/dfmt/indentation.d +++ b/src/dfmt/indentation.d @@ -41,8 +41,11 @@ struct IndentStack bool, "temp", 1, // emit minimal newlines bool, "mini", 1, - bool, "isAA", 1, - uint, "", 28)); + // for associative arrays or arrays containing them, break after every item + bool, "breakEveryItem", 1, + // when an item inside an array would break mid-item, definitely break at the comma first + bool, "preferLongBreaking", 1, + uint, "", 27)); } /** @@ -254,10 +257,9 @@ private: parenCount = pc; continue; } + if (i + 1 < index) { - if (arr[i] == tok!"]" && details[i].temp) - continue; immutable currentIsNonWrapTemp = !details[i].wrap && details[i].temp && arr[i] != tok!")" && arr[i] != tok!"!"; if (arr[i] == tok!"static" @@ -276,8 +278,10 @@ private: } else if (parenCount == 0 && arr[i] == tok!"(") size++; + if (arr[i] == tok!"!") size++; + parenCount = pc; size++; } diff --git a/tests/2d_arrays.d b/tests/2d_arrays.d new file mode 100644 index 0000000..14a1590 --- /dev/null +++ b/tests/2d_arrays.d @@ -0,0 +1,17 @@ +unittest +{ + targets = [[RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), vec2(16 * scale, + 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0))], + [RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), vec2(16 * scale, + 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), RectangleShape.create(tex, + vec2(-8 * scale, -8 * scale), vec2(16 * scale, 16 * scale), + vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0))]]; + + int[][] foo = [[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32], [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32]]; + + float[3][3] mat = [[234.3456,42435.8653,23.5],[3.245,235.3,234.664],[14324.6453,23434.645,9678.345]]; +} + +string[][] globalArray = [["123456789012345678901234567890", "123456789012345678901234567890"], ["123456789012345678901234567890", "123456789012345678901234567890"]]; diff --git a/tests/allman/2d_arrays.d.ref b/tests/allman/2d_arrays.d.ref new file mode 100644 index 0000000..628be8b --- /dev/null +++ b/tests/allman/2d_arrays.d.ref @@ -0,0 +1,38 @@ +unittest +{ + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; + + int[][] foo = [ + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ], + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ] + ]; + + float[3][3] mat = [ + [234.3456, 42435.8653, 23.5], [3.245, 235.3, 234.664], + [14324.6453, 23434.645, 9678.345] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/allman/associative_array.d.ref b/tests/allman/associative_array.d.ref index 0a0e9d8..d1db193 100644 --- a/tests/allman/associative_array.d.ref +++ b/tests/allman/associative_array.d.ref @@ -2,19 +2,19 @@ unittest { Bson base = Bson([ "maps": Bson([ - Bson(["id": Bson(4), "comment": Bson("hello")]), - Bson(["id": Bson(49), "comment": Bson(null)]) - ]), + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), "short": Bson(["a": "b", "c": "d"]), "numbers": Bson([ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 - ]), + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]), "shuffleOnReset": serializeToBson([ - "all": false, - "selected": true, - "maybe": false - ]), + "all": false, + "selected": true, + "maybe": false + ]), "resetOnEmpty": Bson(false), "applyMods": Bson(true), "sendComments": Bson(true) diff --git a/tests/allman/associative_array_complex.d.ref b/tests/allman/associative_array_complex.d.ref new file mode 100644 index 0000000..c7b803b --- /dev/null +++ b/tests/allman/associative_array_complex.d.ref @@ -0,0 +1,25 @@ +auto find() +{ + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/allman/issue0017.d.ref b/tests/allman/issue0017.d.ref index 67b8931..541c22a 100644 --- a/tests/allman/issue0017.d.ref +++ b/tests/allman/issue0017.d.ref @@ -1,4 +1,4 @@ immutable NameId[] namesA = [ -{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS -{"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; diff --git a/tests/allman/issue0023.d.ref b/tests/allman/issue0023.d.ref index 67aa5f5..64e52e3 100644 --- a/tests/allman/issue0023.d.ref +++ b/tests/allman/issue0023.d.ref @@ -9,25 +9,28 @@ string generateFixedLengthCases() string[] fixedLengthTokens = [ "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", - "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", "char", "class", - "const", "continue", "creal", "dchar", "debug", "default", "delegate", "delete", "deprecated", - "do", "double", "else", "enum", "export", "extern", "false", "final", "finally", "float", - "for", "foreach", "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", "immutable", - "import", "in", "inout", "int", "interface", "invariant", "ireal", "is", - "lazy", "long", "macro", "mixin", "module", "new", "nothrow", "null", "out", "override", - "package", "pragma", "private", "protected", "public", "pure", "real", "ref", "return", "scope", - "shared", "short", "static", "struct", "super", "switch", "synchronized", "template", "this", - "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", - "union", "unittest", "ushort", "version", "void", "volatile", "wchar", - "while", "with", "__DATE__", "__EOF__", "__FILE__", - "__FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters", - "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", - "__traits", "__vector", "__VENDOR__", "__VERSION__", ",", ".", "..", - "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", "!=", "!>", "!>=", - "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", - "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>", "<>=", - "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", - "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~=" + "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", + "char", "class", "const", "continue", "creal", "dchar", "debug", "default", + "delegate", "delete", "deprecated", "do", "double", "else", "enum", + "export", "extern", "false", "final", "finally", "float", "for", "foreach", + "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", + "immutable", "import", "in", "inout", "int", "interface", "invariant", + "ireal", "is", "lazy", "long", "macro", "mixin", "module", "new", + "nothrow", "null", "out", "override", "package", "pragma", "private", + "protected", "public", "pure", "real", "ref", "return", "scope", "shared", + "short", "static", "struct", "super", "switch", "synchronized", "template", + "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", + "ucent", "uint", "ulong", "union", "unittest", "ushort", "version", "void", + "volatile", "wchar", "while", "with", "__DATE__", "__EOF__", + "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", + "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", + "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__VERSION__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" ]; } diff --git a/tests/associative_array_complex.d b/tests/associative_array_complex.d new file mode 100644 index 0000000..c61c83b --- /dev/null +++ b/tests/associative_array_complex.d @@ -0,0 +1,11 @@ +auto find() +{ + return Map.findRange(["$and": [ + ["deleted": Bson(false)], + ["$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson(["info.approved": ["$eq": Bson(1)], "fetchDate": ["$lte": Bson(BsonDate(currentTime - 60.days))]]), + serializeToBson(["info.approved": ["$ne": Bson(1)], "fetchDate": ["$lte": Bson(BsonDate(currentTime - 14.days))]]) + ])] + ]]); +} diff --git a/tests/otbs/2d_arrays.d.ref b/tests/otbs/2d_arrays.d.ref new file mode 100644 index 0000000..33ed6a8 --- /dev/null +++ b/tests/otbs/2d_arrays.d.ref @@ -0,0 +1,21 @@ +unittest { + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/otbs/associative_array.d.ref b/tests/otbs/associative_array.d.ref index f167877..39f18c6 100644 --- a/tests/otbs/associative_array.d.ref +++ b/tests/otbs/associative_array.d.ref @@ -1,19 +1,19 @@ unittest { Bson base = Bson([ "maps": Bson([ - Bson(["id": Bson(4), "comment": Bson("hello")]), - Bson(["id": Bson(49), "comment": Bson(null)]) - ]), + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), "short": Bson(["a": "b", "c": "d"]), "numbers": Bson([ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 - ]), + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]), "shuffleOnReset": serializeToBson([ - "all": false, - "selected": true, - "maybe": false - ]), + "all": false, + "selected": true, + "maybe": false + ]), "resetOnEmpty": Bson(false), "applyMods": Bson(true), "sendComments": Bson(true) diff --git a/tests/otbs/associative_array_complex.d.ref b/tests/otbs/associative_array_complex.d.ref new file mode 100644 index 0000000..ddcbcd7 --- /dev/null +++ b/tests/otbs/associative_array_complex.d.ref @@ -0,0 +1,24 @@ +auto find() { + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/otbs/issue0017.d.ref b/tests/otbs/issue0017.d.ref index 67b8931..541c22a 100644 --- a/tests/otbs/issue0017.d.ref +++ b/tests/otbs/issue0017.d.ref @@ -1,4 +1,4 @@ immutable NameId[] namesA = [ -{"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS -{"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS ]; diff --git a/tests/otbs/issue0023.d.ref b/tests/otbs/issue0023.d.ref index d9488ea..c724640 100644 --- a/tests/otbs/issue0023.d.ref +++ b/tests/otbs/issue0023.d.ref @@ -8,25 +8,28 @@ string generateFixedLengthCases() { string[] fixedLengthTokens = [ "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", - "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", "char", "class", - "const", "continue", "creal", "dchar", "debug", "default", "delegate", "delete", "deprecated", - "do", "double", "else", "enum", "export", "extern", "false", "final", "finally", "float", - "for", "foreach", "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", "immutable", - "import", "in", "inout", "int", "interface", "invariant", "ireal", "is", - "lazy", "long", "macro", "mixin", "module", "new", "nothrow", "null", "out", "override", - "package", "pragma", "private", "protected", "public", "pure", "real", "ref", "return", "scope", - "shared", "short", "static", "struct", "super", "switch", "synchronized", "template", "this", - "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", - "union", "unittest", "ushort", "version", "void", "volatile", "wchar", - "while", "with", "__DATE__", "__EOF__", "__FILE__", - "__FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters", - "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", - "__traits", "__vector", "__VENDOR__", "__VERSION__", ",", ".", "..", - "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", "!=", "!>", "!>=", - "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", "*=", "+", "++", - "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", "<=", "<>", "<>=", - "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", ">>>=", "?", "@", "[", - "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", "}", "~", "~=" + "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", + "char", "class", "const", "continue", "creal", "dchar", "debug", "default", + "delegate", "delete", "deprecated", "do", "double", "else", "enum", + "export", "extern", "false", "final", "finally", "float", "for", "foreach", + "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", + "immutable", "import", "in", "inout", "int", "interface", "invariant", + "ireal", "is", "lazy", "long", "macro", "mixin", "module", "new", + "nothrow", "null", "out", "override", "package", "pragma", "private", + "protected", "public", "pure", "real", "ref", "return", "scope", "shared", + "short", "static", "struct", "super", "switch", "synchronized", "template", + "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", + "ucent", "uint", "ulong", "union", "unittest", "ushort", "version", "void", + "volatile", "wchar", "while", "with", "__DATE__", "__EOF__", + "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", + "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", + "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__VERSION__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" ]; } From 6dea7b689e2e2b35927af386334c43cc11c5efd8 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Fri, 11 Jan 2019 22:23:04 +0100 Subject: [PATCH 20/92] fix otbs expected test result for 2d arrays --- tests/otbs/2d_arrays.d.ref | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/otbs/2d_arrays.d.ref b/tests/otbs/2d_arrays.d.ref index 33ed6a8..5b685ec 100644 --- a/tests/otbs/2d_arrays.d.ref +++ b/tests/otbs/2d_arrays.d.ref @@ -13,6 +13,22 @@ unittest { vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) ] ]; + + int[][] foo = [ + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ], + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ] + ]; + + float[3][3] mat = [ + [234.3456, 42435.8653, 23.5], [3.245, 235.3, 234.664], + [14324.6453, 23434.645, 9678.345] + ]; } string[][] globalArray = [ From 7f41c8ae7f5babdac4ce7869d6f04c67701a0fcd Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sat, 12 Jan 2019 12:25:46 +0100 Subject: [PATCH 21/92] fix array item access regression --- src/dfmt/formatter.d | 13 ++++++++++++- tests/allman/array_access.d.ref | 7 +++++++ tests/array_access.d | 4 ++++ tests/otbs/array_access.d.ref | 6 ++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 tests/allman/array_access.d.ref create mode 100644 tests/array_access.d create mode 100644 tests/otbs/array_access.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 7b5f6a5..1a13a45 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -611,6 +611,15 @@ private: indents.push(tok!"]", detail); } + else if (p == tok!"[") + { + // array item access + IndentStack.Details detail; + detail.wrap = false; + detail.temp = true; + detail.mini = true; + indents.push(tok!"]", detail); + } else if (!currentIs(tok!")") && !currentIs(tok!"]") && (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) @@ -664,7 +673,7 @@ private: indents.popWrapIndents(); if (indents.topIs(tok!"]")) { - if (!indents.topDetails.mini) + if (!indents.topDetails.mini && !indents.topDetails.temp) newline(); else indents.pop(); @@ -839,6 +848,8 @@ private: } else if (astInformation.funLitStartLocations.canFindIndex(tIndex)) { + indents.popWrapIndents(); + sBraceDepth++; if (peekBackIsOneOf(true, tok!")", tok!"identifier")) write(" "); diff --git a/tests/allman/array_access.d.ref b/tests/allman/array_access.d.ref new file mode 100644 index 0000000..7c7a6cc --- /dev/null +++ b/tests/allman/array_access.d.ref @@ -0,0 +1,7 @@ +unittest +{ + foo([ + target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1], target.value.region[1] + ]); +} diff --git a/tests/array_access.d b/tests/array_access.d new file mode 100644 index 0000000..9a96e57 --- /dev/null +++ b/tests/array_access.d @@ -0,0 +1,4 @@ +unittest +{ + foo([target.value.region[1], target.value.region[1], target.value.region[1], target.value.region[1], target.value.region[1]]); +} \ No newline at end of file diff --git a/tests/otbs/array_access.d.ref b/tests/otbs/array_access.d.ref new file mode 100644 index 0000000..7a2ac55 --- /dev/null +++ b/tests/otbs/array_access.d.ref @@ -0,0 +1,6 @@ +unittest { + foo([ + target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1], target.value.region[1] + ]); +} From bdac7361a581e91aae5f6eee21e3b419d8d6a90d Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Sat, 12 Jan 2019 12:37:06 +0100 Subject: [PATCH 22/92] Add test for issue0112 without array item --- tests/allman/issue0112_variation.d.ref | 15 +++++++++++++++ tests/issue0112_variation.d | 18 ++++++++++++++++++ tests/otbs/issue0112_variation.d.ref | 13 +++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 tests/allman/issue0112_variation.d.ref create mode 100644 tests/issue0112_variation.d create mode 100644 tests/otbs/issue0112_variation.d.ref diff --git a/tests/allman/issue0112_variation.d.ref b/tests/allman/issue0112_variation.d.ref new file mode 100644 index 0000000..084e5eb --- /dev/null +++ b/tests/allman/issue0112_variation.d.ref @@ -0,0 +1,15 @@ +unittest +{ + testScene = new Scene(longArgument, longArgument, longArgument, + longArgument, longArgument, longArgument, delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) + { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} diff --git a/tests/issue0112_variation.d b/tests/issue0112_variation.d new file mode 100644 index 0000000..73e3d89 --- /dev/null +++ b/tests/issue0112_variation.d @@ -0,0 +1,18 @@ +unittest +{ + testScene = new Scene + ( + longArgument, longArgument, longArgument, longArgument, longArgument, longArgument, + delegate(Scene scene) + { + import std.stdio; + + if (!scene.alreadyEntered) + { + fwriteln("This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal)sceneManager.previousScene; + scene.destroyCurrentScript(); + } + } + ); +} diff --git a/tests/otbs/issue0112_variation.d.ref b/tests/otbs/issue0112_variation.d.ref new file mode 100644 index 0000000..424c1dd --- /dev/null +++ b/tests/otbs/issue0112_variation.d.ref @@ -0,0 +1,13 @@ +unittest { + testScene = new Scene(longArgument, longArgument, longArgument, + longArgument, longArgument, longArgument, delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} From a79a43a9dcff54716d142ca5869fe1f9eda359bd Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 14 Jan 2019 20:33:17 +0100 Subject: [PATCH 23/92] Fix dubhash with spaces in folder name --- dub.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dub.json b/dub.json index 4b354bb..f0a110b 100644 --- a/dub.json +++ b/dub.json @@ -15,6 +15,6 @@ "built_with_dub" ], "preGenerateCommands" : [ - "rdmd $PACKAGE_DIR/dubhash.d" + "rdmd \"$PACKAGE_DIR/dubhash.d\"" ] } From dae7d85c80e1744bbbb1af9e9fc7b653a7cf7455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= Date: Mon, 11 Feb 2019 13:55:33 +0100 Subject: [PATCH 24/92] Fix #427 - Crash on invariant (#428) Fix #427 - Crash on invariant merged-on-behalf-of: Basile-z --- src/dfmt/ast_info.d | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index c5bd3cc..9c3f68f 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -292,7 +292,9 @@ final class FormatVisitor : ASTVisitor override void visit(const Invariant invariant_) { - astInformation.doubleNewlineLocations ~= invariant_.blockStatement.endLocation; + if (invariant_.blockStatement !is null) + astInformation.doubleNewlineLocations ~= invariant_.blockStatement.endLocation; + invariant_.accept(this); } From b34acc9f26af2a8a018d9deb2af8ca25d07fb54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= Date: Tue, 12 Feb 2019 18:53:19 +0100 Subject: [PATCH 25/92] Update libdparse to v0.11.2 (#429) Update libdparse to v0.11.2 merged-on-behalf-of: Basile-z --- dub.json | 2 +- libdparse | 2 +- src/dfmt/tokens.d | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dub.json b/dub.json index f0a110b..7d0c016 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.10.12" + "libdparse": "~>0.11.2" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index ea63487..23b20de 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit ea63487efde96b6f169065d801bbcb8d7ed5dbb4 +Subproject commit 23b20de4ee48ed3f0e8729f6318405543cb3a611 diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d index 8f918f6..551dc17 100644 --- a/src/dfmt/tokens.d +++ b/src/dfmt/tokens.d @@ -230,7 +230,7 @@ private string generateFixedLengthCases() "package", "pragma", "private", "protected", "public", "pure", "real", "ref", "return", "scope", "shared", "short", "static", "struct", "super", "switch", "synchronized", "template", "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", "ucent", "uint", "ulong", - "union", "unittest", "ushort", "version", "void", "volatile", "wchar", + "union", "unittest", "ushort", "version", "void", "wchar", "while", "with", "__DATE__", "__EOF__", "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", "__TIMESTAMP__", From b4e97d338129b6abdf1ba560765644db38c89b5a Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Wed, 20 Feb 2019 11:25:31 -0800 Subject: [PATCH 26/92] Fix #436 --- src/dfmt/formatter.d | 12 ++++++++++++ tests/allman/issue0436.d.ref | 1 + tests/issue0436.d | 1 + tests/otbs/issue0436.d.ref | 1 + 4 files changed, 15 insertions(+) create mode 100644 tests/allman/issue0436.d.ref create mode 100644 tests/issue0436.d create mode 100644 tests/otbs/issue0436.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 1a13a45..6620071 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -232,6 +232,18 @@ private: { writeToken(); write(" "); + while (index < tokens.length) + { + if (currentIs(tok!"(")) + formatLeftParenOrBracket(); + else if (currentIs(tok!")")) + { + formatRightParen(); + break; + } + else + writeToken(); + } } else if (((isBlockHeader() || currentIs(tok!"version")) && peekIs(tok!"(")) || (currentIs(tok!"debug") && peekIs(tok!"{"))) diff --git a/tests/allman/issue0436.d.ref b/tests/allman/issue0436.d.ref new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/allman/issue0436.d.ref @@ -0,0 +1 @@ +extern (Objective-C) int a; diff --git a/tests/issue0436.d b/tests/issue0436.d new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/issue0436.d @@ -0,0 +1 @@ +extern (Objective-C) int a; diff --git a/tests/otbs/issue0436.d.ref b/tests/otbs/issue0436.d.ref new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/otbs/issue0436.d.ref @@ -0,0 +1 @@ +extern (Objective-C) int a; From 313b886799d81108540bac94b8b24632c53ffa49 Mon Sep 17 00:00:00 2001 From: Basile-z <16154339+Basile-z@users.noreply.github.com> Date: Mon, 1 Apr 2019 09:00:24 +0200 Subject: [PATCH 27/92] upgrade dependencies (#438) upgrade dependencies merged-on-behalf-of: Basile-z --- dub.json | 2 +- libdparse | 2 +- stdx-allocator | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dub.json b/dub.json index 7d0c016..c36a2db 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.11.2" + "libdparse": "~>0.11.4" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index 23b20de..aae3719 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 23b20de4ee48ed3f0e8729f6318405543cb3a611 +Subproject commit aae371931a99027465952cd6fdaede4eb4743e76 diff --git a/stdx-allocator b/stdx-allocator index b7778fd..ae237ca 160000 --- a/stdx-allocator +++ b/stdx-allocator @@ -1 +1 @@ -Subproject commit b7778fd6bf5f9aaaa87dd27f989cefbf9b3b365f +Subproject commit ae237cabd1843774cc78aad0729c914a3dd579db From 793a575b1c33d58924e4f0945f15dacf1301246d Mon Sep 17 00:00:00 2001 From: Sebastian Wilzbach Date: Fri, 4 Jan 2019 20:15:56 +0100 Subject: [PATCH 28/92] Build win{32,64} binaries with LDC --- .travis.yml | 43 +++++++++++++++++++-------- makefile | 3 ++ release-windows.sh | 23 ++++++--------- setup-ldc-windows.sh | 70 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+), 26 deletions(-) create mode 100644 setup-ldc-windows.sh diff --git a/.travis.yml b/.travis.yml index 904e4f1..aabf8e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ jobs: include: - stage: GitHub Release #if: tag IS present - d: ldc-1.8.0 + d: ldc-1.13.0 os: linux script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: @@ -37,7 +37,7 @@ jobs: tags: true - stage: GitHub Release #if: tag IS present - d: ldc-1.8.0 + d: ldc-1.13.0 os: osx script: echo "Deploying to GitHub releases ..." && ./release.sh deploy: @@ -60,16 +60,35 @@ jobs: apt: packages: - p7zip-full - - wine - deploy: - provider: releases - api_key: $GH_REPO_TOKEN - file_glob: true - file: bin/dfmt-*.zip - skip_cleanup: true - on: - repo: dlang-community/dfmt - tags: true + deploy: + provider: releases + api_key: $GH_REPO_TOKEN + file_glob: true + file: bin/dfmt-*.zip + skip_cleanup: true + on: + repo: dlang-community/dfmt + tags: true + - stage: GitHub Release + #if: tag IS present + d: dmd + os: linux + language: generic + sudo: yes + script: echo "Deploying to GitHub releases ..." && ARCH=64 ./release-windows.sh + addons: + apt: + packages: + - p7zip-full + deploy: + provider: releases + api_key: $GH_REPO_TOKEN + file_glob: true + file: bin/dfmt-*.zip + skip_cleanup: true + on: + repo: dlang-community/dfmt + tags: true stages: - name: test if: type = pull_request or (type = push and branch = master) diff --git a/makefile b/makefile index 9a2ca55..1227910 100644 --- a/makefile +++ b/makefile @@ -8,6 +8,9 @@ DMD_FLAGS := -O -inline $(DMD_COMMON_FLAGS) DMD_TEST_FLAGS := -unittest -g $(DMD_COMMON_FLAGS) LDC_FLAGS := -g -w -oq $(INCLUDE_PATHS) GDC_FLAGS := -g -w -oq $(INCLUDE_PATHS) +override DMD_FLAGS += $(DFLAGS) +override LDC_FLAGS += $(DFLAGS) +override GDC_FLAGS += $(DFLAGS) DC ?= dmd LDC ?= ldc2 GDC ?= gdc diff --git a/release-windows.sh b/release-windows.sh index 956982a..49ce3a5 100755 --- a/release-windows.sh +++ b/release-windows.sh @@ -1,26 +1,21 @@ #!/usr/bin/env bash -# Build the Windows binaries under Linux (requires wine) +# Build the Windows binaries under Linux set -eux -o pipefail -VERSION=$(git describe --abbrev=0 --tags) -OS=windows -ARCH_SUFFIX="x86" + +BIN_NAME=dfmt # Allow the script to be run from anywhere DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $DIR -# Step 1: download the DMD binaries -if [ ! -d dmd2 ] ; then - wget http://downloads.dlang.org/releases/2.x/2.079.0/dmd.2.079.0.windows.7z - 7z x dmd.2.079.0.windows.7z > /dev/null -fi +source setup-ldc-windows.sh -# Step 2: Run DMD via wineconsole -archiveName="dfmt-$VERSION-$OS-$ARCH_SUFFIX.zip" +# Run LDC with cross-compilation +archiveName="$BIN_NAME-$VERSION-$OS-$ARCH_SUFFIX.zip" echo "Building $archiveName" mkdir -p bin -git describe --tags > bin/githash.txt # no git installed under Wine -DC="$DIR/dmd2/windows/bin/dmd.exe" wine cmd /C build.bat +DC=ldmd2 make ldc cd bin -zip "$archiveName" dfmt.exe +mv "${BIN_NAME}" "${BIN_NAME}.exe" +zip "$archiveName" "${BIN_NAME}.exe" diff --git a/setup-ldc-windows.sh b/setup-ldc-windows.sh new file mode 100644 index 0000000..0656b5a --- /dev/null +++ b/setup-ldc-windows.sh @@ -0,0 +1,70 @@ +#!/usr/bin/env bash + +# sets up LDC for cross-compilation. Source this script, s.t. the new LDC is in PATH + +LDC_VERSION="1.13.0" +ARCH=${ARCH:-32} +VERSION=$(git describe --abbrev=0 --tags) +OS=windows + +# Step 0: install ldc +if [ ! -f install.sh ] ; then + wget https://dlang.org/install.sh +fi +. $(bash ./install.sh -a "ldc-${LDC_VERSION}") + +# for the install.sh script only +LDC_PATH="$(dirname $(dirname $(which ldc2)))" + +# Step 1a: download the LDC x64 windows binaries +if [ "${ARCH}" == 64 ] && [ ! -d "ldc2-${LDC_VERSION}-windows-x64" ] ; then + wget "https://github.com/ldc-developers/ldc/releases/download/v1.13.0/ldc2-${LDC_VERSION}-windows-x64.7z" + 7z x "ldc2-${LDC_VERSION}-windows-x64.7z" > /dev/null + # Step 2a: Add LDC windows binaries to LDC Linux + if [ ! -d "${LDC_PATH}/lib-win64" ] ; then + cp -r ldc2-1.13.0-windows-x64/lib "${LDC_PATH}/lib-win64" + cat >> "$LDC_PATH"/etc/ldc2.conf < /dev/null + # Step 2b: Add LDC windows binaries to LDC Linux + if [ ! -d "${LDC_PATH}/lib-win32" ] ; then + cp -r ldc2-1.13.0-windows-x86/lib "${LDC_PATH}/lib-win32" + cat >> "$LDC_PATH"/etc/ldc2.conf < Date: Sat, 13 Apr 2019 15:04:22 +0300 Subject: [PATCH 29/92] make readme look nicer --- README.md | 100 +++++++++++++++++++++++++++--------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 3020f32..605ffbf 100644 --- a/README.md +++ b/README.md @@ -23,33 +23,33 @@ By default, dfmt reads its input from **stdin** and writes to **stdout**. If a file name is specified on the command line, input will be read from the file instead, and output will be written to **stdout**. -**dfmt** uses EditorConfig files for configuration. If you run **dfmt** on a -source file it will look for .editorconfig files that apply to that source file. -If no file is specified on the command line, **dfmt** will look for .editorconfig +**dfmt** uses [EditorConfig](http://editorconfig.org/) files for configuration. If you run **dfmt** on a +source file it will look for *.editorconfig* files that apply to that source file. +If no file is specified on the command line, **dfmt** will look for *.editorconfig* files that would apply to a D file in the current working directory. Command -line options can be used instead of .editorconfig files, or to override options -found in .editorconfig files. +line options can be used instead of *.editorconfig* files, or to override options +found there. ### Options -* **--help | -h**: Display command line options -* **--inplace | -i**: A file name is required and the file will be edited in-place. -* **--align_switch_statements**: See **dfmt_align_switch_statements** below -* **--brace_style**: See **brace_style** below -* **--end_of_line**: See **end_of_line** below -* **--indent_size**: See **indent_size** below -* **--indent_style | -t**: See **indent_style** below -* **--max_line_length**: See **max_line_length** below -* **--soft_max_line_length**: See **dfmt_soft_max_line_length** below -* **--outdent_attributes**: See **dfmt_outdent_attributes** below -* **--single_template_constraint_indent**: See **dfmt_template_constraint_style** below -* **--space_after_cast**: See **dfmt_space_after_cast** below -* **--space_before_function_parameters**: See **dfmt_space_before_function_parameters** 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 -* **--compact_labeled_statements**: See **dfmt_compact_labeled_statements** below -* **--template_constraint_style**: See **dfmt_template_constraint_style** below -* **--space_before_aa_colon**: See **dfmt_space_before_aa_colon** below +* `--help | -h`: Display command line options +* `--inplace | -i`: A file name is required and the file will be edited in-place. +* `--align_switch_statements`: See **dfmt_align_switch_statements** below +* `--brace_style`: See **brace_style** below +* `--end_of_line`: See **end_of_line** below +* `--indent_size`: See **indent_size** below +* `--indent_style | -t`: See **indent_style** below +* `--max_line_length`: See **max_line_length** below +* `--soft_max_line_length`: See **dfmt_soft_max_line_length** below +* `--outdent_attributes`: See **dfmt_outdent_attributes** below +* `--single_template_constraint_indent`: See **dfmt_template_constraint_style** below +* `--space_after_cast`: See **dfmt_space_after_cast** below +* `--space_before_function_parameters`: See **dfmt_space_before_function_parameters** 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 +* `--compact_labeled_statements`: See **dfmt_compact_labeled_statements** below +* `--template_constraint_style`: See **dfmt_template_constraint_style** below +* `--space_before_aa_colon`: See **dfmt_space_before_aa_colon** below ### Example ``` @@ -68,7 +68,7 @@ void main(string[] args) // dfmt has no way of knowing that "getopt" is special, so it wraps the // argument list normally - getopt(args, "optionOne", &optionOne, "optionTwo", &optionTwo, "optionThree", &optionThree); + getopt(args, "optionOne", &optionOne, "optionTwo", &optionTwo, "optionThree", &optionThree); // dfmt off getopt(args, @@ -83,32 +83,32 @@ void main(string[] args) **dfmt** uses [EditorConfig](http://editorconfig.org/) configuration files. **dfmt**-specific properties are prefixed with *dfmt_*. ### Standard EditorConfig properties -Property Name | Allowed Values | Default Value | Description ---------------|----------------|---------------|------------ -end_of_line | `cr`, `crlf` and `lf` | `lf` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#end_of_line) -insert_final_newline | | `true` | Not supported. `dfmt` always inserts a final newline. -charset | | `UTF-8` | Not supported. `dfmt` only works correctly on UTF-8. -indent_style | `tab`, `space` | `space` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_style) -indent_size | positive integers | `4` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_size) -tab_width | positive integers | `4` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#tab_width) -trim_trailing_whitespace | | `true` | Not supported. `dfmt` does not emit trailing whitespace. -max_line_length | positive integers | `120` | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#max_line_length) +Property Name | Allowed Values | Description +--------------|----------------|------------ +end_of_line | `cr`, `crlf` and **`lf`** | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#end_of_line) +insert_final_newline | **`true`** | Not supported. `dfmt` always inserts a final newline. +charset | **`UTF-8`** | Not supported. `dfmt` only works correctly on UTF-8. +indent_style | `tab`, **`space`** | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_style) +indent_size | positive integers (**`4`**) | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#indent_size) +tab_width | positive integers (**`4`**) | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#tab_width) +trim_trailing_whitespace | **`true`** | Not supported. `dfmt` does not emit trailing whitespace. +max_line_length | positive integers (**`120`**) | [See EditorConfig documentation.](https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties#max_line_length) ### dfmt-specific properties -Property Name | Allowed Values | Default Value | Description ---------------|----------------|---------------|------------ -dfmt_brace_style | `allman`, `otbs`, or `stroustrup` | `allman` | [See Wikipedia](https://en.wikipedia.org/wiki/Brace_style) -dfmt_soft_max_line_length | positive integers | `80` | The formatting process will usually keep lines below this length, but they may be up to max_line_length columns long. -dfmt_align_switch_statements (Not yet implemented) | `true`, `false` | `true` | Align labels, cases, and defaults with their enclosing switch. -dfmt_outdent_attributes (Not yet implemented) | `true`, `false` | `true` | Decrease the indentation level of attributes. -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` | `true` | 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_space_before_function_parameters | `true`, `false` | `false` | Insert space before the opening paren of a function parameter list. -dfmt_selective_import_space | `true`, `false` | `true` | Insert space after the module name and before the `:` for selective imports. -dfmt_compact_labeled_statements | `true`, `false` | `true` | Place labels on the same line as the labeled `switch`, `for`, `foreach`, or `while` statement. -dfmt_template_constraint_style | `conditional_newline_indent` `conditional_newline` `always_newline` `always_newline_indent` | `conditional_newline_indent` | Control the formatting of template constraints. -dfmt_single_template_constraint_indent | `true`, `false` | `false` | Set if the constraints are indented by a single tab instead of two. Has only an effect for if indentation style if set to `always_newline_indent` or `conditional_newline_indent`. -dfmt_space_before_aa_colon | `true`, `false` | `false` | Adds a space after an associative array key before the `:` like in older dfmt versions. +Property Name | Allowed Values | Description +--------------|----------------|------------ +dfmt_brace_style | **`allman`**, `otbs`, or `stroustrup` | [See Wikipedia](https://en.wikipedia.org/wiki/Brace_style) +dfmt_soft_max_line_length | positive integers (**`80`**) | The formatting process will usually keep lines below this length, but they may be up to *max_line_length* columns long. +dfmt_align_switch_statements (Not yet implemented) | **`true`**, `false` | Align labels, cases, and defaults with their enclosing switch. +dfmt_outdent_attributes (Not yet implemented) | **`true`**, `false`| Decrease the indentation level of attributes. +dfmt_split_operator_at_line_end | `true`, **`false`** | Place operators on the end of the previous line when splitting lines. +dfmt_space_after_cast | **`true`**, `false` | Insert space after the closing paren of a `cast` expression. +dfmt_space_after_keywords (Not yet implemented) | **`true`**, `false` | Insert space after `if`, `while`, `foreach`, etc, and before the `(`. +dfmt_space_before_function_parameters | `true`, **`false`** | Insert space before the opening paren of a function parameter list. +dfmt_selective_import_space | **`true`**, `false` | Insert space after the module name and before the `:` for selective imports. +dfmt_compact_labeled_statements | **`true`**, `false` | Place labels on the same line as the labeled `switch`, `for`, `foreach`, or `while` statement. +dfmt_template_constraint_style | **`conditional_newline_indent`** `conditional_newline` `always_newline` `always_newline_indent` | Control the formatting of template constraints. +dfmt_single_template_constraint_indent | `true`, **`false`** | Set if the constraints are indented by a single tab instead of two. Has only an effect if the style set to `always_newline_indent` or `conditional_newline_indent`. +dfmt_space_before_aa_colon | `true`, **`false`** | Adds a space after an associative array key before the `:` like in older dfmt versions. ## Terminology * Braces - `{` and `}` From 087843012560cbc05d06983444dd06c166ac3619 Mon Sep 17 00:00:00 2001 From: Viktor Date: Sat, 13 Apr 2019 15:33:21 +0300 Subject: [PATCH 30/92] sort options and make links to "below" --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 605ffbf..b28fa6e 100644 --- a/README.md +++ b/README.md @@ -31,25 +31,25 @@ line options can be used instead of *.editorconfig* files, or to override option found there. ### Options -* `--help | -h`: Display command line options +* `--help | -h`: Display command line options. * `--inplace | -i`: A file name is required and the file will be edited in-place. -* `--align_switch_statements`: See **dfmt_align_switch_statements** below -* `--brace_style`: See **brace_style** below -* `--end_of_line`: See **end_of_line** below -* `--indent_size`: See **indent_size** below -* `--indent_style | -t`: See **indent_style** below -* `--max_line_length`: See **max_line_length** below -* `--soft_max_line_length`: See **dfmt_soft_max_line_length** below -* `--outdent_attributes`: See **dfmt_outdent_attributes** below -* `--single_template_constraint_indent`: See **dfmt_template_constraint_style** below -* `--space_after_cast`: See **dfmt_space_after_cast** below -* `--space_before_function_parameters`: See **dfmt_space_before_function_parameters** 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 -* `--compact_labeled_statements`: See **dfmt_compact_labeled_statements** below -* `--template_constraint_style`: See **dfmt_template_constraint_style** below -* `--space_before_aa_colon`: See **dfmt_space_before_aa_colon** below +* `--align_switch_statements`: *see dfmt_align_switch_statements [below](#dfmt-specific-properties)* +* `--brace_style`: *see dfmt_brace_style [below](#dfmt-specific-properties)* +* `--compact_labeled_statements`: *see dfmt_compact_labeled_statements [below](#dfmt-specific-properties)* +* `--end_of_line`: *see end_of_line [below](#standard-editorconfig-properties)* +* `--indent_size`: *see indent_size [below](#standard-editorconfig-properties)* +* `--indent_style | -t`: *see indent_style [below](#standard-editorconfig-properties)* +* `--max_line_length`: *see max_line_length [below](#standard-editorconfig-properties)* +* `--outdent_attributes`: *see dfmt_outdent_attributes [below](#dfmt-specific-properties)* +* `--selective_import_space`: *see dfmt_selective_import_space [below](#dfmt-specific-properties)* +* `--single_template_constraint_indent`: *see dfmt_single_template_constraint_indent [below](#dfmt-specific-properties)* +* `--soft_max_line_length`: *see dfmt_soft_max_line_length [below](#dfmt-specific-properties)* +* `--space_after_cast`: *see dfmt_space_after_cast [below](#dfmt-specific-properties)* +* `--space_before_aa_colon`: *see dfmt_space_before_aa_colon [below](#dfmt-specific-properties)* +* `--space_before_function_parameters`: *see dfmt_space_before_function_parameters [below](#dfmt-specific-properties)* +* `--split_operator_at_line_end`: *see dfmt_split_operator_at_line_end [below](#dfmt-specific-properties)* +* `--tab_width`: *see tab_width [below](#standard-editorconfig-properties)* +* `--template_constraint_style`: *see dfmt_template_constraint_style [below](#dfmt-specific-properties)* ### Example ``` From 2cc1f5923593acd80d244a94d9e978bee470253f Mon Sep 17 00:00:00 2001 From: Kotet Date: Mon, 13 May 2019 12:13:32 +0900 Subject: [PATCH 31/92] Fix #433 --- src/dfmt/formatter.d | 2 ++ tests/allman/issue0433.d.ref | 7 +++++++ tests/issue0433.d | 8 ++++++++ tests/otbs/issue0433.d.ref | 6 ++++++ 4 files changed, 23 insertions(+) create mode 100644 tests/allman/issue0433.d.ref create mode 100644 tests/issue0433.d create mode 100644 tests/otbs/issue0433.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 6620071..1214e3b 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -448,6 +448,8 @@ private: write(" "); else if (prevTokenEndLine == currTokenLine || (t == tok!")" && peekIs(tok!"{"))) write(" "); + else if (t == tok!"else") + write(" "); else if (canAddNewline || (peekIs(tok!"{") && t == tok!"}")) newline(); } diff --git a/tests/allman/issue0433.d.ref b/tests/allman/issue0433.d.ref new file mode 100644 index 0000000..bde6071 --- /dev/null +++ b/tests/allman/issue0433.d.ref @@ -0,0 +1,7 @@ +int abs(int x) +{ + if (x < 0) // x negative, must negate + return -x; + else // x already non-negative, just return it + return x; +} diff --git a/tests/issue0433.d b/tests/issue0433.d new file mode 100644 index 0000000..0320fb4 --- /dev/null +++ b/tests/issue0433.d @@ -0,0 +1,8 @@ +int abs(int x) { + if (x < 0) + // x negative, must negate + return -x; + else + // x already non-negative, just return it + return x; +} \ No newline at end of file diff --git a/tests/otbs/issue0433.d.ref b/tests/otbs/issue0433.d.ref new file mode 100644 index 0000000..e0613d8 --- /dev/null +++ b/tests/otbs/issue0433.d.ref @@ -0,0 +1,6 @@ +int abs(int x) { + if (x < 0) // x negative, must negate + return -x; + else // x already non-negative, just return it + return x; +} From f8f34ff0974c2081399ee35bff25e65170ab8b9d Mon Sep 17 00:00:00 2001 From: Kotet Date: Mon, 13 May 2019 17:49:12 +0900 Subject: [PATCH 32/92] Fix #426 --- src/dfmt/formatter.d | 1 + tests/allman/issue0426.d.ref | 6 ++++++ tests/issue0426.d | 5 +++++ tests/otbs/issue0426.d.ref | 5 +++++ 4 files changed, 17 insertions(+) create mode 100644 tests/allman/issue0426.d.ref create mode 100644 tests/issue0426.d create mode 100644 tests/otbs/issue0426.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 1214e3b..753a0f3 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -716,6 +716,7 @@ private: } else if (index < tokens.length && (currentIs(tok!"@") || isBasicType(tokens[index].type) + || currentIs(tok!"extern") || currentIs(tok!"identifier")) && !currentIsIndentedTemplateConstraint()) write(" "); diff --git a/tests/allman/issue0426.d.ref b/tests/allman/issue0426.d.ref new file mode 100644 index 0000000..72d3d26 --- /dev/null +++ b/tests/allman/issue0426.d.ref @@ -0,0 +1,6 @@ +import std.stdio; + +@safe extern (C) void main() +{ + writeln("Hello World!"); +} diff --git a/tests/issue0426.d b/tests/issue0426.d new file mode 100644 index 0000000..12855aa --- /dev/null +++ b/tests/issue0426.d @@ -0,0 +1,5 @@ +import std.stdio; + +@safe extern(C) void main() { + writeln("Hello World!"); +} \ No newline at end of file diff --git a/tests/otbs/issue0426.d.ref b/tests/otbs/issue0426.d.ref new file mode 100644 index 0000000..b43e99a --- /dev/null +++ b/tests/otbs/issue0426.d.ref @@ -0,0 +1,5 @@ +import std.stdio; + +@safe extern (C) void main() { + writeln("Hello World!"); +} From 3af8edc57f989aed1234666bd366e62229af4115 Mon Sep 17 00:00:00 2001 From: Kotet Date: Mon, 13 May 2019 19:06:59 +0900 Subject: [PATCH 33/92] Fix #361 - Unexpected empty new line if function header ends with a comment --- src/dfmt/formatter.d | 2 +- tests/allman/issue0361.d.ref | 15 +++++++++++++++ tests/issue0361.d | 15 +++++++++++++++ tests/otbs/issue0361.d.ref | 11 +++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0361.d.ref create mode 100644 tests/issue0361.d create mode 100644 tests/otbs/issue0361.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 753a0f3..ee36f40 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -473,7 +473,7 @@ private: else if (!currentIs(tok!"{")) write(" "); } - else if (!currentIs(tok!"{")) + else if (!currentIs(tok!"{") && !currentIs(tok!"in") && !currentIs(tok!"out")) { if (currentIs(tok!")") && indents.topIs(tok!",")) indents.pop(); diff --git a/tests/allman/issue0361.d.ref b/tests/allman/issue0361.d.ref new file mode 100644 index 0000000..30c7f2e --- /dev/null +++ b/tests/allman/issue0361.d.ref @@ -0,0 +1,15 @@ +void foo() /**/ +in +{ +} +body +{ +} + +void bar() /**/ +out +{ +} +body +{ +} diff --git a/tests/issue0361.d b/tests/issue0361.d new file mode 100644 index 0000000..30c7f2e --- /dev/null +++ b/tests/issue0361.d @@ -0,0 +1,15 @@ +void foo() /**/ +in +{ +} +body +{ +} + +void bar() /**/ +out +{ +} +body +{ +} diff --git a/tests/otbs/issue0361.d.ref b/tests/otbs/issue0361.d.ref new file mode 100644 index 0000000..7e2b562 --- /dev/null +++ b/tests/otbs/issue0361.d.ref @@ -0,0 +1,11 @@ +void foo() /**/ +in { +} +body { +} + +void bar() /**/ +out { +} +body { +} From ac61efe7670acfa06cee2edaf61d4f7c368e4ce7 Mon Sep 17 00:00:00 2001 From: sobaya Date: Tue, 30 Jul 2019 13:02:48 +0900 Subject: [PATCH 34/92] Fix: Issue 256 "named member struct initialisers" --- src/dfmt/ast_info.d | 13 +++++++++++++ src/dfmt/formatter.d | 8 +++++++- tests/allman/issue0256.d.ref | 4 ++++ tests/issue0256.d | 4 ++++ tests/otbs/issue0256.d.ref | 3 +++ 5 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0256.d.ref create mode 100644 tests/issue0256.d create mode 100644 tests/otbs/issue0256.d.ref diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index 9c3f68f..83082d1 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -23,6 +23,12 @@ struct BraceIndentInfo uint beginIndentLevel; } +struct StructInitializerInfo +{ + size_t startLocation; + size_t endLocation; +} + /// AST information that is needed by the formatter. struct ASTInformation { @@ -53,6 +59,8 @@ struct ASTInformation sort(sharedStaticConstructorDestructorLocations); sort!((a,b) => a.endLocation < b.endLocation) (indentInfoSortedByEndLocation); + sort!((a,b) => a.endLocation < b.endLocation) + (structInfoSortedByEndLocation); sort(ufcsHintLocations); ufcsHintLocations = ufcsHintLocations.uniq().array(); } @@ -118,6 +126,9 @@ struct ASTInformation size_t[] ufcsHintLocations; BraceIndentInfo[] indentInfoSortedByEndLocation; + + /// Opening & closing braces of struct initializers + StructInitializerInfo[] structInfoSortedByEndLocation; } /// Collects information from the AST that is useful for the formatter @@ -272,6 +283,8 @@ final class FormatVisitor : ASTVisitor { astInformation.structInitStartLocations ~= structInitializer.startLocation; astInformation.structInitEndLocations ~= structInitializer.endLocation; + astInformation.structInfoSortedByEndLocation ~= + StructInitializerInfo(structInitializer.startLocation, structInitializer.endLocation); astInformation.indentInfoSortedByEndLocation ~= BraceIndentInfo(structInitializer.startLocation, structInitializer.endLocation); diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index ee36f40..56fc27a 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -725,10 +725,14 @@ private: void formatColon() { import dfmt.editorconfig : OptionalBoolean; + import std.algorithm : canFind; immutable bool isCase = astInformation.caseEndLocations.canFindIndex(current.index); immutable bool isAttribute = astInformation.attributeDeclarationLines.canFindIndex( current.line); + immutable bool isStructInitializer = astInformation.structInfoSortedByEndLocation + .canFind!(st => st.startLocation < current.index && current.index < st.endLocation); + if (isCase || isAttribute) { writeToken(); @@ -748,7 +752,9 @@ private: || peekBack2Is(tok!":", true)) && !(isBlockHeader(1) && !peekIs(tok!"if"))) { writeToken(); - if (!currentIs(tok!"{")) + if (isStructInitializer) + write(" "); + else if (!currentIs(tok!"{")) newline(); } else diff --git a/tests/allman/issue0256.d.ref b/tests/allman/issue0256.d.ref new file mode 100644 index 0000000..41c1237 --- /dev/null +++ b/tests/allman/issue0256.d.ref @@ -0,0 +1,4 @@ +void foo() +{ + S s = {a: 3}; +} diff --git a/tests/issue0256.d b/tests/issue0256.d new file mode 100644 index 0000000..59d78e4 --- /dev/null +++ b/tests/issue0256.d @@ -0,0 +1,4 @@ +void foo() +{ + S s = { a: 3 }; +} diff --git a/tests/otbs/issue0256.d.ref b/tests/otbs/issue0256.d.ref new file mode 100644 index 0000000..e5ab49c --- /dev/null +++ b/tests/otbs/issue0256.d.ref @@ -0,0 +1,3 @@ +void foo() { + S s = {a: 3}; +} From 1024f167154aa37e754fa46abad84a528ea9f99e Mon Sep 17 00:00:00 2001 From: sobaya Date: Tue, 30 Jul 2019 23:04:02 +0900 Subject: [PATCH 35/92] Add: struct fields to the test of issue 256 --- tests/allman/issue0256.d.ref | 4 +++- tests/issue0256.d | 4 +++- tests/otbs/issue0256.d.ref | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/tests/allman/issue0256.d.ref b/tests/allman/issue0256.d.ref index 41c1237..2003daf 100644 --- a/tests/allman/issue0256.d.ref +++ b/tests/allman/issue0256.d.ref @@ -1,4 +1,6 @@ void foo() { - S s = {a: 3}; + S s1 = {a: 3}; + S s2 = {a: 3, b : "test string"}; + S s3 = {a: 3, b : "test string", c : {x: 3.14, y : 3 + 4}}; } diff --git a/tests/issue0256.d b/tests/issue0256.d index 59d78e4..11dccdf 100644 --- a/tests/issue0256.d +++ b/tests/issue0256.d @@ -1,4 +1,6 @@ void foo() { - S s = { a: 3 }; + S s1 = { a: 3 }; + S s2 = { a: 3, b:"test string" }; + S s3 = { a: 3, b:"test string", c: {x: 3.14, y: 3 + 4} }; } diff --git a/tests/otbs/issue0256.d.ref b/tests/otbs/issue0256.d.ref index e5ab49c..ed62ae0 100644 --- a/tests/otbs/issue0256.d.ref +++ b/tests/otbs/issue0256.d.ref @@ -1,3 +1,5 @@ void foo() { - S s = {a: 3}; + S s1 = {a: 3}; + S s2 = {a: 3, b : "test string"}; + S s3 = {a: 3, b : "test string", c : {x: 3.14, y : 3 + 4}}; } From 81c607a115c9c987cd31bf76413108c30319db1b Mon Sep 17 00:00:00 2001 From: sobaya Date: Thu, 1 Aug 2019 16:58:41 +0900 Subject: [PATCH 36/92] Fix: extrace space after first field --- src/dfmt/formatter.d | 3 ++- tests/allman/issue0256.d.ref | 4 ++-- tests/otbs/issue0256.d.ref | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 56fc27a..3f6d1c7 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -749,7 +749,8 @@ private: } else if (peekBackIs(tok!"identifier") && (peekBack2Is(tok!"{", true) || peekBack2Is(tok!"}", true) || peekBack2Is(tok!";", true) - || peekBack2Is(tok!":", true)) && !(isBlockHeader(1) && !peekIs(tok!"if"))) + || peekBack2Is(tok!":", true) || peekBack2Is(tok!",", true)) + && !(isBlockHeader(1) && !peekIs(tok!"if"))) { writeToken(); if (isStructInitializer) diff --git a/tests/allman/issue0256.d.ref b/tests/allman/issue0256.d.ref index 2003daf..0a18239 100644 --- a/tests/allman/issue0256.d.ref +++ b/tests/allman/issue0256.d.ref @@ -1,6 +1,6 @@ void foo() { S s1 = {a: 3}; - S s2 = {a: 3, b : "test string"}; - S s3 = {a: 3, b : "test string", c : {x: 3.14, y : 3 + 4}}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; } diff --git a/tests/otbs/issue0256.d.ref b/tests/otbs/issue0256.d.ref index ed62ae0..576e0bd 100644 --- a/tests/otbs/issue0256.d.ref +++ b/tests/otbs/issue0256.d.ref @@ -1,5 +1,5 @@ void foo() { S s1 = {a: 3}; - S s2 = {a: 3, b : "test string"}; - S s3 = {a: 3, b : "test string", c : {x: 3.14, y : 3 + 4}}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; } From 05db8ae8fa7608329f9acf407317a73b9fe3065b Mon Sep 17 00:00:00 2001 From: sobaya Date: Thu, 1 Aug 2019 17:43:45 +0900 Subject: [PATCH 37/92] Fix: indentation for wrapping in struct initializer --- src/dfmt/formatter.d | 8 +++++++- tests/allman/issue0256.d.ref | 10 ++++++---- tests/issue0256.d | 16 +++++++++++----- tests/otbs/issue0256.d.ref | 10 ++++++---- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 3f6d1c7..18f958c 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1515,7 +1515,7 @@ private: void newline() { import std.range : assumeSorted; - import std.algorithm : max; + import std.algorithm : max, canFind; import dfmt.editorconfig : OptionalBoolean; if (currentIs(tok!"comment") && index > 0 && current.line == tokenEndLine(tokens[index - 1])) @@ -1558,6 +1558,12 @@ private: immutable l = indents.indentToMostRecent(tok!"switch"); if (l != -1 && config.dfmt_align_switch_statements == OptionalBoolean.t) indentLevel = l; + else if (astInformation.structInfoSortedByEndLocation + .canFind!(st => st.startLocation < current.index && current.index < st.endLocation)) { + immutable l2 = indents.indentToMostRecent(tok!"{"); + assert(l2 != -1); + indentLevel = l2 + 1; + } else if (config.dfmt_compact_labeled_statements == OptionalBoolean.f || !isBlockHeader(2) || peek2Is(tok!"if")) { diff --git a/tests/allman/issue0256.d.ref b/tests/allman/issue0256.d.ref index 0a18239..e7463d5 100644 --- a/tests/allman/issue0256.d.ref +++ b/tests/allman/issue0256.d.ref @@ -1,6 +1,8 @@ -void foo() +void main() { - S s1 = {a: 3}; - S s2 = {a: 3, b: "test string"}; - S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; + S s = { + someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar + someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, + somethingMore: null, someFlagInThisStruct: -1 + }; } diff --git a/tests/issue0256.d b/tests/issue0256.d index 11dccdf..f4d44dc 100644 --- a/tests/issue0256.d +++ b/tests/issue0256.d @@ -1,6 +1,12 @@ -void foo() -{ - S s1 = { a: 3 }; - S s2 = { a: 3, b:"test string" }; - S s3 = { a: 3, b:"test string", c: {x: 3.14, y: 3 + 4} }; +void main() { + S s = { + someStructMember1: 2, + someStructMember2: 42, + someStructMember3: null, // foobar + someOtherMember1: objA, + someOtherMember2: objB, + someOtherMember3: 0, + somethingMore: null, + someFlagInThisStruct: -1 + }; } diff --git a/tests/otbs/issue0256.d.ref b/tests/otbs/issue0256.d.ref index 576e0bd..2d0098f 100644 --- a/tests/otbs/issue0256.d.ref +++ b/tests/otbs/issue0256.d.ref @@ -1,5 +1,7 @@ -void foo() { - S s1 = {a: 3}; - S s2 = {a: 3, b: "test string"}; - S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; +void main() { + S s = { + someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar + someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, + somethingMore: null, someFlagInThisStruct: -1 + }; } From b3946b75253ef680363619b9e75221e36fa6253e Mon Sep 17 00:00:00 2001 From: sobaya Date: Sat, 3 Aug 2019 08:55:32 +0900 Subject: [PATCH 38/92] Add: Test for nested struct formatting --- tests/allman/issue0256.d.ref | 5 ++++- tests/issue0256.d | 5 ++++- tests/otbs/issue0256.d.ref | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/allman/issue0256.d.ref b/tests/allman/issue0256.d.ref index e7463d5..5776aec 100644 --- a/tests/allman/issue0256.d.ref +++ b/tests/allman/issue0256.d.ref @@ -1,6 +1,9 @@ void main() { - S s = { + S s1 = {a: 3}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; + T t = { someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, somethingMore: null, someFlagInThisStruct: -1 diff --git a/tests/issue0256.d b/tests/issue0256.d index f4d44dc..18f4c98 100644 --- a/tests/issue0256.d +++ b/tests/issue0256.d @@ -1,5 +1,8 @@ void main() { - S s = { + S s1 = { a: 3 }; + S s2 = { a: 3, b:"test string" }; + S s3 = { a: 3, b:"test string", c: {x: 3.14, y: 3 + 4} }; + T t = { someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar diff --git a/tests/otbs/issue0256.d.ref b/tests/otbs/issue0256.d.ref index 2d0098f..ca215a4 100644 --- a/tests/otbs/issue0256.d.ref +++ b/tests/otbs/issue0256.d.ref @@ -1,5 +1,8 @@ void main() { - S s = { + S s1 = {a: 3}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; + T t = { someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, somethingMore: null, someFlagInThisStruct: -1 From ac8e34815f15469ac2b824dcb49b60f9145c29b5 Mon Sep 17 00:00:00 2001 From: sobaya Date: Sun, 4 Aug 2019 13:04:39 +0900 Subject: [PATCH 39/92] Fix: Use more readable expression --- src/dfmt/formatter.d | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 18f958c..04d80bd 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -725,7 +725,7 @@ private: void formatColon() { import dfmt.editorconfig : OptionalBoolean; - import std.algorithm : canFind; + import std.algorithm : canFind, any; immutable bool isCase = astInformation.caseEndLocations.canFindIndex(current.index); immutable bool isAttribute = astInformation.attributeDeclarationLines.canFindIndex( @@ -747,10 +747,10 @@ private: newline(); } } - else if (peekBackIs(tok!"identifier") && (peekBack2Is(tok!"{", true) - || peekBack2Is(tok!"}", true) || peekBack2Is(tok!";", true) - || peekBack2Is(tok!":", true) || peekBack2Is(tok!",", true)) - && !(isBlockHeader(1) && !peekIs(tok!"if"))) + else if (peekBackIs(tok!"identifier") + && [tok!"{", tok!"}", tok!";", tok!":", tok!","] + .any!((ptrdiff_t token) => peekBack2Is(cast(IdType)token, true)) + && (!isBlockHeader(1) || peekIs(tok!"if"))) { writeToken(); if (isStructInitializer) From 06881d8654aaf28b61d8fb826ebf7b09c8e9aa01 Mon Sep 17 00:00:00 2001 From: sobaya Date: Sun, 4 Aug 2019 13:05:39 +0900 Subject: [PATCH 40/92] Fix: assertion message in indent manipulation of struct initializer --- src/dfmt/formatter.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 04d80bd..c8d63a6 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1561,7 +1561,7 @@ private: else if (astInformation.structInfoSortedByEndLocation .canFind!(st => st.startLocation < current.index && current.index < st.endLocation)) { immutable l2 = indents.indentToMostRecent(tok!"{"); - assert(l2 != -1); + assert(l2 != -1, "Recent '{' is not found despite being in struct initializer"); indentLevel = l2 + 1; } else if (config.dfmt_compact_labeled_statements == OptionalBoolean.f From 30ab6e103d04b013473acc3dafcd25aed1a512af Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 25 Nov 2019 16:22:13 +0100 Subject: [PATCH 41/92] upgrade libdparse to 0.13.z --- dub.json | 2 +- libdparse | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index c36a2db..6feb82e 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.11.4" + "libdparse": "~>0.13.0" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index aae3719..f512cb0 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit aae371931a99027465952cd6fdaede4eb4743e76 +Subproject commit f512cb0b4bc11ce64eb64a710163495e425a7ad8 From d33b87896500f9b85b134f2d391e5e9070c9925d Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 25 Nov 2019 16:34:58 +0100 Subject: [PATCH 42/92] fix #430 already working resolved with previous libdparse update --- tests/allman/issue0430.d.ref | 6 ++++++ tests/issue0430.d | 4 ++++ tests/otbs/issue0430.d.ref | 4 ++++ 3 files changed, 14 insertions(+) create mode 100644 tests/allman/issue0430.d.ref create mode 100644 tests/issue0430.d create mode 100644 tests/otbs/issue0430.d.ref diff --git a/tests/allman/issue0430.d.ref b/tests/allman/issue0430.d.ref new file mode 100644 index 0000000..ea6b044 --- /dev/null +++ b/tests/allman/issue0430.d.ref @@ -0,0 +1,6 @@ +void f(bool body) +{ + if (body) + { + } +} diff --git a/tests/issue0430.d b/tests/issue0430.d new file mode 100644 index 0000000..f8acf72 --- /dev/null +++ b/tests/issue0430.d @@ -0,0 +1,4 @@ +void f(bool body) { + if (body) { + } +} \ No newline at end of file diff --git a/tests/otbs/issue0430.d.ref b/tests/otbs/issue0430.d.ref new file mode 100644 index 0000000..ce11f55 --- /dev/null +++ b/tests/otbs/issue0430.d.ref @@ -0,0 +1,4 @@ +void f(bool body) { + if (body) { + } +} From 28b32d9d77683131f15a7b72917014ee9abe4144 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 25 Nov 2019 16:41:12 +0100 Subject: [PATCH 43/92] trivially fix #134 was fixed in the past --- tests/allman/issue0134.d.ref | 15 +++++++++++++++ tests/issue0134.d | 11 +++++++++++ tests/otbs/issue0134.d.ref | 13 +++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 tests/allman/issue0134.d.ref create mode 100644 tests/issue0134.d create mode 100644 tests/otbs/issue0134.d.ref diff --git a/tests/allman/issue0134.d.ref b/tests/allman/issue0134.d.ref new file mode 100644 index 0000000..fbc72c0 --- /dev/null +++ b/tests/allman/issue0134.d.ref @@ -0,0 +1,15 @@ +void foo() +{ + string command; + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + unittest + { + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + } +} diff --git a/tests/issue0134.d b/tests/issue0134.d new file mode 100644 index 0000000..8b57f0e --- /dev/null +++ b/tests/issue0134.d @@ -0,0 +1,11 @@ +void foo() { + string command; + version (Posix) command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) command ~= " 2> /dev/null 1> /dev/null"; + + unittest + { + version (Posix) command ~= " 2> /dev/null 1> /dev/null"; + } +} diff --git a/tests/otbs/issue0134.d.ref b/tests/otbs/issue0134.d.ref new file mode 100644 index 0000000..4e2c535 --- /dev/null +++ b/tests/otbs/issue0134.d.ref @@ -0,0 +1,13 @@ +void foo() { + string command; + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + unittest { + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + } +} From 79ae2c09d0b86a3d9a561c1fbf4eb4745df535ad Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 25 Nov 2019 16:45:46 +0100 Subject: [PATCH 44/92] trivially fix #195 probably fixed in previous libdparse --- tests/allman/issue0195.d.ref | 16 ++++++++++++++++ tests/issue0195.d | 17 +++++++++++++++++ tests/otbs/issue0195.d.ref | 14 ++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 tests/allman/issue0195.d.ref create mode 100644 tests/issue0195.d create mode 100644 tests/otbs/issue0195.d.ref diff --git a/tests/allman/issue0195.d.ref b/tests/allman/issue0195.d.ref new file mode 100644 index 0000000..b638abf --- /dev/null +++ b/tests/allman/issue0195.d.ref @@ -0,0 +1,16 @@ +void main() +{ + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; l) + { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} diff --git a/tests/issue0195.d b/tests/issue0195.d new file mode 100644 index 0000000..f92a7ef --- /dev/null +++ b/tests/issue0195.d @@ -0,0 +1,17 @@ +void main() +{ + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; + l) + { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} diff --git a/tests/otbs/issue0195.d.ref b/tests/otbs/issue0195.d.ref new file mode 100644 index 0000000..85955a0 --- /dev/null +++ b/tests/otbs/issue0195.d.ref @@ -0,0 +1,14 @@ +void main() { + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; l) { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} From 70bae7487e5c7be0eda3899ba77b9e7dbb53a371 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 25 Nov 2019 16:51:25 +0100 Subject: [PATCH 45/92] add dub build to readme fix #234 --- README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b28fa6e..130df61 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,7 @@ **dfmt** is beta quality. Make backups of your files or use source control when using the **--inplace** option. -## Building -### Using Make -* Clone the repository -* Run ```git submodule update --init --recursive``` in the dfmt directory -* To compile with DMD, run ```make``` in the dfmt directory. To compile with - LDC, run ```make ldc``` instead. The generated binary will be placed in ```dfmt/bin/```. +## Installation ### Installing with DUB @@ -18,6 +13,16 @@ when using the **--inplace** option. > dub fetch --version='~master' dfmt && dub run dfmt -- -h ``` +### Building from source using Make +* Clone the repository +* Run ```git submodule update --init --recursive``` in the dfmt directory +* To compile with DMD, run ```make``` in the dfmt directory. To compile with + LDC, run ```make ldc``` instead. The generated binary will be placed in ```dfmt/bin/```. + +### Building from source using dub +* Clone the repository +* run `dub build --build=release`, optionally with `--compiler=ldc2` + ## Using By default, dfmt reads its input from **stdin** and writes to **stdout**. If a file name is specified on the command line, input will be read from the From 8c2076d4f203b396fd23a3bcd8d2b4c0f657ecf1 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Mon, 25 Nov 2019 17:10:20 +0100 Subject: [PATCH 46/92] better gen_expected script --- tests/gen_expected.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/gen_expected.sh b/tests/gen_expected.sh index a5520f7..b49ae4a 100755 --- a/tests/gen_expected.sh +++ b/tests/gen_expected.sh @@ -1,10 +1,12 @@ +#!/usr/bin/env bash + argsFile=$1.args if [ -e ${argsFile} ]; then args=$(cat ${argsFile}) fi echo "Args:" ${args} -dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref -dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref +../bin/dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref +../bin/dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref echo "------------------" echo "allman:" From 8f779b33bff8baf2530708484b5caeb430bccbbf Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sat, 4 Jan 2020 23:23:08 +0100 Subject: [PATCH 47/92] Put a space in contract expressions Fixes #448. --- src/dfmt/formatter.d | 9 +++++++-- tests/allman/dip1009.d.ref | 4 ++-- tests/allman/issue0448.d.ref | 4 ++++ tests/issue0448.d | 4 ++++ tests/otbs/dip1009.d.ref | 4 ++-- tests/otbs/issue0448.d.ref | 3 +++ 6 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 tests/allman/issue0448.d.ref create mode 100644 tests/issue0448.d create mode 100644 tests/otbs/issue0448.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index c8d63a6..15be43e 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1135,7 +1135,7 @@ private: else if (peekBackIsKeyword) write(" "); writeToken(); - if (!currentIs(tok!"(") && !currentIs(tok!"{") && !currentIs(tok!"comment")) + if (!currentIs(tok!"{") && !currentIs(tok!"comment")) write(" "); break; case tok!"try": @@ -1169,7 +1169,7 @@ private: current.index); if (isFunctionLit && config.dfmt_brace_style == BraceStyle.allman) newline(); - else if (!isContract) + else if (!isContract || currentIs(tok!"(")) write(" "); break; case tok!"is": @@ -1218,6 +1218,11 @@ private: } } goto default; + case tok!"invariant": + writeToken(); + if (currentIs(tok!"(")) + write(" "); + break; default: if (peekBackIs(tok!"identifier")) write(" "); diff --git a/tests/allman/dip1009.d.ref b/tests/allman/dip1009.d.ref index 1b65b6b..8383266 100644 --- a/tests/allman/dip1009.d.ref +++ b/tests/allman/dip1009.d.ref @@ -13,8 +13,8 @@ do } int bar(int arg) -in(arg > 0) -out(; true) +in (arg > 0) +out (; true) out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0) { return 0; diff --git a/tests/allman/issue0448.d.ref b/tests/allman/issue0448.d.ref new file mode 100644 index 0000000..fd820ce --- /dev/null +++ b/tests/allman/issue0448.d.ref @@ -0,0 +1,4 @@ +struct S +{ + invariant (true); +} diff --git a/tests/issue0448.d b/tests/issue0448.d new file mode 100644 index 0000000..a643618 --- /dev/null +++ b/tests/issue0448.d @@ -0,0 +1,4 @@ +struct S +{ + invariant(true); +} diff --git a/tests/otbs/dip1009.d.ref b/tests/otbs/dip1009.d.ref index e65b139..ef6b9c8 100644 --- a/tests/otbs/dip1009.d.ref +++ b/tests/otbs/dip1009.d.ref @@ -10,8 +10,8 @@ do { } int bar(int arg) -in(arg > 0) -out(; true) +in (arg > 0) +out (; true) out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0) { return 0; } diff --git a/tests/otbs/issue0448.d.ref b/tests/otbs/issue0448.d.ref new file mode 100644 index 0000000..d3392c2 --- /dev/null +++ b/tests/otbs/issue0448.d.ref @@ -0,0 +1,3 @@ +struct S { + invariant (true); +} From 0795a477f1112516bc9c5090b6c707f15b7ea7ed Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Fri, 3 Jan 2020 15:28:45 +0100 Subject: [PATCH 48/92] Put space between a comment and an identifier Fixes #452. --- src/dfmt/formatter.d | 2 +- tests/allman/issue0452.d.ref | 2 ++ tests/issue0452.d | 3 +++ tests/otbs/issue0452.d.ref | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0452.d.ref create mode 100644 tests/issue0452.d create mode 100644 tests/otbs/issue0452.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 15be43e..8236032 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -448,7 +448,7 @@ private: write(" "); else if (prevTokenEndLine == currTokenLine || (t == tok!")" && peekIs(tok!"{"))) write(" "); - else if (t == tok!"else") + else if (peekBackIsOneOf(false, tok!"else", tok!"identifier")) write(" "); else if (canAddNewline || (peekIs(tok!"{") && t == tok!"}")) newline(); diff --git a/tests/allman/issue0452.d.ref b/tests/allman/issue0452.d.ref new file mode 100644 index 0000000..e4aed14 --- /dev/null +++ b/tests/allman/issue0452.d.ref @@ -0,0 +1,2 @@ +@nogc // +void foo(); diff --git a/tests/issue0452.d b/tests/issue0452.d new file mode 100644 index 0000000..0ad0f5d --- /dev/null +++ b/tests/issue0452.d @@ -0,0 +1,3 @@ +@nogc +// +void foo(); diff --git a/tests/otbs/issue0452.d.ref b/tests/otbs/issue0452.d.ref new file mode 100644 index 0000000..e4aed14 --- /dev/null +++ b/tests/otbs/issue0452.d.ref @@ -0,0 +1,2 @@ +@nogc // +void foo(); From 27929e4cc52e50ac69a3414ca203a6255c23ae21 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sun, 5 Jan 2020 18:52:01 +0100 Subject: [PATCH 49/92] Wrap the argument list of a template function Fixes #454. --- src/dfmt/formatter.d | 3 +++ tests/allman/issue0454.d.ref | 10 ++++++++++ tests/issue0454.d | 9 +++++++++ tests/otbs/issue0454.d.ref | 9 +++++++++ 4 files changed, 31 insertions(+) create mode 100644 tests/allman/issue0454.d.ref create mode 100644 tests/issue0454.d create mode 100644 tests/otbs/issue0454.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 8236032..49d8e18 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -452,6 +452,9 @@ private: write(" "); else if (canAddNewline || (peekIs(tok!"{") && t == tok!"}")) newline(); + + if (peekIs(tok!"(") && (peekBackIs(tok!")") || peekBack2Is(tok!"!"))) + pushWrapIndent(tok!"("); } writeToken(); immutable j = justAddedExtraNewline; diff --git a/tests/allman/issue0454.d.ref b/tests/allman/issue0454.d.ref new file mode 100644 index 0000000..27b0ef1 --- /dev/null +++ b/tests/allman/issue0454.d.ref @@ -0,0 +1,10 @@ +void main() +{ + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, + argument6, argument7, argument8, argument9, argument10); +} diff --git a/tests/issue0454.d b/tests/issue0454.d new file mode 100644 index 0000000..9561fb3 --- /dev/null +++ b/tests/issue0454.d @@ -0,0 +1,9 @@ +void main() +{ + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, argument6, argument7, argument8, argument9, argument10); +} diff --git a/tests/otbs/issue0454.d.ref b/tests/otbs/issue0454.d.ref new file mode 100644 index 0000000..d1c12ed --- /dev/null +++ b/tests/otbs/issue0454.d.ref @@ -0,0 +1,9 @@ +void main() { + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, + argument6, argument7, argument8, argument9, argument10); +} From da5195877075bffd54c77bb57913f54cab9ca89c Mon Sep 17 00:00:00 2001 From: Geod24 Date: Tue, 4 Feb 2020 11:27:58 +0900 Subject: [PATCH 50/92] Remove trailing whitespace --- src/dfmt/globmatch_editorconfig.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dfmt/globmatch_editorconfig.d b/src/dfmt/globmatch_editorconfig.d index 898460f..016e2b9 100644 --- a/src/dfmt/globmatch_editorconfig.d +++ b/src/dfmt/globmatch_editorconfig.d @@ -12,7 +12,7 @@ import std.path : filenameCharCmp, isDirSeparator; // * changes meaning to match all characters except '/' // ** added to take over the old meaning of * bool globMatchEditorConfig(CaseSensitive cs = CaseSensitive.osDefault, C, Range)( - Range path, const(C)[] pattern) @safe pure nothrow + Range path, const(C)[] pattern) @safe pure nothrow if (isForwardRange!Range && isSomeChar!(ElementEncodingType!Range) && isSomeChar!C && is(Unqual!C == Unqual!(ElementEncodingType!Range))) in From d38c3d96bfb65832e3658b3ef25efa4fc56cb328 Mon Sep 17 00:00:00 2001 From: Geod24 Date: Tue, 4 Feb 2020 11:28:21 +0900 Subject: [PATCH 51/92] Replace 'body' with 'do' The former is set to be deprecated in the next (2.091.0) DMD release. --- src/dfmt/formatter.d | 10 +++++----- src/dfmt/globmatch_editorconfig.d | 2 +- src/dfmt/tokens.d | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 49d8e18..354401d 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -565,7 +565,7 @@ private: { assert(currentIs(tok!"(") || currentIs(tok!"[")); } - body + do { immutable p = current.type; regenLineBreakHintsIfNecessary(index); @@ -650,7 +650,7 @@ private: { assert(currentIs(tok!")")); } - body + do { parenDepth--; indents.popWrapIndents(); @@ -685,7 +685,7 @@ private: { assert(currentIs(tok!"]")); } - body + do { indents.popWrapIndents(); if (indents.topIs(tok!"]")) @@ -1715,7 +1715,7 @@ private: { assert(currentIs(tok!"("), str(current.type)); } - body + do { immutable int depth = parenDepth; immutable int startingNiBraceDepth = niBraceDepth; @@ -1860,7 +1860,7 @@ const pure @safe @nogc: { assert(index < tokens.length); } - body + do { return tokens[index]; } diff --git a/src/dfmt/globmatch_editorconfig.d b/src/dfmt/globmatch_editorconfig.d index 016e2b9..eff1b79 100644 --- a/src/dfmt/globmatch_editorconfig.d +++ b/src/dfmt/globmatch_editorconfig.d @@ -23,7 +23,7 @@ in assert(balancedParens(pattern, '[', ']', 0)); assert(balancedParens(pattern, '{', '}', 0)); } -body +do { alias RC = Unqual!(ElementEncodingType!Range); diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d index 551dc17..0271fde 100644 --- a/src/dfmt/tokens.d +++ b/src/dfmt/tokens.d @@ -15,7 +15,7 @@ in { assert(tokens[0].type == tok!"("); } -body +do { uint length = 0; size_t i = 1; From 4db5ba44b202b2d1890576ab5bd7fd14425ef429 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:09:14 -0800 Subject: [PATCH 52/92] Error out on lexer failure --- src/dfmt/formatter.d | 21 +++++++++++++++++++-- src/dfmt/main.d | 19 +++++++++++-------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 354401d..9dd1103 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -16,7 +16,17 @@ import dfmt.tokens; import dfmt.wrapping; import std.array; -void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, +/** + * Formats the code contained in `buffer` into `output`. + * Params: + * source_desc = A description of where `buffer` came from. Usually a file name. + * buffer = The raw source code. + * output = The output range that will have the formatted code written to it. + * formatterConfig = Formatter configuration. + * Returns: `true` if the formatting succeeded, `false` of a lexing error. This + * function can return `true` if parsing failed. + */ +bool format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, Config* formatterConfig) { LexerConfig config; @@ -33,11 +43,18 @@ void format(OutputRange)(string source_desc, ubyte[] buffer, OutputRange output, auto visitor = new FormatVisitor(&astInformation); visitor.visit(mod); astInformation.cleanup(); - auto tokens = byToken(buffer, config, &cache).array(); + auto tokenRange = byToken(buffer, config, &cache); + auto app = appender!(Token[])(); + for (; !tokenRange.empty(); tokenRange.popFront()) + app.put(tokenRange.front()); + auto tokens = app.data; + if (!tokenRange.messages.empty) + return false; auto depths = generateDepthInfo(tokens); auto tokenFormatter = TokenFormatter!OutputRange(buffer, tokens, depths, output, &astInformation, formatterConfig); tokenFormatter.format(); + return true; } immutable(short[]) generateDepthInfo(const Token[] tokens) pure nothrow @trusted diff --git a/src/dfmt/main.d b/src/dfmt/main.d index 6844cfc..ad45279 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -19,14 +19,14 @@ static immutable VERSION = () { version (built_with_dub) { - enum DFMT_VERSION = import("dubhash.txt").strip; + enum DFMT_VERSION = import("dubhash.txt").strip; } else { - /** - * Current build's Git commit hash - */ - enum DFMT_VERSION = import("githash.txt").strip; + /** + * Current build's Git commit hash + */ + enum DFMT_VERSION = import("githash.txt").strip; } return DFMT_VERSION ~ DEBUG_SUFFIX; @@ -211,7 +211,7 @@ else else break; } - format("stdin", buffer, output.lockingTextWriter(), &config); + return format("stdin", buffer, output.lockingTextWriter(), &config); } else { @@ -219,6 +219,7 @@ else if (args.length >= 2) inplace = true; + int retVal; while (args.length > 0) { const path = args.front; @@ -253,11 +254,13 @@ else f.rawRead(buffer); if (inplace) output = File(path, "wb"); - format(path, buffer, output.lockingTextWriter(), &config); + bool formatResult = format(path, buffer, output.lockingTextWriter(), &config); + if (!formatResult) + retVal = 1; } } + return retVal; } - return 0; } } From 977318214d93fa2f1cacd8c4c98923c46252b596 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:10:04 -0800 Subject: [PATCH 53/92] Add check for tests that are supposed to error out, and clean up code based on shellcheck suggestions --- tests/test.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/test.sh b/tests/test.sh index 7f11c5a..973bb54 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -6,9 +6,9 @@ do for source in *.d do echo "${source}.ref" "${braceStyle}/${source}.out" - argsFile=$(basename ${source} .d).args - if [ -e ${argsFile} ]; then - args=$(cat ${argsFile}) + argsFile=$(basename "${source}" .d).args + if [ -e "${argsFile}" ]; then + args=$(cat "${argsFile}") else args= fi @@ -16,3 +16,12 @@ do diff -u "${braceStyle}/${source}.ref" "${braceStyle}/${source}.out" done done + +set +e + +for source in expected_failures/*.d +do + if ../bin/dfmt "${source}" > /dev/null; then + exit 1 + fi +done From fbd8559ceb0caf46a7503e3fca973064713ad599 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:10:21 -0800 Subject: [PATCH 54/92] Test case for issue 469 --- tests/expected_failures/issue0469.d | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/expected_failures/issue0469.d diff --git a/tests/expected_failures/issue0469.d b/tests/expected_failures/issue0469.d new file mode 100644 index 0000000..971c8f7 --- /dev/null +++ b/tests/expected_failures/issue0469.d @@ -0,0 +1 @@ +import std.stdio; void main() { writeln("\eee8Hello"); int a = 5; } From 2dc19b657702661e0b79cc9621edf07ab07d69c6 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:11:20 -0800 Subject: [PATCH 55/92] Update submodule --- libdparse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libdparse b/libdparse index f512cb0..597d9a6 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit f512cb0b4bc11ce64eb64a710163495e425a7ad8 +Subproject commit 597d9a697b1f8a51fb2f441c61d0c6cc4eadc6d1 From 63a29ab75780b9ee1175b7a459ea9fb4b3f91f1e Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Fri, 6 Mar 2020 13:28:45 -0800 Subject: [PATCH 56/92] Update dependency --- dub.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dub.json b/dub.json index 6feb82e..6cf0dc5 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.13.0" + "libdparse": "~>0.14.0" }, "targetPath" : "bin/", "targetName" : "dfmt", From 5f0d2843e6b0e1a1901cb9c0b9880ce60d531545 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Thu, 5 Mar 2020 22:33:37 +0100 Subject: [PATCH 57/92] Support disabling automatic line breaks Support disabling automatic line breaks With --keep_line_breaks. --- README.md | 2 + src/dfmt/config.d | 3 + src/dfmt/formatter.d | 133 ++++++++++++++++++++++++++-- src/dfmt/main.d | 7 +- tests/allman/keep_line_breaks.d.ref | 29 ++++++ tests/keep_line_breaks.args | 1 + tests/keep_line_breaks.d | 29 ++++++ tests/otbs/keep_line_breaks.d.ref | 25 ++++++ 8 files changed, 220 insertions(+), 9 deletions(-) create mode 100644 tests/allman/keep_line_breaks.d.ref create mode 100644 tests/keep_line_breaks.args create mode 100644 tests/keep_line_breaks.d create mode 100644 tests/otbs/keep_line_breaks.d.ref diff --git a/README.md b/README.md index 130df61..73806a0 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,7 @@ found there. * `--split_operator_at_line_end`: *see dfmt_split_operator_at_line_end [below](#dfmt-specific-properties)* * `--tab_width`: *see tab_width [below](#standard-editorconfig-properties)* * `--template_constraint_style`: *see dfmt_template_constraint_style [below](#dfmt-specific-properties)* +* `--keep_line_breaks`: *see dfmt_keep_line_breaks [below](#dfmt-specific-properties)* ### Example ``` @@ -114,6 +115,7 @@ dfmt_compact_labeled_statements | **`true`**, `false` | Place labels on the same dfmt_template_constraint_style | **`conditional_newline_indent`** `conditional_newline` `always_newline` `always_newline_indent` | Control the formatting of template constraints. dfmt_single_template_constraint_indent | `true`, **`false`** | Set if the constraints are indented by a single tab instead of two. Has only an effect if the style set to `always_newline_indent` or `conditional_newline_indent`. dfmt_space_before_aa_colon | `true`, **`false`** | Adds a space after an associative array key before the `:` like in older dfmt versions. +dfmt_keep_line_breaks | `true`, **`false`** | Keep existing line breaks if these don't violate other formatting rules. ## Terminology * Braces - `{` and `}` diff --git a/src/dfmt/config.d b/src/dfmt/config.d index 66d9b77..86706d1 100644 --- a/src/dfmt/config.d +++ b/src/dfmt/config.d @@ -57,6 +57,8 @@ struct Config OptionalBoolean dfmt_single_template_constraint_indent; /// OptionalBoolean dfmt_space_before_aa_colon; + /// + OptionalBoolean dfmt_keep_line_breaks; mixin StandardEditorConfigFields; @@ -85,6 +87,7 @@ struct Config dfmt_template_constraint_style = TemplateConstraintStyle.conditional_newline_indent; dfmt_single_template_constraint_indent = OptionalBoolean.f; dfmt_space_before_aa_colon = OptionalBoolean.f; + dfmt_keep_line_breaks = OptionalBoolean.f; } /** diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 354401d..f9c8a15 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -567,6 +567,8 @@ private: } do { + import dfmt.editorconfig : OptionalBoolean; + immutable p = current.type; regenLineBreakHintsIfNecessary(index); writeToken(); @@ -588,7 +590,23 @@ private: return; immutable bool arrayInitializerStart = p == tok!"[" && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); - if (arrayInitializerStart && isMultilineAt(index - 1)) + + if (p == tok!"[" && config.dfmt_keep_line_breaks == OptionalBoolean.t) + { + IndentStack.Details detail; + + detail.wrap = false; + detail.temp = false; + detail.breakEveryItem = false; + detail.mini = tokens[index].line == tokens[index - 1].line; + + indents.push(tok!"]", detail); + if (!detail.mini) + { + newline(); + } + } + else if (arrayInitializerStart && isMultilineAt(index - 1)) { // Use the close bracket as the indent token to distinguish // the array initialiazer from an array index in the newline @@ -643,6 +661,10 @@ private: { newline(); } + else if (onNextLine) + { + newline(); + } } void formatRightParen() @@ -659,6 +681,10 @@ private: if (indents.topIs(tok!"(")) indents.pop(); + if (onNextLine) + { + newline(); + } if (parenDepth == 0 && (peekIs(tok!"is") || peekIs(tok!"in") || peekIs(tok!"out") || peekIs(tok!"do") || peekIsBody)) { @@ -711,6 +737,7 @@ private: writeParens(false); if (tokens[index].type == tok!"{") return; + if (index < tokens.length && tokens[index - 1].line < tokens[index].line && astInformation.atAttributeStartLocations.canFindIndex(atIndex)) newline(); @@ -722,7 +749,16 @@ private: || currentIs(tok!"extern") || currentIs(tok!"identifier")) && !currentIsIndentedTemplateConstraint()) - write(" "); + { + if (onNextLine) + { + newline(); + } + else + { + write(" "); + } + } } void formatColon() @@ -1228,17 +1264,37 @@ private: break; default: if (peekBackIs(tok!"identifier")) - write(" "); + { + if (onNextLine) + { + newline(); + } + else + { + write(" "); + } + } if (index + 1 < tokens.length) { if (!peekIs(tok!"@") && (peekIsOperator() || peekIs(tok!"out") || peekIs(tok!"in"))) + { writeToken(); + } else { writeToken(); if (!currentIsIndentedTemplateConstraint()) - write(" "); + { + if (onNextLine) + { + newline(); + } + else + { + write(" "); + } + } } } else @@ -1258,6 +1314,7 @@ private: void formatOperator() { + import dfmt.editorconfig : OptionalBoolean; import std.algorithm : canFind; switch (current.type) @@ -1341,8 +1398,8 @@ private: case tok!".": regenLineBreakHintsIfNecessary(index); immutable bool ufcsWrap = astInformation.ufcsHintLocations.canFindIndex(current.index); - if (ufcsWrap || linebreakHints.canFind(index) || (linebreakHints.length == 0 - && currentLineLength + nextTokenLength() > config.max_line_length)) + if (ufcsWrap || linebreakHints.canFind(index) || onNextLine + || (linebreakHints.length == 0 && currentLineLength + nextTokenLength() > config.max_line_length)) { pushWrapIndent(); newline(); @@ -1398,7 +1455,38 @@ private: case tok!"%": binary: immutable bool isWrapToken = linebreakHints.canFind(index); - if (config.dfmt_split_operator_at_line_end) + if (config.dfmt_keep_line_breaks == OptionalBoolean.t && index > 0) + { + const operatorLine = tokens[index].line; + const rightOperandLine = tokens[index + 1].line; + + if (tokens[index - 1].line < operatorLine) + { + if (!indents.topIs(tok!"enum")) + pushWrapIndent(); + newline(); + } + else + { + write(" "); + } + if (rightOperandLine > operatorLine + && !indents.topIs(tok!"enum")) + { + pushWrapIndent(); + } + writeToken(); + + if (rightOperandLine > operatorLine) + { + newline(); + } + else + { + write(" "); + } + } + else if (config.dfmt_split_operator_at_line_end) { if (isWrapToken) { @@ -1442,9 +1530,11 @@ private: void formatComma() { + import dfmt.editorconfig : OptionalBoolean; import std.algorithm : canFind; - regenLineBreakHintsIfNecessary(index); + if (config.dfmt_keep_line_breaks == OptionalBoolean.f) + regenLineBreakHintsIfNecessary(index); if (indents.indentToMostRecent(tok!"enum") != -1 && !peekIs(tok!"}") && indents.topIs(tok!"{") && parenDepth == 0) { @@ -1474,6 +1564,24 @@ private: writeToken(); newline(); } + else if (config.dfmt_keep_line_breaks == OptionalBoolean.t) + { + const commaLine = tokens[index].line; + + writeToken(); + if (!currentIs(tok!")") && !currentIs(tok!"]") + && !currentIs(tok!"}") && !currentIs(tok!"comment")) + { + if (tokens[index].line == commaLine) + { + write(" "); + } + else + { + newline(); + } + } + } else { writeToken(); @@ -2023,6 +2131,15 @@ const pure @safe @nogc: return index < tokens.length && tokens[index].type == tokenType; } + bool onNextLine() @nogc nothrow pure @safe + { + import dfmt.editorconfig : OptionalBoolean; + + return config.dfmt_keep_line_breaks == OptionalBoolean.t + && index > 0 + && tokens[index - 1].line < tokens[index].line; + } + /// Bugs: not unicode correct size_t tokenEndLine(const Token t) { diff --git a/src/dfmt/main.d b/src/dfmt/main.d index 6844cfc..78b2c9f 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -92,6 +92,9 @@ else case "space_before_aa_colon": optConfig.dfmt_space_before_aa_colon = optVal; break; + case "keep_line_breaks": + optConfig.dfmt_keep_line_breaks = optVal; + break; default: assert(false, "Invalid command-line switch"); } @@ -121,7 +124,8 @@ else "single_template_constraint_indent", &handleBooleans, "space_before_aa_colon", &handleBooleans, "tab_width", &optConfig.tab_width, - "template_constraint_style", &optConfig.dfmt_template_constraint_style); + "template_constraint_style", &optConfig.dfmt_template_constraint_style, + "keep_line_breaks", &handleBooleans); // dfmt on } catch (GetOptException e) @@ -308,6 +312,7 @@ Formatting Options: --indent_size --indent_style, -t `, optionsToString!(typeof(Config.indent_style)), ` + --keep_line_breaks --soft_max_line_length --max_line_length --outdent_attributes diff --git a/tests/allman/keep_line_breaks.d.ref b/tests/allman/keep_line_breaks.d.ref new file mode 100644 index 0000000..5ce1e26 --- /dev/null +++ b/tests/allman/keep_line_breaks.d.ref @@ -0,0 +1,29 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) +{ + if (true && true + && true && true + && true && true) + { + } + else if (true && true && + true && true && + true && true) + { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} diff --git a/tests/keep_line_breaks.args b/tests/keep_line_breaks.args new file mode 100644 index 0000000..3e94d38 --- /dev/null +++ b/tests/keep_line_breaks.args @@ -0,0 +1 @@ +--keep_line_breaks true diff --git a/tests/keep_line_breaks.d b/tests/keep_line_breaks.d new file mode 100644 index 0000000..5ce1e26 --- /dev/null +++ b/tests/keep_line_breaks.d @@ -0,0 +1,29 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) +{ + if (true && true + && true && true + && true && true) + { + } + else if (true && true && + true && true && + true && true) + { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} diff --git a/tests/otbs/keep_line_breaks.d.ref b/tests/otbs/keep_line_breaks.d.ref new file mode 100644 index 0000000..9b694f3 --- /dev/null +++ b/tests/otbs/keep_line_breaks.d.ref @@ -0,0 +1,25 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) { + if (true && true + && true && true + && true && true) { + } else if (true && true && + true && true && + true && true) { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} From b17304accd26b44416a375d4f5bcfc059ac8eac5 Mon Sep 17 00:00:00 2001 From: Brian Schott Date: Sun, 8 Mar 2020 13:17:48 -0700 Subject: [PATCH 58/92] Update tests/test.sh Co-Authored-By: Jan Jurzitza --- tests/test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test.sh b/tests/test.sh index 973bb54..b465658 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -22,6 +22,7 @@ set +e for source in expected_failures/*.d do if ../bin/dfmt "${source}" > /dev/null; then + echo "Expected failure on test ${source} but passed" exit 1 fi done From e9034f4fec7d58fc9749e0f09822cc5cf5c4500e Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 8 Mar 2020 13:23:42 -0700 Subject: [PATCH 59/92] Fix return value when reading from stdin --- src/dfmt/main.d | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/dfmt/main.d b/src/dfmt/main.d index ad45279..269f934 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -211,7 +211,9 @@ else else break; } - return format("stdin", buffer, output.lockingTextWriter(), &config); + immutable bool formatSuccess = format("stdin", buffer, + output.lockingTextWriter(), &config); + return formatSuccess ? 0 : 1; } else { @@ -254,8 +256,8 @@ else f.rawRead(buffer); if (inplace) output = File(path, "wb"); - bool formatResult = format(path, buffer, output.lockingTextWriter(), &config); - if (!formatResult) + immutable bool formatSuccess = format(path, buffer, output.lockingTextWriter(), &config); + if (!formatSuccess) retVal = 1; } } From 394da5d02a1fea854b3d60551997d8be7b1140f7 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sun, 22 Mar 2020 17:54:59 +0100 Subject: [PATCH 60/92] Fix break after comma, before this --- src/dfmt/formatter.d | 14 +++++++------- tests/allman/keep_line_breaks.d.ref | 4 ++++ tests/keep_line_breaks.d | 4 ++++ tests/otbs/keep_line_breaks.d.ref | 4 ++++ 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index f462b03..e4802c1 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1574,13 +1574,6 @@ private: newline(); regenLineBreakHints(index - 1); } - else if (!peekIs(tok!"}") && (linebreakHints.canFind(index) - || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) - { - pushWrapIndent(); - writeToken(); - newline(); - } else if (config.dfmt_keep_line_breaks == OptionalBoolean.t) { const commaLine = tokens[index].line; @@ -1599,6 +1592,13 @@ private: } } } + else if (!peekIs(tok!"}") && (linebreakHints.canFind(index) + || (linebreakHints.length == 0 && currentLineLength > config.max_line_length))) + { + pushWrapIndent(); + writeToken(); + newline(); + } else { writeToken(); diff --git a/tests/allman/keep_line_breaks.d.ref b/tests/allman/keep_line_breaks.d.ref index 5ce1e26..e6b3e52 100644 --- a/tests/allman/keep_line_breaks.d.ref +++ b/tests/allman/keep_line_breaks.d.ref @@ -21,6 +21,10 @@ int[] func(int argument_1_1, int argument_1_2, .func(argument_2_1) .func(argument_2_2); + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + return [ 3, 5, 5, 7, diff --git a/tests/keep_line_breaks.d b/tests/keep_line_breaks.d index 5ce1e26..e6b3e52 100644 --- a/tests/keep_line_breaks.d +++ b/tests/keep_line_breaks.d @@ -21,6 +21,10 @@ int[] func(int argument_1_1, int argument_1_2, .func(argument_2_1) .func(argument_2_2); + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + return [ 3, 5, 5, 7, diff --git a/tests/otbs/keep_line_breaks.d.ref b/tests/otbs/keep_line_breaks.d.ref index 9b694f3..fd59670 100644 --- a/tests/otbs/keep_line_breaks.d.ref +++ b/tests/otbs/keep_line_breaks.d.ref @@ -17,6 +17,10 @@ int[] func(int argument_1_1, int argument_1_2, .func(argument_2_1) .func(argument_2_2); + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + return [ 3, 5, 5, 7, From ef83514541b893f9ae827c37b940cc14415fc094 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 24 Mar 2020 10:33:56 +0100 Subject: [PATCH 61/92] keep_line_breaks: Compare with the token end line --- src/dfmt/formatter.d | 18 +++++++++++++++--- tests/allman/keep_line_breaks.d.ref | 5 +++++ tests/keep_line_breaks.d | 5 +++++ tests/otbs/keep_line_breaks.d.ref | 5 +++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index e4802c1..4ec2e85 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -2151,10 +2151,22 @@ const pure @safe @nogc: bool onNextLine() @nogc nothrow pure @safe { import dfmt.editorconfig : OptionalBoolean; + import std.algorithm.searching : count; + import std.string : representation; - return config.dfmt_keep_line_breaks == OptionalBoolean.t - && index > 0 - && tokens[index - 1].line < tokens[index].line; + if (config.dfmt_keep_line_breaks == OptionalBoolean.f || index <= 0) + { + return false; + } + // To compare whether 2 tokens are on same line, we need the end line + // of the first token (tokens[index - 1]) and the start line of the + // second one (tokens[index]). If a token takes multiple lines (e.g. a + // multi-line string), we can sum the number of the newlines in the + // token and tokens[index - 1].line, the start line. + const previousTokenEndLineNo = tokens[index - 1].line + + tokens[index - 1].text.representation.count('\n'); + + return previousTokenEndLineNo < tokens[index].line; } /// Bugs: not unicode correct diff --git a/tests/allman/keep_line_breaks.d.ref b/tests/allman/keep_line_breaks.d.ref index e6b3e52..cd51650 100644 --- a/tests/allman/keep_line_breaks.d.ref +++ b/tests/allman/keep_line_breaks.d.ref @@ -25,6 +25,11 @@ int[] func(int argument_1_1, int argument_1_2, this.argument_2_1, this.argument_2_2, argument_3_1, argument_3_2); + ` + + + `.format!"%s"; + return [ 3, 5, 5, 7, diff --git a/tests/keep_line_breaks.d b/tests/keep_line_breaks.d index e6b3e52..cd51650 100644 --- a/tests/keep_line_breaks.d +++ b/tests/keep_line_breaks.d @@ -25,6 +25,11 @@ int[] func(int argument_1_1, int argument_1_2, this.argument_2_1, this.argument_2_2, argument_3_1, argument_3_2); + ` + + + `.format!"%s"; + return [ 3, 5, 5, 7, diff --git a/tests/otbs/keep_line_breaks.d.ref b/tests/otbs/keep_line_breaks.d.ref index fd59670..cd6babe 100644 --- a/tests/otbs/keep_line_breaks.d.ref +++ b/tests/otbs/keep_line_breaks.d.ref @@ -21,6 +21,11 @@ int[] func(int argument_1_1, int argument_1_2, this.argument_2_1, this.argument_2_2, argument_3_1, argument_3_2); + ` + + + `.format!"%s"; + return [ 3, 5, 5, 7, From 7b955c18d132baa23b349ae17af3ccb1eb353b6d Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Thu, 2 Apr 2020 13:38:02 +0200 Subject: [PATCH 62/92] Add hasCurrent to check if a token is available --- src/dfmt/formatter.d | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 4ec2e85..1ff6c8d 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -127,7 +127,7 @@ struct TokenFormatter(OutputRange) /// Runs the formatting process void format() { - while (index < tokens.length) + while (hasCurrent) formatStep(); } @@ -198,7 +198,7 @@ private: { import std.range : assumeSorted; - assert(index < tokens.length); + assert(hasCurrent); if (currentIs(tok!"comment")) { formatComment(); @@ -207,7 +207,7 @@ private: || isNumberLiteral(current.type) || currentIs(tok!"characterLiteral")) { writeToken(); - if (index < tokens.length) + if (hasCurrent) { immutable t = tokens[index].type; if (t == tok!"identifier" || isStringLiteral(t) @@ -249,7 +249,7 @@ private: { writeToken(); write(" "); - while (index < tokens.length) + while (hasCurrent) { if (currentIs(tok!"(")) formatLeftParenOrBracket(); @@ -281,14 +281,14 @@ private: else if (currentIs(tok!"asm")) { formatKeyword(); - while (index < tokens.length && !currentIs(tok!"{")) + while (hasCurrent && !currentIs(tok!"{")) formatStep(); - if (index < tokens.length) + if (hasCurrent) { int depth = 1; formatStep(); inAsm = true; - while (index < tokens.length && depth > 0) + while (hasCurrent && depth > 0) { if (currentIs(tok!"{")) ++depth; @@ -335,7 +335,7 @@ private: { writeToken(); //dfmt off - if (index < tokens.length && ( currentIs(tok!"identifier") + if (hasCurrent && ( currentIs(tok!"identifier") || ( index > 1 && config.dfmt_space_before_function_parameters && ( isBasicType(peekBack(2).type) || peekBack2Is(tok!"identifier") @@ -480,9 +480,9 @@ private: newline(); justAddedExtraNewline = j; } - else if (index < tokens.length) + else if (hasCurrent) { - if (index < tokens.length && prevTokenEndLine == tokens[index].line) + if (prevTokenEndLine == tokens[index].line) { if (currentIs(tok!"}")) { @@ -517,7 +517,7 @@ private: return; } write(" "); - while (index < tokens.length) + while (hasCurrent) { if (currentIs(tok!";")) { @@ -654,7 +654,7 @@ private: detail.breakEveryItem = astInformation.assocArrayStartLocations.canFindIndex(tokens[index - 1].index); // array of (possibly associative) array, let's put each item on its own line - if (!detail.breakEveryItem && index < tokens.length && current == tok!"[") + if (!detail.breakEveryItem && currentIs(tok!"[")) detail.breakEveryItem = true; // the '[' is immediately followed by an item instead of a newline here so @@ -755,13 +755,13 @@ private: if (tokens[index].type == tok!"{") return; - if (index < tokens.length && tokens[index - 1].line < tokens[index].line + if (hasCurrent && tokens[index - 1].line < tokens[index].line && astInformation.atAttributeStartLocations.canFindIndex(atIndex)) newline(); else write(" "); } - else if (index < tokens.length && (currentIs(tok!"@") + else if (hasCurrent && (currentIs(tok!"@") || isBasicType(tokens[index].type) || currentIs(tok!"extern") || currentIs(tok!"identifier")) @@ -1322,7 +1322,7 @@ private: bool currentIsIndentedTemplateConstraint() { - return index < tokens.length + return hasCurrent && astInformation.constraintLocations.canFindIndex(current.index) && (config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline || config.dfmt_template_constraint_style == TemplateConstraintStyle.always_newline_indent @@ -1654,7 +1654,7 @@ private: if (currentIs(tok!"comment") && index > 0 && current.line == tokenEndLine(tokens[index - 1])) return; - immutable bool hasCurrent = index < tokens.length; + immutable bool hasCurrent = this.hasCurrent; if (niBraceDepth > 0 && !peekBackIsSlashSlash() && hasCurrent && tokens[index].type == tok!"}" && !assumeSorted(astInformation.funLitEndLocations).equalRange( @@ -1868,7 +1868,8 @@ private: else formatStep(); } - while (index < tokens.length && parenDepth > 0); + // TODO: obviously getting stuck here? + while (hasCurrent && parenDepth > 0); if (indents.topIs(tok!"!")) indents.pop(); parenDepth = depth; @@ -1980,10 +1981,15 @@ const pure @safe @nogc: return tokenLength(tokens[i]); } + bool hasCurrent() nothrow const + { + return index < tokens.length; + } + ref current() nothrow in { - assert(index < tokens.length); + assert(hasCurrent); } do { @@ -2145,7 +2151,7 @@ const pure @safe @nogc: bool currentIs(IdType tokenType) nothrow { - return index < tokens.length && tokens[index].type == tokenType; + return hasCurrent && tokens[index].type == tokenType; } bool onNextLine() @nogc nothrow pure @safe From cb1dfe091ff5fa4e24dd0d71b81a67e699274823 Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Thu, 2 Apr 2020 13:39:29 +0200 Subject: [PATCH 63/92] Check for token before access, fix #474 --- src/dfmt/formatter.d | 71 ++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 33 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 1ff6c8d..158ae00 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1093,46 +1093,51 @@ private: indents.push(current.type); } writeToken(); + if (currentIs(tok!"(")) { write(" "); writeParens(false); } - if (currentIs(tok!"switch") || (currentIs(tok!"final") && peekIs(tok!"switch"))) - write(" "); - else if (currentIs(tok!"comment")) - formatStep(); - else if (!shouldPushIndent) + + if (hasCurrent) { - if (!currentIs(tok!"{") && !currentIs(tok!";")) + if (currentIs(tok!"switch") || (currentIs(tok!"final") && peekIs(tok!"switch"))) write(" "); - } - else if (!currentIs(tok!"{") && !currentIs(tok!";") && !currentIs(tok!"in") && - !currentIs(tok!"out") && !currentIs(tok!"do") && current.text != "body") - { - newline(); - } - else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"if")) - { - // Hacks to format braced vs non-braced static if declarations. - indents.pop(); - indents.pop(); - indents.push(tok!"if"); - formatLeftBrace(); - } - else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach")) - { - indents.pop(); - indents.pop(); - indents.push(tok!"foreach"); - formatLeftBrace(); - } - else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach_reverse")) - { - indents.pop(); - indents.pop(); - indents.push(tok!"foreach_reverse"); - formatLeftBrace(); + else if (currentIs(tok!"comment")) + formatStep(); + else if (!shouldPushIndent) + { + if (!currentIs(tok!"{") && !currentIs(tok!";")) + write(" "); + } + else if (hasCurrent && !currentIs(tok!"{") && !currentIs(tok!";") && !currentIs(tok!"in") && + !currentIs(tok!"out") && !currentIs(tok!"do") && current.text != "body") + { + newline(); + } + else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"if")) + { + // Hacks to format braced vs non-braced static if declarations. + indents.pop(); + indents.pop(); + indents.push(tok!"if"); + formatLeftBrace(); + } + else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach")) + { + indents.pop(); + indents.pop(); + indents.push(tok!"foreach"); + formatLeftBrace(); + } + else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach_reverse")) + { + indents.pop(); + indents.pop(); + indents.push(tok!"foreach_reverse"); + formatLeftBrace(); + } } } From 34810aa92874b9f70d5167ecb2773747de9c99b5 Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Fri, 3 Apr 2020 09:19:24 +0200 Subject: [PATCH 64/92] Fix stuck-while TODO (this is a do-while loop) --- src/dfmt/formatter.d | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 158ae00..6f9b7cc 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1851,6 +1851,7 @@ private: immutable int startingNiBraceDepth = niBraceDepth; immutable int startingSBraceDepth = sBraceDepth; parenDepth = 0; + do { spaceAfterParens = spaceAfter; @@ -1873,8 +1874,8 @@ private: else formatStep(); } - // TODO: obviously getting stuck here? while (hasCurrent && parenDepth > 0); + if (indents.topIs(tok!"!")) indents.pop(); parenDepth = depth; From f59f25bb09e9331f1711a51224a15ad879ac1f56 Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Tue, 5 May 2020 14:06:55 +0200 Subject: [PATCH 65/92] switch statement alignment is implemented fix #482 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 73806a0..7b6e8b4 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ Property Name | Allowed Values | Description --------------|----------------|------------ dfmt_brace_style | **`allman`**, `otbs`, or `stroustrup` | [See Wikipedia](https://en.wikipedia.org/wiki/Brace_style) dfmt_soft_max_line_length | positive integers (**`80`**) | The formatting process will usually keep lines below this length, but they may be up to *max_line_length* columns long. -dfmt_align_switch_statements (Not yet implemented) | **`true`**, `false` | Align labels, cases, and defaults with their enclosing switch. +dfmt_align_switch_statements | **`true`**, `false` | Align labels, cases, and defaults with their enclosing switch. dfmt_outdent_attributes (Not yet implemented) | **`true`**, `false`| Decrease the indentation level of attributes. dfmt_split_operator_at_line_end | `true`, **`false`** | Place operators on the end of the previous line when splitting lines. dfmt_space_after_cast | **`true`**, `false` | Insert space after the closing paren of a `cast` expression. From ad00b113a9c4e1bb75a6afecfd0148a5f5461324 Mon Sep 17 00:00:00 2001 From: Jan Jurzitza Date: Mon, 8 Jun 2020 14:21:33 +0200 Subject: [PATCH 66/92] use test_with_package for libdparse test test both minimum and maximum allowed libdparse versions with dub --- .gitmodules | 3 +++ .travis.sh | 2 +- .travis.yml | 3 ++- d-test-utils | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 160000 d-test-utils diff --git a/.gitmodules b/.gitmodules index 621577b..d493df0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "stdx-allocator"] path = stdx-allocator url = https://github.com/dlang-community/stdx-allocator +[submodule "d-test-utils"] + path = d-test-utils + url = https://github.com/dlang-community/d-test-utils.git diff --git a/.travis.sh b/.travis.sh index fa34497..cb48753 100755 --- a/.travis.sh +++ b/.travis.sh @@ -3,7 +3,7 @@ set -e if [[ $BUILD == dub ]]; then - dub build --build=release + rdmd ./d-test-utils/test_with_package.d $LIBDPARSE_VERSION libdparse -- dub build --build=release elif [[ $DC == ldc2 ]]; then git submodule update --init --recursive make ldc -j2 diff --git a/.travis.yml b/.travis.yml index aabf8e5..de60590 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,8 @@ branches: env: - BUILD= - - BUILD=dub + - BUILD=dub LIBDPARSE_VERSION=min + - BUILD=dub LIBDPARSE_VERSION=max script: ./.travis.sh diff --git a/d-test-utils b/d-test-utils new file mode 160000 index 0000000..206a2e6 --- /dev/null +++ b/d-test-utils @@ -0,0 +1 @@ +Subproject commit 206a2e6abd97b4462f3a320e4f2d23986fad3cff From e5eda5c14a60457f071b27c82e85c9bad2539021 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Wed, 24 Jun 2020 22:26:03 +0200 Subject: [PATCH 67/92] Upgrade libdparse to <0.16.0 --- dub.json | 2 +- libdparse | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index 6cf0dc5..4148322 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.14.0" + "libdparse": ">=0.14.0 <0.16.0" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index 597d9a6..1557eb0 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 597d9a697b1f8a51fb2f441c61d0c6cc4eadc6d1 +Subproject commit 1557eb079a2d5958e0a7136f942eea0922d58e8a From e4f2f20720562fc796fe152d6262bf151f028143 Mon Sep 17 00:00:00 2001 From: Mathis Beer Date: Fri, 17 Jul 2020 14:14:17 +0200 Subject: [PATCH 68/92] Fix issue 497: insert space before function/delegate in function type that returns template instantiated with parenless value argument --- src/dfmt/formatter.d | 4 +++- tests/allman/issue0497.d.ref | 5 +++++ tests/issue0497.d | 5 +++++ tests/otbs/issue0497.d.ref | 5 +++++ 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0497.d.ref create mode 100644 tests/issue0497.d create mode 100644 tests/otbs/issue0497.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 6f9b7cc..ae3f798 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -211,7 +211,9 @@ private: { immutable t = tokens[index].type; if (t == tok!"identifier" || isStringLiteral(t) - || isNumberLiteral(t) || t == tok!"characterLiteral") + || isNumberLiteral(t) || t == tok!"characterLiteral" + // a!"b" function() + || t == tok!"function" || t == tok!"delegate") write(" "); } } diff --git a/tests/allman/issue0497.d.ref b/tests/allman/issue0497.d.ref new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/allman/issue0497.d.ref @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); diff --git a/tests/issue0497.d b/tests/issue0497.d new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/issue0497.d @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); diff --git a/tests/otbs/issue0497.d.ref b/tests/otbs/issue0497.d.ref new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/otbs/issue0497.d.ref @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); From b5dbb0e031d411bb94c8784f52eebbe474583755 Mon Sep 17 00:00:00 2001 From: Mathis Beer Date: Mon, 6 Jul 2020 14:25:53 +0200 Subject: [PATCH 69/92] Fix issue 483: indent continuing case statements on the same level --- src/dfmt/formatter.d | 9 ++++++++- tests/allman/issue0483.d.ref | 15 +++++++++++++++ tests/issue0483.args | 1 + tests/issue0483.d | 15 +++++++++++++++ tests/otbs/issue0483.d.ref | 13 +++++++++++++ 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0483.d.ref create mode 100644 tests/issue0483.args create mode 100644 tests/issue0483.d create mode 100644 tests/otbs/issue0483.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index ae3f798..4017870 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1715,7 +1715,14 @@ private: } else if (currentIs(tok!"case") || currentIs(tok!"default")) { - if (peekBackIs(tok!"}", true) || peekBackIs(tok!";", true)) + + if (peekBackIs(tok!"}", true) || peekBackIs(tok!";", true) + /** + * The following code is valid and should be indented flatly + * case A: + * case B: + */ + || peekBackIs(tok!":", true)) { indents.popTempIndents(); if (indents.topIs(tok!"case")) diff --git a/tests/allman/issue0483.d.ref b/tests/allman/issue0483.d.ref new file mode 100644 index 0000000..1d77e68 --- /dev/null +++ b/tests/allman/issue0483.d.ref @@ -0,0 +1,15 @@ +module tests.issue0483; + +void main() +{ + switch (0) + { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} diff --git a/tests/issue0483.args b/tests/issue0483.args new file mode 100644 index 0000000..91e2439 --- /dev/null +++ b/tests/issue0483.args @@ -0,0 +1 @@ +--align_switch_statements=false diff --git a/tests/issue0483.d b/tests/issue0483.d new file mode 100644 index 0000000..1d77e68 --- /dev/null +++ b/tests/issue0483.d @@ -0,0 +1,15 @@ +module tests.issue0483; + +void main() +{ + switch (0) + { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} diff --git a/tests/otbs/issue0483.d.ref b/tests/otbs/issue0483.d.ref new file mode 100644 index 0000000..b23c692 --- /dev/null +++ b/tests/otbs/issue0483.d.ref @@ -0,0 +1,13 @@ +module tests.issue0483; + +void main() { + switch (0) { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} From 58b2c6ebc620af1351821509b435c821cd175d90 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Mon, 3 Aug 2020 06:51:40 +0200 Subject: [PATCH 70/92] Break line on multiline strings Fixes #476. --- src/dfmt/formatter.d | 19 ++++++++++++++----- src/dfmt/wrapping.d | 3 --- tests/allman/issue0476.d.ref | 7 +++++++ tests/issue0476.d | 7 +++++++ tests/otbs/issue0476.d.ref | 6 ++++++ 5 files changed, 34 insertions(+), 8 deletions(-) create mode 100644 tests/allman/issue0476.d.ref create mode 100644 tests/issue0476.d create mode 100644 tests/otbs/issue0476.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 4017870..5d64c68 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1622,16 +1622,21 @@ private: { import std.range : assumeSorted; import std.algorithm.comparison : min; - import std.algorithm.searching : countUntil; + import std.algorithm.searching : canFind, countUntil; // The end of the tokens considered by the line break algorithm is - // either the expression end index or the next mandatory line break, - // whichever is first. + // either the expression end index or the next mandatory line break + // or a newline inside a string literal, whichever is first. auto r = assumeSorted(astInformation.ufcsHintLocations).upperBound(tokens[i].index); immutable ufcsBreakLocation = r.empty ? size_t.max : tokens[i .. $].countUntil!(t => t.index == r.front) + i; - immutable size_t j = min(expressionEndIndex(i), ufcsBreakLocation); + immutable multilineStringLocation = tokens[i .. $] + .countUntil!(t => t.text.canFind('\n')); + immutable size_t j = min( + expressionEndIndex(i), + ufcsBreakLocation, + multilineStringLocation == -1 ? size_t.max : multilineStringLocation + i + 1); // Use magical negative value for array literals and wrap indents immutable inLvl = (indents.topIsWrap() || indents.topIs(tok!"]")) ? -indentLevel : indentLevel; @@ -1839,7 +1844,11 @@ private: case tok!"wstringLiteral": case tok!"dstringLiteral": immutable o = current.text.retro().countUntil('\n'); - currentLineLength += o == -1 ? current.text.length : o; + if (o == -1) { + currentLineLength += current.text.length; + } else { + currentLineLength = cast(uint) o; + } break; default: currentLineLength += current.text.length; diff --git a/src/dfmt/wrapping.d b/src/dfmt/wrapping.d index 41edf2f..79fb85f 100644 --- a/src/dfmt/wrapping.d +++ b/src/dfmt/wrapping.d @@ -172,9 +172,6 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens, void validMoves(OR)(auto ref OR output, const Token[] tokens, immutable short[] depths, uint current, const Config* config, int currentLineLength, int indentLevel) { - import std.algorithm : sort, canFind, min; - import std.array : insertInPlace; - foreach (i, token; tokens) { if (!isBreakToken(token.type) || (((1 << i) & current) != 0)) diff --git a/tests/allman/issue0476.d.ref b/tests/allman/issue0476.d.ref new file mode 100644 index 0000000..c95e2de --- /dev/null +++ b/tests/allman/issue0476.d.ref @@ -0,0 +1,7 @@ +string BuildForwardCall() +{ + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} diff --git a/tests/issue0476.d b/tests/issue0476.d new file mode 100644 index 0000000..c95e2de --- /dev/null +++ b/tests/issue0476.d @@ -0,0 +1,7 @@ +string BuildForwardCall() +{ + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} diff --git a/tests/otbs/issue0476.d.ref b/tests/otbs/issue0476.d.ref new file mode 100644 index 0000000..924e771 --- /dev/null +++ b/tests/otbs/issue0476.d.ref @@ -0,0 +1,6 @@ +string BuildForwardCall() { + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} From d100c40dab74116c1ad675614a14e75f6928d18c Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sun, 23 Aug 2020 14:51:17 +0200 Subject: [PATCH 71/92] Print colon in AA before identifiers --- src/dfmt/formatter.d | 12 ++++++------ tests/allman/issue0465.d.ref | 8 ++++++++ tests/allman/issue0485.d.ref | 5 +++++ tests/allman/issue0501.d.ref | 4 ++++ tests/issue0465.d | 9 +++++++++ tests/issue0485.args | 1 + tests/issue0485.d | 5 +++++ tests/issue0501.d | 4 ++++ tests/otbs/issue0465.d.ref | 7 +++++++ tests/otbs/issue0485.d.ref | 4 ++++ tests/otbs/issue0501.d.ref | 3 +++ 11 files changed, 56 insertions(+), 6 deletions(-) create mode 100644 tests/allman/issue0465.d.ref create mode 100644 tests/allman/issue0485.d.ref create mode 100644 tests/allman/issue0501.d.ref create mode 100644 tests/issue0465.d create mode 100644 tests/issue0485.args create mode 100644 tests/issue0485.d create mode 100644 tests/issue0501.d create mode 100644 tests/otbs/issue0465.d.ref create mode 100644 tests/otbs/issue0485.d.ref create mode 100644 tests/otbs/issue0501.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 5d64c68..ca8641f 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -805,6 +805,11 @@ private: newline(); } } + else if (indents.topIs(tok!"]")) // Associative array + { + write(config.dfmt_space_before_aa_colon ? " : " : ": "); + ++index; + } else if (peekBackIs(tok!"identifier") && [tok!"{", tok!"}", tok!";", tok!":", tok!","] .any!((ptrdiff_t token) => peekBack2Is(cast(IdType)token, true)) @@ -838,12 +843,7 @@ private: } else { - const inAA = indents.topIs(tok!"]") && indents.topDetails.breakEveryItem; - - if (inAA && !config.dfmt_space_before_aa_colon) - write(": "); - else - write(" : "); + write(" : "); index++; } } diff --git a/tests/allman/issue0465.d.ref b/tests/allman/issue0465.d.ref new file mode 100644 index 0000000..b28f284 --- /dev/null +++ b/tests/allman/issue0465.d.ref @@ -0,0 +1,8 @@ +bool asdf(const string owner, const string mail) @safe +{ + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/allman/issue0485.d.ref b/tests/allman/issue0485.d.ref new file mode 100644 index 0000000..037932e --- /dev/null +++ b/tests/allman/issue0485.d.ref @@ -0,0 +1,5 @@ +void main() +{ + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/allman/issue0501.d.ref b/tests/allman/issue0501.d.ref new file mode 100644 index 0000000..8f1cf11 --- /dev/null +++ b/tests/allman/issue0501.d.ref @@ -0,0 +1,4 @@ +void main() +{ + auto aa = ["aaa": 1, "bbb": 2]; +} diff --git a/tests/issue0465.d b/tests/issue0465.d new file mode 100644 index 0000000..e3026ea --- /dev/null +++ b/tests/issue0465.d @@ -0,0 +1,9 @@ +bool asdf(const string owner, const string mail) @safe +{ + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: + mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/issue0485.args b/tests/issue0485.args new file mode 100644 index 0000000..1b0d2ce --- /dev/null +++ b/tests/issue0485.args @@ -0,0 +1 @@ +--space_before_aa_colon true diff --git a/tests/issue0485.d b/tests/issue0485.d new file mode 100644 index 0000000..037932e --- /dev/null +++ b/tests/issue0485.d @@ -0,0 +1,5 @@ +void main() +{ + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/issue0501.d b/tests/issue0501.d new file mode 100644 index 0000000..8ab0e10 --- /dev/null +++ b/tests/issue0501.d @@ -0,0 +1,4 @@ +void main() +{ + auto aa = ["aaa": 1, "bbb":2]; +} diff --git a/tests/otbs/issue0465.d.ref b/tests/otbs/issue0465.d.ref new file mode 100644 index 0000000..e20c47f --- /dev/null +++ b/tests/otbs/issue0465.d.ref @@ -0,0 +1,7 @@ +bool asdf(const string owner, const string mail) @safe { + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/otbs/issue0485.d.ref b/tests/otbs/issue0485.d.ref new file mode 100644 index 0000000..058d065 --- /dev/null +++ b/tests/otbs/issue0485.d.ref @@ -0,0 +1,4 @@ +void main() { + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/otbs/issue0501.d.ref b/tests/otbs/issue0501.d.ref new file mode 100644 index 0000000..675401d --- /dev/null +++ b/tests/otbs/issue0501.d.ref @@ -0,0 +1,3 @@ +void main() { + auto aa = ["aaa": 1, "bbb": 2]; +} From 94351246f61c4a21e22392945f442a7fe2ae1751 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 1 Sep 2020 17:34:48 +0200 Subject: [PATCH 72/92] Keep line break after function attributes Fixes #504. --- src/dfmt/formatter.d | 43 ++++++++++++++---------------------- tests/allman/issue0504.d.ref | 40 +++++++++++++++++++++++++++++++++ tests/issue0504.args | 1 + tests/issue0504.d | 40 +++++++++++++++++++++++++++++++++ tests/otbs/issue0504.d.ref | 32 +++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 26 deletions(-) create mode 100644 tests/allman/issue0504.d.ref create mode 100644 tests/issue0504.args create mode 100644 tests/issue0504.d create mode 100644 tests/otbs/issue0504.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index ca8641f..16eb6ed 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -713,13 +713,13 @@ private: { writeToken(); if (spaceAfterParens || parenDepth > 0) - write(" "); + writeSpace(); } else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens && !peekIs(tok!"in") && !peekIs(tok!"is") && !peekIs(tok!"if")) { writeToken(); - write(" "); + writeSpace(); } else writeToken(); @@ -769,14 +769,7 @@ private: || currentIs(tok!"identifier")) && !currentIsIndentedTemplateConstraint()) { - if (onNextLine) - { - newline(); - } - else - { - write(" "); - } + writeSpace(); } } @@ -1289,14 +1282,7 @@ private: default: if (peekBackIs(tok!"identifier")) { - if (onNextLine) - { - newline(); - } - else - { - write(" "); - } + writeSpace(); } if (index + 1 < tokens.length) { @@ -1310,14 +1296,7 @@ private: writeToken(); if (!currentIsIndentedTemplateConstraint()) { - if (onNextLine) - { - newline(); - } - else - { - write(" "); - } + writeSpace(); } } } @@ -1943,6 +1922,18 @@ private: indents.push(type, detail); } + void writeSpace() + { + if (onNextLine) + { + newline(); + } + else + { + write(" "); + } + } + const pure @safe @nogc: size_t expressionEndIndex(size_t i, bool matchComma = false) nothrow diff --git a/tests/allman/issue0504.d.ref b/tests/allman/issue0504.d.ref new file mode 100644 index 0000000..7fb4598 --- /dev/null +++ b/tests/allman/issue0504.d.ref @@ -0,0 +1,40 @@ +deprecated("foo") +void test() +{ +} + +package(foo) +void bar() +{ +} + +@uda() +void baz() +{ +} + +deprecated +deprecated_() +{ +} + +@uda +void uda_() +{ +} + +@property +void property() +{ +} + +deprecated("Reason") @uda +void propertyuda() +{ +} + +deprecated("Reason") +@uda +void udaproperty() +{ +} diff --git a/tests/issue0504.args b/tests/issue0504.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/issue0504.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/issue0504.d b/tests/issue0504.d new file mode 100644 index 0000000..7fb4598 --- /dev/null +++ b/tests/issue0504.d @@ -0,0 +1,40 @@ +deprecated("foo") +void test() +{ +} + +package(foo) +void bar() +{ +} + +@uda() +void baz() +{ +} + +deprecated +deprecated_() +{ +} + +@uda +void uda_() +{ +} + +@property +void property() +{ +} + +deprecated("Reason") @uda +void propertyuda() +{ +} + +deprecated("Reason") +@uda +void udaproperty() +{ +} diff --git a/tests/otbs/issue0504.d.ref b/tests/otbs/issue0504.d.ref new file mode 100644 index 0000000..94a222c --- /dev/null +++ b/tests/otbs/issue0504.d.ref @@ -0,0 +1,32 @@ +deprecated("foo") +void test() { +} + +package(foo) +void bar() { +} + +@uda() +void baz() { +} + +deprecated +deprecated_() { +} + +@uda +void uda_() { +} + +@property +void property() { +} + +deprecated("Reason") @uda +void propertyuda() { +} + +deprecated("Reason") +@uda +void udaproperty() { +} From eab4cac12fc0eedc67c5393d98d90f2a20ebb63e Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Thu, 3 Sep 2020 06:23:30 +0200 Subject: [PATCH 73/92] Regenerate line break hints after newline Fixes #486. --- src/dfmt/formatter.d | 2 +- tests/allman/issue0486.d.ref | 5 +++++ tests/issue0486.args | 1 + tests/issue0486.d | 5 +++++ tests/otbs/issue0486.d.ref | 4 ++++ 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0486.d.ref create mode 100644 tests/issue0486.args create mode 100644 tests/issue0486.d create mode 100644 tests/otbs/issue0486.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 16eb6ed..2d03b54 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1406,7 +1406,7 @@ private: { pushWrapIndent(); newline(); - if (ufcsWrap) + if (ufcsWrap || onNextLine) regenLineBreakHints(index); } writeToken(); diff --git a/tests/allman/issue0486.d.ref b/tests/allman/issue0486.d.ref new file mode 100644 index 0000000..de7a540 --- /dev/null +++ b/tests/allman/issue0486.d.ref @@ -0,0 +1,5 @@ +void main() +{ + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} diff --git a/tests/issue0486.args b/tests/issue0486.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/issue0486.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/issue0486.d b/tests/issue0486.d new file mode 100644 index 0000000..de7a540 --- /dev/null +++ b/tests/issue0486.d @@ -0,0 +1,5 @@ +void main() +{ + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} diff --git a/tests/otbs/issue0486.d.ref b/tests/otbs/issue0486.d.ref new file mode 100644 index 0000000..5f65301 --- /dev/null +++ b/tests/otbs/issue0486.d.ref @@ -0,0 +1,4 @@ +void main() { + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} From 7659b1ae1aaaeda6b787ec60a2ed1e902326d5a0 Mon Sep 17 00:00:00 2001 From: Brian Schott Date: Wed, 30 Sep 2020 23:35:20 -0700 Subject: [PATCH 74/92] Fix Issue 508 (#511) Fix Issue 508 merged-on-behalf-of: Brian Schott --- src/dfmt/formatter.d | 3 ++- tests/allman/issue0508.d.ref | 7 +++++++ tests/issue0508.d | 1 + tests/otbs/issue0508.d.ref | 5 +++++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0508.d.ref create mode 100644 tests/issue0508.d create mode 100644 tests/otbs/issue0508.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 2d03b54..12bd8fe 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -9,8 +9,8 @@ module dfmt.formatter; import dparse.lexer; import dparse.parser; import dparse.rollback_allocator; -import dfmt.config; import dfmt.ast_info; +import dfmt.config; import dfmt.indentation; import dfmt.tokens; import dfmt.wrapping; @@ -765,6 +765,7 @@ private: } else if (hasCurrent && (currentIs(tok!"@") || isBasicType(tokens[index].type) + || currentIs(tok!"invariant") || currentIs(tok!"extern") || currentIs(tok!"identifier")) && !currentIsIndentedTemplateConstraint()) diff --git a/tests/allman/issue0508.d.ref b/tests/allman/issue0508.d.ref new file mode 100644 index 0000000..af4c328 --- /dev/null +++ b/tests/allman/issue0508.d.ref @@ -0,0 +1,7 @@ +struct S +{ + @safe invariant + { + assert(true); + } +} diff --git a/tests/issue0508.d b/tests/issue0508.d new file mode 100644 index 0000000..d6f1f3d --- /dev/null +++ b/tests/issue0508.d @@ -0,0 +1 @@ +struct S {@safe invariant { assert(true); }} diff --git a/tests/otbs/issue0508.d.ref b/tests/otbs/issue0508.d.ref new file mode 100644 index 0000000..acd5850 --- /dev/null +++ b/tests/otbs/issue0508.d.ref @@ -0,0 +1,5 @@ +struct S { + @safe invariant { + assert(true); + } +} From 41e8c05558cfc67a20771f543258f3ec1718b3b3 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Wed, 7 Oct 2020 02:19:55 -0700 Subject: [PATCH 75/92] Fix #515 --- src/dfmt/formatter.d | 2 +- tests/allman/issue0515.d.ref | 7 +++++++ tests/issue0515.d | 7 +++++++ tests/otbs/issue0515.d.ref | 5 +++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0515.d.ref create mode 100644 tests/issue0515.d create mode 100644 tests/otbs/issue0515.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 12bd8fe..5a9f896 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -224,7 +224,7 @@ private: else if (currentIs(tok!"return")) { writeToken(); - if (!currentIs(tok!";") && !currentIs(tok!")")) + if (!currentIs(tok!";") && !currentIs(tok!")") && !currentIs(tok!"{")) write(" "); } else if (currentIs(tok!"with")) diff --git a/tests/allman/issue0515.d.ref b/tests/allman/issue0515.d.ref new file mode 100644 index 0000000..55d01d9 --- /dev/null +++ b/tests/allman/issue0515.d.ref @@ -0,0 +1,7 @@ +struct S +{ + ref S foo() return + { + return this; + } +} diff --git a/tests/issue0515.d b/tests/issue0515.d new file mode 100644 index 0000000..55d01d9 --- /dev/null +++ b/tests/issue0515.d @@ -0,0 +1,7 @@ +struct S +{ + ref S foo() return + { + return this; + } +} diff --git a/tests/otbs/issue0515.d.ref b/tests/otbs/issue0515.d.ref new file mode 100644 index 0000000..05d4164 --- /dev/null +++ b/tests/otbs/issue0515.d.ref @@ -0,0 +1,5 @@ +struct S { + ref S foo() return { + return this; + } +} From e6199aaa9b1687376be7e6c49493f97e563e726f Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Mon, 5 Oct 2020 10:38:20 +0200 Subject: [PATCH 76/92] Don't output an extra newline after a comment with keep_line_breaks=true. Fixes #509 and #490. --- src/dfmt/formatter.d | 9 ++++++--- tests/allman/issue0509.d.ref | 34 ++++++++++++++++++++++++++++++++++ tests/issue0509.args | 1 + tests/issue0509.d | 34 ++++++++++++++++++++++++++++++++++ tests/otbs/issue0509.d.ref | 30 ++++++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 tests/allman/issue0509.d.ref create mode 100644 tests/issue0509.args create mode 100644 tests/issue0509.d create mode 100644 tests/otbs/issue0509.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 5a9f896..74821bf 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1406,7 +1406,8 @@ private: || (linebreakHints.length == 0 && currentLineLength + nextTokenLength() > config.max_line_length)) { pushWrapIndent(); - newline(); + if (!peekBackIs(tok!"comment")) + newline(); if (ufcsWrap || onNextLine) regenLineBreakHints(index); } @@ -1468,7 +1469,8 @@ private: { if (!indents.topIs(tok!"enum")) pushWrapIndent(); - newline(); + if (!peekBackIs(tok!"comment")) + newline(); } else { @@ -1483,7 +1485,8 @@ private: if (rightOperandLine > operatorLine) { - newline(); + if (!peekBackIs(tok!"comment")) + newline(); } else { diff --git a/tests/allman/issue0509.d.ref b/tests/allman/issue0509.d.ref new file mode 100644 index 0000000..52b1c7c --- /dev/null +++ b/tests/allman/issue0509.d.ref @@ -0,0 +1,34 @@ +void main() +{ + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf // blah + .flub; +} + +void main() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish diff --git a/tests/issue0509.args b/tests/issue0509.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/issue0509.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/issue0509.d b/tests/issue0509.d new file mode 100644 index 0000000..52b1c7c --- /dev/null +++ b/tests/issue0509.d @@ -0,0 +1,34 @@ +void main() +{ + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf // blah + .flub; +} + +void main() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish diff --git a/tests/otbs/issue0509.d.ref b/tests/otbs/issue0509.d.ref new file mode 100644 index 0000000..62b06c2 --- /dev/null +++ b/tests/otbs/issue0509.d.ref @@ -0,0 +1,30 @@ +void main() { + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() { + afdsafds + .asdf // blah + .flub; +} + +void main() { + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() { + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish From c4b6a7e7e3dcd8153c5a986e8faf539ed297e14f Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Mon, 8 Feb 2021 07:43:16 +0100 Subject: [PATCH 77/92] Don't write a space after the return attribute Fixes #521. --- src/dfmt/formatter.d | 4 +++- tests/allman/issue0521.d.ref | 17 +++++++++++++++++ tests/issue0521.d | 17 +++++++++++++++++ tests/otbs/issue0521.d.ref | 14 ++++++++++++++ 4 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0521.d.ref create mode 100644 tests/issue0521.d create mode 100644 tests/otbs/issue0521.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 74821bf..696b4f8 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -224,7 +224,9 @@ private: else if (currentIs(tok!"return")) { writeToken(); - if (!currentIs(tok!";") && !currentIs(tok!")") && !currentIs(tok!"{")) + if (!currentIs(tok!";") && !currentIs(tok!")") && !currentIs(tok!"{") + && !currentIs(tok!"in") && !currentIs(tok!"out") && !currentIs(tok!"do") + && (hasCurrent && tokens[index].text != "body")) write(" "); } else if (currentIs(tok!"with")) diff --git a/tests/allman/issue0521.d.ref b/tests/allman/issue0521.d.ref new file mode 100644 index 0000000..67a0942 --- /dev/null +++ b/tests/allman/issue0521.d.ref @@ -0,0 +1,17 @@ +public int f() return +in (true) +{ + return 0; +} + +public int g() return +out (; true) +{ + return 0; +} + +public int h() return +body +{ + return 0; +} diff --git a/tests/issue0521.d b/tests/issue0521.d new file mode 100644 index 0000000..67a0942 --- /dev/null +++ b/tests/issue0521.d @@ -0,0 +1,17 @@ +public int f() return +in (true) +{ + return 0; +} + +public int g() return +out (; true) +{ + return 0; +} + +public int h() return +body +{ + return 0; +} diff --git a/tests/otbs/issue0521.d.ref b/tests/otbs/issue0521.d.ref new file mode 100644 index 0000000..14f0645 --- /dev/null +++ b/tests/otbs/issue0521.d.ref @@ -0,0 +1,14 @@ +public int f() return +in (true) { + return 0; +} + +public int g() return +out (; true) { + return 0; +} + +public int h() return +body { + return 0; +} From 1f21a977137e2fabfd8d692b06a50b9b6a414908 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 9 Mar 2021 10:46:32 +0100 Subject: [PATCH 78/92] Don't indent associative array keys as labels --- src/dfmt/formatter.d | 4 ++-- tests/allman/assoc_key_indent.d.ref | 8 ++++++++ tests/assoc_key_indent.args | 1 + tests/assoc_key_indent.d | 8 ++++++++ tests/otbs/assoc_key_indent.d.ref | 7 +++++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 tests/allman/assoc_key_indent.d.ref create mode 100644 tests/assoc_key_indent.args create mode 100644 tests/assoc_key_indent.d create mode 100644 tests/otbs/assoc_key_indent.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 696b4f8..f8883da 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1694,8 +1694,8 @@ private: assert(l2 != -1, "Recent '{' is not found despite being in struct initializer"); indentLevel = l2 + 1; } - else if (config.dfmt_compact_labeled_statements == OptionalBoolean.f - || !isBlockHeader(2) || peek2Is(tok!"if")) + else if ((config.dfmt_compact_labeled_statements == OptionalBoolean.f + || !isBlockHeader(2) || peek2Is(tok!"if")) && !indents.topIs(tok!"]")) { immutable l2 = indents.indentToMostRecent(tok!"{"); indentLevel = l2 != -1 ? l2 : indents.indentLevel - 1; diff --git a/tests/allman/assoc_key_indent.d.ref b/tests/allman/assoc_key_indent.d.ref new file mode 100644 index 0000000..a357a35 --- /dev/null +++ b/tests/allman/assoc_key_indent.d.ref @@ -0,0 +1,8 @@ +void main() +{ + string key; + + int[string] var = [ + key: 5 + ]; +} diff --git a/tests/assoc_key_indent.args b/tests/assoc_key_indent.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/assoc_key_indent.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/assoc_key_indent.d b/tests/assoc_key_indent.d new file mode 100644 index 0000000..a357a35 --- /dev/null +++ b/tests/assoc_key_indent.d @@ -0,0 +1,8 @@ +void main() +{ + string key; + + int[string] var = [ + key: 5 + ]; +} diff --git a/tests/otbs/assoc_key_indent.d.ref b/tests/otbs/assoc_key_indent.d.ref new file mode 100644 index 0000000..814c7cd --- /dev/null +++ b/tests/otbs/assoc_key_indent.d.ref @@ -0,0 +1,7 @@ +void main() { + string key; + + int[string] var = [ + key: 5 + ]; +} From 3479e737076a156518e4d32575029161151c0c8f Mon Sep 17 00:00:00 2001 From: Preetpal Sohal Date: Thu, 11 Mar 2021 06:40:44 -0800 Subject: [PATCH 79/92] Fix installation instructions on README.md (#531) * Fix installation instructions on README.md Fixes Issue #530. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b6e8b4..7ec9818 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ when using the **--inplace** option. ### Installing with DUB ```sh -> dub fetch --version='~master' dfmt && dub run dfmt -- -h +> dub run dfmt -- -h ``` ### Building from source using Make From e79ba9f0c89ee39f32780c5a2fcd2294b1040190 Mon Sep 17 00:00:00 2001 From: WebFreak001 Date: Tue, 6 Apr 2021 20:01:00 +0200 Subject: [PATCH 80/92] upgrade libdparse to <0.18.0 --- dub.json | 2 +- libdparse | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index 4148322..bc64b76 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": ">=0.14.0 <0.16.0" + "libdparse": ">=0.14.0 <0.18.0" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index 1557eb0..9aefc9c 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 1557eb079a2d5958e0a7136f942eea0922d58e8a +Subproject commit 9aefc9c5e6e1495aca094d5c403f35f1052677d1 From e35bde0815a0058fedac2f825188dcbbe4ed3941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Fri, 16 Apr 2021 13:57:21 +0200 Subject: [PATCH 81/92] Add Kernighan & Ritchie style brace formatting. The original K&R style behaves like BraceStyle.otbs, except for function definitions that use Allman style. --- src/dfmt/ast_info.d | 16 ++++++++++++++++ src/dfmt/config.d | 4 +++- src/dfmt/formatter.d | 7 ++++++- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index 83082d1..961b8f9 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -95,6 +95,12 @@ struct ASTInformation /// Closing braces of function literals size_t[] funLitEndLocations; + /// Locations of aggregate bodies (struct, class, union) + size_t[] aggregateBodyLocations; + + /// Locations of function bodies + size_t[] funBodyLocations; + /// Conditional statements that have matching "else" statements size_t[] conditionalWithElseLocations; @@ -200,6 +206,15 @@ final class FormatVisitor : ASTVisitor destructor.accept(this); } + override void visit (const FunctionBody functionBody) + { + if (auto bd = functionBody.specifiedFunctionBody) + { + astInformation.funBodyLocations ~= bd.blockStatement.startLocation; + } + functionBody.accept(this); + } + override void visit(const ConditionalDeclaration dec) { if (dec.hasElse) @@ -313,6 +328,7 @@ final class FormatVisitor : ASTVisitor override void visit(const StructBody structBody) { + astInformation.aggregateBodyLocations ~= structBody.startLocation; astInformation.doubleNewlineLocations ~= structBody.endLocation; structBody.accept(this); } diff --git a/src/dfmt/config.d b/src/dfmt/config.d index 86706d1..64e80d0 100644 --- a/src/dfmt/config.d +++ b/src/dfmt/config.d @@ -16,7 +16,9 @@ enum BraceStyle /// $(LINK https://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS) otbs, /// $(LINK https://en.wikipedia.org/wiki/Indent_style#Variant:_Stroustrup) - stroustrup + stroustrup, + /// $(LINK https://en.wikipedia.org/wiki/Indentation_style#K&R_style) + knr, } enum TemplateConstraintStyle diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index f8883da..f66ac1b 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -15,6 +15,7 @@ import dfmt.indentation; import dfmt.tokens; import dfmt.wrapping; import std.array; +import std.algorithm.comparison : among; /** * Formats the code contained in `buffer` into `output`. @@ -963,6 +964,10 @@ private: if (config.dfmt_brace_style == BraceStyle.allman || peekBackIsOneOf(true, tok!"{", tok!"}")) newline(); + else if (config.dfmt_brace_style == BraceStyle.knr + && astInformation.funBodyLocations.canFindIndex(tIndex) + && (peekBackIs(tok!")") || (!peekBackIs(tok!"do") && peekBack().text != "body"))) + newline(); else if (!peekBackIsOneOf(true, tok!"{", tok!"}", tok!";")) write(" "); writeToken(); @@ -1031,7 +1036,7 @@ private: currentLineLength = 0; justAddedExtraNewline = true; } - if (config.dfmt_brace_style == BraceStyle.otbs + if (config.dfmt_brace_style.among(BraceStyle.otbs, BraceStyle.knr) && ((peekIs(tok!"else") && !indents.topAre(tok!"static", tok!"if") && !indents.topIs(tok!"foreach") && !indents.topIs(tok!"for") From 0f615864383a00764fd8d31b74a087dbd836fd21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Fri, 16 Apr 2021 13:57:59 +0200 Subject: [PATCH 82/92] Add tests for "knr" brace style. --- tests/knr/.d.ref | 0 tests/knr/2d_arrays.d.ref | 37 +++++++++++++ tests/knr/DeclSpacing.d.ref | 15 +++++ tests/knr/array_access.d.ref | 6 ++ tests/knr/assoc_key_indent.d.ref | 8 +++ tests/knr/associative_array.d.ref | 25 +++++++++ tests/knr/associative_array_complex.d.ref | 25 +++++++++ tests/knr/attribute_constraint.d.ref | 13 +++++ tests/knr/breakOnDots.d.ref | 13 +++++ tests/knr/catchExceptionNested.d.ref | 41 ++++++++++++++ tests/knr/comments.d.ref | 7 +++ tests/knr/constraint_singe_tab.d.ref | 9 +++ tests/knr/constraint_singe_tab2.d.ref | 10 ++++ tests/knr/contracts.d.ref | 17 ++++++ tests/knr/debug-inside-if.d.ref | 7 +++ tests/knr/debug_with_param.d.ref | 7 +++ tests/knr/dip1009.d.ref | 18 ++++++ tests/knr/do_body.d.ref | 15 +++++ tests/knr/empty.d.ref | 0 tests/knr/enum_attribs.d.ref | 5 ++ tests/knr/frontpage.d.ref | 13 +++++ tests/knr/func_param_attrib.d.ref | 1 + tests/knr/guessnumber.d.ref | 30 ++++++++++ tests/knr/hello.d.ref | 6 ++ tests/knr/higherorder.d.ref | 12 ++++ tests/knr/issue0017.d.ref | 4 ++ tests/knr/issue0018.d.ref | 5 ++ tests/knr/issue0021.d.ref | 9 +++ tests/knr/issue0022.d.ref | 5 ++ tests/knr/issue0023.d.d.ref | 0 tests/knr/issue0023.d.ref | 36 ++++++++++++ tests/knr/issue0024.d.ref | 4 ++ tests/knr/issue0025.d.ref | 4 ++ tests/knr/issue0026.d.ref | 1 + tests/knr/issue0027.d.ref | 46 ++++++++++++++++ tests/knr/issue0028.d.ref | 16 ++++++ tests/knr/issue0029.d.ref | 3 + tests/knr/issue0030.d.ref | 3 + tests/knr/issue0031.d.ref | 6 ++ tests/knr/issue0032.d.ref | 7 +++ tests/knr/issue0033.d.ref | 14 +++++ tests/knr/issue0034.d.ref | 10 ++++ tests/knr/issue0035.d.ref | 5 ++ tests/knr/issue0037.d.ref | 15 +++++ tests/knr/issue0038.d.ref | 5 ++ tests/knr/issue0039.d.ref | 1 + tests/knr/issue0041.d.ref | 2 + tests/knr/issue0042.d.ref | 12 ++++ tests/knr/issue0043.d.ref | 13 +++++ tests/knr/issue0044.d.ref | 5 ++ tests/knr/issue0045.d.ref | 7 +++ tests/knr/issue0046.d.ref | 13 +++++ tests/knr/issue0047.d.ref | 29 ++++++++++ tests/knr/issue0048.d.ref | 5 ++ tests/knr/issue0049.d.ref | 11 ++++ tests/knr/issue0050.d.ref | 19 +++++++ tests/knr/issue0051.d.ref | 12 ++++ tests/knr/issue0052.d.ref | 8 +++ tests/knr/issue0053.d.ref | 11 ++++ tests/knr/issue0054.d.ref | 26 +++++++++ tests/knr/issue0056.d.ref | 16 ++++++ tests/knr/issue0057.d.ref | 14 +++++ tests/knr/issue0058.d.ref | 9 +++ tests/knr/issue0059.d.ref | 13 +++++ tests/knr/issue0060.d.ref | 4 ++ tests/knr/issue0061.d.ref | 1 + tests/knr/issue0062.d.ref | 5 ++ tests/knr/issue0063.d.ref | 4 ++ tests/knr/issue0064.d.ref | 17 ++++++ tests/knr/issue0065.d.ref | 7 +++ tests/knr/issue0066.d.ref | 8 +++ tests/knr/issue0067.d.ref | 1 + tests/knr/issue0068.d.ref | 3 + tests/knr/issue0069.d.ref | 7 +++ tests/knr/issue0070.d.ref | 7 +++ tests/knr/issue0073.d.ref | 7 +++ tests/knr/issue0074.d.ref | 13 +++++ tests/knr/issue0076.d.ref | 5 ++ tests/knr/issue0079.d.ref | 8 +++ tests/knr/issue0080.d.ref | 10 ++++ tests/knr/issue0081.d.ref | 15 +++++ tests/knr/issue0082.d.ref | 10 ++++ tests/knr/issue0083.d.ref | 5 ++ tests/knr/issue0085.d.ref | 1 + tests/knr/issue0086.d.ref | 22 ++++++++ tests/knr/issue0088.d.ref | 7 +++ tests/knr/issue0089.d.ref | 5 ++ tests/knr/issue0090.d.ref | 8 +++ tests/knr/issue0091.d.ref | 10 ++++ tests/knr/issue0092.d.ref | 15 +++++ tests/knr/issue0093.d.ref | 7 +++ tests/knr/issue0094.d.ref | 6 ++ tests/knr/issue0095.d.ref | 6 ++ tests/knr/issue0096.d.ref | 13 +++++ tests/knr/issue0097.d.ref | 33 +++++++++++ tests/knr/issue0098.d.ref | 6 ++ tests/knr/issue0099.d.ref | 31 +++++++++++ tests/knr/issue0100.d.ref | 12 ++++ tests/knr/issue0101.d.ref | 9 +++ tests/knr/issue0102.d.ref | 1 + tests/knr/issue0106.d.ref | 2 + tests/knr/issue0107.d.ref | 14 +++++ tests/knr/issue0108.d.ref | 10 ++++ tests/knr/issue0109.d.ref | 5 ++ tests/knr/issue0111.d.ref | 7 +++ tests/knr/issue0112.d.ref | 13 +++++ tests/knr/issue0112_variation.d.ref | 13 +++++ tests/knr/issue0114.d.ref | 4 ++ tests/knr/issue0116.d.ref | 7 +++ tests/knr/issue0117.d.ref | 6 ++ tests/knr/issue0118.d.ref | 14 +++++ tests/knr/issue0119.d.ref | 24 ++++++++ tests/knr/issue0120.d.ref | 3 + tests/knr/issue0123.d.ref | 6 ++ tests/knr/issue0125.d.ref | 11 ++++ tests/knr/issue0126.d.ref | 6 ++ tests/knr/issue0127.d.ref | 4 ++ tests/knr/issue0128.d.ref | 4 ++ tests/knr/issue0130.d.ref | 10 ++++ tests/knr/issue0134.d.ref | 14 +++++ tests/knr/issue0136.d.ref | 3 + tests/knr/issue0138.d.ref | 7 +++ tests/knr/issue0139.d.ref | 24 ++++++++ tests/knr/issue0140.d.ref | 5 ++ tests/knr/issue0142.d.ref | 3 + tests/knr/issue0146.d.ref | 1 + tests/knr/issue0147.d.ref | 1 + tests/knr/issue0148.d.ref | 6 ++ tests/knr/issue0150.d.ref | 5 ++ tests/knr/issue0151.d.ref | 7 +++ tests/knr/issue0152.d.ref | 1 + tests/knr/issue0153.d.ref | 6 ++ tests/knr/issue0154.d.ref | 5 ++ tests/knr/issue0155.d.ref | 3 + tests/knr/issue0156.d.ref | 7 +++ tests/knr/issue0158.d.ref | 6 ++ tests/knr/issue0162.d.ref | 8 +++ tests/knr/issue0166.d.ref | 9 +++ tests/knr/issue0169.d.ref | 10 ++++ tests/knr/issue0172.d.ref | 6 ++ tests/knr/issue0174.d.ref | 5 ++ tests/knr/issue0177.d.ref | 26 +++++++++ tests/knr/issue0185.d.ref | 12 ++++ tests/knr/issue0186.d.ref | 23 ++++++++ tests/knr/issue0187.d.ref | 3 + tests/knr/issue0189.d.ref | 17 ++++++ tests/knr/issue0190.d.ref | 6 ++ tests/knr/issue0194.d.ref | 10 ++++ tests/knr/issue0195.d.ref | 15 +++++ tests/knr/issue0204.d.ref | 10 ++++ tests/knr/issue0205.d.ref | 6 ++ tests/knr/issue0206.d.ref | 7 +++ tests/knr/issue0207.d.ref | 10 ++++ tests/knr/issue0208.d.ref | 5 ++ tests/knr/issue0209.d.ref | 18 ++++++ tests/knr/issue0210.d.ref | 2 + tests/knr/issue0212.d.ref | 3 + tests/knr/issue0213.d.ref | 6 ++ tests/knr/issue0215a.d.ref | 17 ++++++ tests/knr/issue0215b.d.ref | 17 ++++++ tests/knr/issue0215c.d.ref | 18 ++++++ tests/knr/issue0215d.d.ref | 18 ++++++ tests/knr/issue0216.d.ref | 5 ++ tests/knr/issue0219.d.ref | 5 ++ tests/knr/issue0220.d.ref | 67 +++++++++++++++++++++++ tests/knr/issue0221.d.ref | 4 ++ tests/knr/issue0222.d.ref | 4 ++ tests/knr/issue0223.d.ref | 6 ++ tests/knr/issue0224.d.ref | 5 ++ tests/knr/issue0225.d.ref | 4 ++ tests/knr/issue0226.d.ref | 14 +++++ tests/knr/issue0229.d.ref | 23 ++++++++ tests/knr/issue0237.d.ref | 39 +++++++++++++ tests/knr/issue0241.d.ref | 3 + tests/knr/issue0244.d.ref | 4 ++ tests/knr/issue0246.d.ref | 17 ++++++ tests/knr/issue0248.d.ref | 11 ++++ tests/knr/issue0251.d.ref | 8 +++ tests/knr/issue0256.d.ref | 11 ++++ tests/knr/issue0267.d.ref | 19 +++++++ tests/knr/issue0273.d.ref | 4 ++ tests/knr/issue0286.d.ref | 14 +++++ tests/knr/issue0287.d.ref | 3 + tests/knr/issue0303.d.ref | 10 ++++ tests/knr/issue0313.d.ref | 13 +++++ tests/knr/issue0314.d.ref | 10 ++++ tests/knr/issue0321.d.ref | 7 +++ tests/knr/issue0326.d.ref | 4 ++ tests/knr/issue0345.d.ref | 3 + tests/knr/issue0349.d.ref | 6 ++ tests/knr/issue0361.d.ref | 11 ++++ tests/knr/issue0372.d.ref | 22 ++++++++ tests/knr/issue0384.d.ref | 30 ++++++++++ tests/knr/issue0426.d.ref | 6 ++ tests/knr/issue0430.d.ref | 5 ++ tests/knr/issue0433.d.ref | 7 +++ tests/knr/issue0436.d.ref | 1 + tests/knr/issue0448.d.ref | 3 + tests/knr/issue0452.d.ref | 2 + tests/knr/issue0454.d.ref | 10 ++++ tests/knr/issue0465.d.ref | 8 +++ tests/knr/issue0476.d.ref | 7 +++ tests/knr/issue0483.d.ref | 14 +++++ tests/knr/issue0485.d.ref | 5 ++ tests/knr/issue0486.d.ref | 5 ++ tests/knr/issue0497.d.ref | 5 ++ tests/knr/issue0501.d.ref | 4 ++ tests/knr/issue0504.d.ref | 40 ++++++++++++++ tests/knr/issue0508.d.ref | 5 ++ tests/knr/issue0509.d.ref | 34 ++++++++++++ tests/knr/issue0515.d.ref | 6 ++ tests/knr/issue0521.d.ref | 16 ++++++ tests/knr/keep_line_breaks.d.ref | 35 ++++++++++++ tests/knr/lambda_param_attrib.d.ref | 1 + tests/knr/longParamList.d.ref | 17 ++++++ tests/knr/minimizeLength.d.ref | 19 +++++++ tests/knr/multiline_string.d.ref | 11 ++++ tests/knr/parenIndent.d.ref | 31 +++++++++++ tests/knr/propertySpacing.d.ref | 1 + tests/knr/swap.d.ref | 26 +++++++++ tests/knr/ufcschain.d.ref | 6 ++ tests/knr/wrapping1.d.ref | 7 +++ tests/test.sh | 2 +- 223 files changed, 2371 insertions(+), 1 deletion(-) create mode 100644 tests/knr/.d.ref create mode 100644 tests/knr/2d_arrays.d.ref create mode 100644 tests/knr/DeclSpacing.d.ref create mode 100644 tests/knr/array_access.d.ref create mode 100644 tests/knr/assoc_key_indent.d.ref create mode 100644 tests/knr/associative_array.d.ref create mode 100644 tests/knr/associative_array_complex.d.ref create mode 100644 tests/knr/attribute_constraint.d.ref create mode 100644 tests/knr/breakOnDots.d.ref create mode 100644 tests/knr/catchExceptionNested.d.ref create mode 100644 tests/knr/comments.d.ref create mode 100644 tests/knr/constraint_singe_tab.d.ref create mode 100644 tests/knr/constraint_singe_tab2.d.ref create mode 100644 tests/knr/contracts.d.ref create mode 100644 tests/knr/debug-inside-if.d.ref create mode 100644 tests/knr/debug_with_param.d.ref create mode 100644 tests/knr/dip1009.d.ref create mode 100644 tests/knr/do_body.d.ref create mode 100644 tests/knr/empty.d.ref create mode 100644 tests/knr/enum_attribs.d.ref create mode 100644 tests/knr/frontpage.d.ref create mode 100644 tests/knr/func_param_attrib.d.ref create mode 100644 tests/knr/guessnumber.d.ref create mode 100644 tests/knr/hello.d.ref create mode 100644 tests/knr/higherorder.d.ref create mode 100644 tests/knr/issue0017.d.ref create mode 100644 tests/knr/issue0018.d.ref create mode 100644 tests/knr/issue0021.d.ref create mode 100644 tests/knr/issue0022.d.ref create mode 100644 tests/knr/issue0023.d.d.ref create mode 100644 tests/knr/issue0023.d.ref create mode 100644 tests/knr/issue0024.d.ref create mode 100644 tests/knr/issue0025.d.ref create mode 100644 tests/knr/issue0026.d.ref create mode 100644 tests/knr/issue0027.d.ref create mode 100644 tests/knr/issue0028.d.ref create mode 100644 tests/knr/issue0029.d.ref create mode 100644 tests/knr/issue0030.d.ref create mode 100644 tests/knr/issue0031.d.ref create mode 100644 tests/knr/issue0032.d.ref create mode 100644 tests/knr/issue0033.d.ref create mode 100644 tests/knr/issue0034.d.ref create mode 100644 tests/knr/issue0035.d.ref create mode 100644 tests/knr/issue0037.d.ref create mode 100644 tests/knr/issue0038.d.ref create mode 100644 tests/knr/issue0039.d.ref create mode 100644 tests/knr/issue0041.d.ref create mode 100644 tests/knr/issue0042.d.ref create mode 100644 tests/knr/issue0043.d.ref create mode 100644 tests/knr/issue0044.d.ref create mode 100644 tests/knr/issue0045.d.ref create mode 100644 tests/knr/issue0046.d.ref create mode 100644 tests/knr/issue0047.d.ref create mode 100644 tests/knr/issue0048.d.ref create mode 100644 tests/knr/issue0049.d.ref create mode 100644 tests/knr/issue0050.d.ref create mode 100644 tests/knr/issue0051.d.ref create mode 100644 tests/knr/issue0052.d.ref create mode 100644 tests/knr/issue0053.d.ref create mode 100644 tests/knr/issue0054.d.ref create mode 100644 tests/knr/issue0056.d.ref create mode 100644 tests/knr/issue0057.d.ref create mode 100644 tests/knr/issue0058.d.ref create mode 100644 tests/knr/issue0059.d.ref create mode 100644 tests/knr/issue0060.d.ref create mode 100644 tests/knr/issue0061.d.ref create mode 100644 tests/knr/issue0062.d.ref create mode 100644 tests/knr/issue0063.d.ref create mode 100644 tests/knr/issue0064.d.ref create mode 100644 tests/knr/issue0065.d.ref create mode 100644 tests/knr/issue0066.d.ref create mode 100644 tests/knr/issue0067.d.ref create mode 100644 tests/knr/issue0068.d.ref create mode 100644 tests/knr/issue0069.d.ref create mode 100644 tests/knr/issue0070.d.ref create mode 100644 tests/knr/issue0073.d.ref create mode 100644 tests/knr/issue0074.d.ref create mode 100644 tests/knr/issue0076.d.ref create mode 100644 tests/knr/issue0079.d.ref create mode 100644 tests/knr/issue0080.d.ref create mode 100644 tests/knr/issue0081.d.ref create mode 100644 tests/knr/issue0082.d.ref create mode 100644 tests/knr/issue0083.d.ref create mode 100644 tests/knr/issue0085.d.ref create mode 100644 tests/knr/issue0086.d.ref create mode 100644 tests/knr/issue0088.d.ref create mode 100644 tests/knr/issue0089.d.ref create mode 100644 tests/knr/issue0090.d.ref create mode 100644 tests/knr/issue0091.d.ref create mode 100644 tests/knr/issue0092.d.ref create mode 100644 tests/knr/issue0093.d.ref create mode 100644 tests/knr/issue0094.d.ref create mode 100644 tests/knr/issue0095.d.ref create mode 100644 tests/knr/issue0096.d.ref create mode 100644 tests/knr/issue0097.d.ref create mode 100644 tests/knr/issue0098.d.ref create mode 100644 tests/knr/issue0099.d.ref create mode 100644 tests/knr/issue0100.d.ref create mode 100644 tests/knr/issue0101.d.ref create mode 100644 tests/knr/issue0102.d.ref create mode 100644 tests/knr/issue0106.d.ref create mode 100644 tests/knr/issue0107.d.ref create mode 100644 tests/knr/issue0108.d.ref create mode 100644 tests/knr/issue0109.d.ref create mode 100644 tests/knr/issue0111.d.ref create mode 100644 tests/knr/issue0112.d.ref create mode 100644 tests/knr/issue0112_variation.d.ref create mode 100644 tests/knr/issue0114.d.ref create mode 100644 tests/knr/issue0116.d.ref create mode 100644 tests/knr/issue0117.d.ref create mode 100644 tests/knr/issue0118.d.ref create mode 100644 tests/knr/issue0119.d.ref create mode 100644 tests/knr/issue0120.d.ref create mode 100644 tests/knr/issue0123.d.ref create mode 100644 tests/knr/issue0125.d.ref create mode 100644 tests/knr/issue0126.d.ref create mode 100644 tests/knr/issue0127.d.ref create mode 100644 tests/knr/issue0128.d.ref create mode 100644 tests/knr/issue0130.d.ref create mode 100644 tests/knr/issue0134.d.ref create mode 100644 tests/knr/issue0136.d.ref create mode 100644 tests/knr/issue0138.d.ref create mode 100644 tests/knr/issue0139.d.ref create mode 100644 tests/knr/issue0140.d.ref create mode 100644 tests/knr/issue0142.d.ref create mode 100644 tests/knr/issue0146.d.ref create mode 100644 tests/knr/issue0147.d.ref create mode 100644 tests/knr/issue0148.d.ref create mode 100644 tests/knr/issue0150.d.ref create mode 100644 tests/knr/issue0151.d.ref create mode 100644 tests/knr/issue0152.d.ref create mode 100644 tests/knr/issue0153.d.ref create mode 100644 tests/knr/issue0154.d.ref create mode 100644 tests/knr/issue0155.d.ref create mode 100644 tests/knr/issue0156.d.ref create mode 100644 tests/knr/issue0158.d.ref create mode 100644 tests/knr/issue0162.d.ref create mode 100644 tests/knr/issue0166.d.ref create mode 100644 tests/knr/issue0169.d.ref create mode 100644 tests/knr/issue0172.d.ref create mode 100644 tests/knr/issue0174.d.ref create mode 100644 tests/knr/issue0177.d.ref create mode 100644 tests/knr/issue0185.d.ref create mode 100644 tests/knr/issue0186.d.ref create mode 100644 tests/knr/issue0187.d.ref create mode 100644 tests/knr/issue0189.d.ref create mode 100644 tests/knr/issue0190.d.ref create mode 100644 tests/knr/issue0194.d.ref create mode 100644 tests/knr/issue0195.d.ref create mode 100644 tests/knr/issue0204.d.ref create mode 100644 tests/knr/issue0205.d.ref create mode 100644 tests/knr/issue0206.d.ref create mode 100644 tests/knr/issue0207.d.ref create mode 100644 tests/knr/issue0208.d.ref create mode 100644 tests/knr/issue0209.d.ref create mode 100644 tests/knr/issue0210.d.ref create mode 100644 tests/knr/issue0212.d.ref create mode 100644 tests/knr/issue0213.d.ref create mode 100644 tests/knr/issue0215a.d.ref create mode 100644 tests/knr/issue0215b.d.ref create mode 100644 tests/knr/issue0215c.d.ref create mode 100644 tests/knr/issue0215d.d.ref create mode 100644 tests/knr/issue0216.d.ref create mode 100644 tests/knr/issue0219.d.ref create mode 100644 tests/knr/issue0220.d.ref create mode 100644 tests/knr/issue0221.d.ref create mode 100644 tests/knr/issue0222.d.ref create mode 100644 tests/knr/issue0223.d.ref create mode 100644 tests/knr/issue0224.d.ref create mode 100644 tests/knr/issue0225.d.ref create mode 100644 tests/knr/issue0226.d.ref create mode 100644 tests/knr/issue0229.d.ref create mode 100644 tests/knr/issue0237.d.ref create mode 100644 tests/knr/issue0241.d.ref create mode 100644 tests/knr/issue0244.d.ref create mode 100644 tests/knr/issue0246.d.ref create mode 100644 tests/knr/issue0248.d.ref create mode 100644 tests/knr/issue0251.d.ref create mode 100644 tests/knr/issue0256.d.ref create mode 100644 tests/knr/issue0267.d.ref create mode 100644 tests/knr/issue0273.d.ref create mode 100644 tests/knr/issue0286.d.ref create mode 100644 tests/knr/issue0287.d.ref create mode 100644 tests/knr/issue0303.d.ref create mode 100644 tests/knr/issue0313.d.ref create mode 100644 tests/knr/issue0314.d.ref create mode 100644 tests/knr/issue0321.d.ref create mode 100644 tests/knr/issue0326.d.ref create mode 100644 tests/knr/issue0345.d.ref create mode 100644 tests/knr/issue0349.d.ref create mode 100644 tests/knr/issue0361.d.ref create mode 100644 tests/knr/issue0372.d.ref create mode 100644 tests/knr/issue0384.d.ref create mode 100644 tests/knr/issue0426.d.ref create mode 100644 tests/knr/issue0430.d.ref create mode 100644 tests/knr/issue0433.d.ref create mode 100644 tests/knr/issue0436.d.ref create mode 100644 tests/knr/issue0448.d.ref create mode 100644 tests/knr/issue0452.d.ref create mode 100644 tests/knr/issue0454.d.ref create mode 100644 tests/knr/issue0465.d.ref create mode 100644 tests/knr/issue0476.d.ref create mode 100644 tests/knr/issue0483.d.ref create mode 100644 tests/knr/issue0485.d.ref create mode 100644 tests/knr/issue0486.d.ref create mode 100644 tests/knr/issue0497.d.ref create mode 100644 tests/knr/issue0501.d.ref create mode 100644 tests/knr/issue0504.d.ref create mode 100644 tests/knr/issue0508.d.ref create mode 100644 tests/knr/issue0509.d.ref create mode 100644 tests/knr/issue0515.d.ref create mode 100644 tests/knr/issue0521.d.ref create mode 100644 tests/knr/keep_line_breaks.d.ref create mode 100644 tests/knr/lambda_param_attrib.d.ref create mode 100644 tests/knr/longParamList.d.ref create mode 100644 tests/knr/minimizeLength.d.ref create mode 100644 tests/knr/multiline_string.d.ref create mode 100644 tests/knr/parenIndent.d.ref create mode 100644 tests/knr/propertySpacing.d.ref create mode 100644 tests/knr/swap.d.ref create mode 100644 tests/knr/ufcschain.d.ref create mode 100644 tests/knr/wrapping1.d.ref diff --git a/tests/knr/.d.ref b/tests/knr/.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/knr/2d_arrays.d.ref b/tests/knr/2d_arrays.d.ref new file mode 100644 index 0000000..5b685ec --- /dev/null +++ b/tests/knr/2d_arrays.d.ref @@ -0,0 +1,37 @@ +unittest { + targets = [ + [ + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 48 * scale), vec4(14 / 16.0, 0, 16 / 16.0, 3 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -32 * scale), + vec2(16 * scale, 32 * scale), vec4(14 / 16.0, 3 / 16.0, 16 / 16.0, 5 / 16.0)) + ], + [ + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(14 / 16.0, 5 / 16.0, 15 / 16.0, 6 / 16.0)), + RectangleShape.create(tex, vec2(-8 * scale, -8 * scale), + vec2(16 * scale, 16 * scale), vec4(15 / 16.0, 5 / 16.0, 16 / 16.0, 6 / 16.0)) + ] + ]; + + int[][] foo = [ + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ], + [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, + 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 + ] + ]; + + float[3][3] mat = [ + [234.3456, 42435.8653, 23.5], [3.245, 235.3, 234.664], + [14324.6453, 23434.645, 9678.345] + ]; +} + +string[][] globalArray = [ + ["123456789012345678901234567890", "123456789012345678901234567890"], + ["123456789012345678901234567890", "123456789012345678901234567890"] +]; diff --git a/tests/knr/DeclSpacing.d.ref b/tests/knr/DeclSpacing.d.ref new file mode 100644 index 0000000..ce51064 --- /dev/null +++ b/tests/knr/DeclSpacing.d.ref @@ -0,0 +1,15 @@ +import std.stdio; + +class Foo { +} + +import std.conv; + +void main() +{ + return; +} + +const baz = 11; +class Foo2 : Foo { +} diff --git a/tests/knr/array_access.d.ref b/tests/knr/array_access.d.ref new file mode 100644 index 0000000..7a2ac55 --- /dev/null +++ b/tests/knr/array_access.d.ref @@ -0,0 +1,6 @@ +unittest { + foo([ + target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1], target.value.region[1] + ]); +} diff --git a/tests/knr/assoc_key_indent.d.ref b/tests/knr/assoc_key_indent.d.ref new file mode 100644 index 0000000..a357a35 --- /dev/null +++ b/tests/knr/assoc_key_indent.d.ref @@ -0,0 +1,8 @@ +void main() +{ + string key; + + int[string] var = [ + key: 5 + ]; +} diff --git a/tests/knr/associative_array.d.ref b/tests/knr/associative_array.d.ref new file mode 100644 index 0000000..39f18c6 --- /dev/null +++ b/tests/knr/associative_array.d.ref @@ -0,0 +1,25 @@ +unittest { + Bson base = Bson([ + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); + int[] x = [ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, + 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 + ]; +} diff --git a/tests/knr/associative_array_complex.d.ref b/tests/knr/associative_array_complex.d.ref new file mode 100644 index 0000000..c7b803b --- /dev/null +++ b/tests/knr/associative_array_complex.d.ref @@ -0,0 +1,25 @@ +auto find() +{ + return Map.findRange([ + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) + ] + ] + ]); +} diff --git a/tests/knr/attribute_constraint.d.ref b/tests/knr/attribute_constraint.d.ref new file mode 100644 index 0000000..db4af0d --- /dev/null +++ b/tests/knr/attribute_constraint.d.ref @@ -0,0 +1,13 @@ +struct SomeStructName { + static struct InnerStruct { + version (linux) { + static if (condition) { + void longFunctionName(AAAAAAAA)(AAAAAAAA a) @property + if (someThingsAreTrue!AAAAAAAA && long_condition + && is(elaborate == expression)) + { + } + } + } + } +} diff --git a/tests/knr/breakOnDots.d.ref b/tests/knr/breakOnDots.d.ref new file mode 100644 index 0000000..bdfb29b --- /dev/null +++ b/tests/knr/breakOnDots.d.ref @@ -0,0 +1,13 @@ +unittest { + { + { + foreach (abcde, def; abcdef.map!(battlecruiser => battlecruiser[123 .. 1231231]) + .filter!(bravo => charlie[10] > 90000) + .sum()) { + + } + abcdeabcdeabcde(12341234).abcdeabcdeabcde(12341234).abcdeabcdeabcde(12341234) + .abcdeabcdeabcde(12341234).abcdeabcdeabcde(12341234); + } + } +} diff --git a/tests/knr/catchExceptionNested.d.ref b/tests/knr/catchExceptionNested.d.ref new file mode 100644 index 0000000..57217c1 --- /dev/null +++ b/tests/knr/catchExceptionNested.d.ref @@ -0,0 +1,41 @@ +class U0 : Exception { + this() @safe pure nothrow + { + super("U0 error message"); + } +} + +class U1 : Exception { + this() @safe pure nothrow + { + super("U1 error message"); + } +} + +void foo() +{ + import std.stdio; + + foreach (immutable i; 0 .. 2) { + try { + i.bar; + } catch (U0) { + "Function foo caught exception U0".writeln; + } + } +} + +void bar(in int i) @safe pure +{ + i.baz; +} + +void baz(in int i) @safe pure +{ + throw i ? new U1 : new U0; +} + +void main() +{ + foo; +} diff --git a/tests/knr/comments.d.ref b/tests/knr/comments.d.ref new file mode 100644 index 0000000..7139949 --- /dev/null +++ b/tests/knr/comments.d.ref @@ -0,0 +1,7 @@ +int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/ +{ + // comment on its own line + foo() // comment on same line + .bar(); // also on same line + /* again */ // same line +} diff --git a/tests/knr/constraint_singe_tab.d.ref b/tests/knr/constraint_singe_tab.d.ref new file mode 100644 index 0000000..176e0f4 --- /dev/null +++ b/tests/knr/constraint_singe_tab.d.ref @@ -0,0 +1,9 @@ +void foo()() + if (dogs && pigs && birds && ants && foxes && flies && cats && bugs && bees + && cows && sheeps && monkeys && whales) +{ +} + +void foo()() if (dogs && pigs && birds) +{ +} diff --git a/tests/knr/constraint_singe_tab2.d.ref b/tests/knr/constraint_singe_tab2.d.ref new file mode 100644 index 0000000..59c0cb1 --- /dev/null +++ b/tests/knr/constraint_singe_tab2.d.ref @@ -0,0 +1,10 @@ +void foo()() + if (dogs && pigs && birds && ants && foxes && flies && cats && bugs && bees + && cows && sheeps && monkeys && whales) +{ +} + +void foo()() + if (dogs && pigs && birds) +{ +} diff --git a/tests/knr/contracts.d.ref b/tests/knr/contracts.d.ref new file mode 100644 index 0000000..c90e330 --- /dev/null +++ b/tests/knr/contracts.d.ref @@ -0,0 +1,17 @@ +void main(string[] args) +{ + struct SomeStruct { + private: + int a; + int b; + void doStuff(int q) + in { + assert(q); + } + out (result) { + } + body { + writeln(q); + } + } +} diff --git a/tests/knr/debug-inside-if.d.ref b/tests/knr/debug-inside-if.d.ref new file mode 100644 index 0000000..13252df --- /dev/null +++ b/tests/knr/debug-inside-if.d.ref @@ -0,0 +1,7 @@ +void main() +{ + if (true) + debug { + foo(); + } +} diff --git a/tests/knr/debug_with_param.d.ref b/tests/knr/debug_with_param.d.ref new file mode 100644 index 0000000..b2c9baa --- /dev/null +++ b/tests/knr/debug_with_param.d.ref @@ -0,0 +1,7 @@ +void main() +{ + debug (0) + foo(); + else + bar(); +} diff --git a/tests/knr/dip1009.d.ref b/tests/knr/dip1009.d.ref new file mode 100644 index 0000000..ba2417d --- /dev/null +++ b/tests/knr/dip1009.d.ref @@ -0,0 +1,18 @@ +int foo(int arg) +in { + assert(arg > 0); +} +out (result) { + assert(result == 0); +} +do { + return 0; +} + +int bar(int arg) +in (arg > 0) +out (; true) +out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0) +{ + return 0; +} diff --git a/tests/knr/do_body.d.ref b/tests/knr/do_body.d.ref new file mode 100644 index 0000000..89138ce --- /dev/null +++ b/tests/knr/do_body.d.ref @@ -0,0 +1,15 @@ +import character.body; + +void body() @nogc +in { +} +body { + body = null; +} + +void body() +in { +} +do { + body = null; +} diff --git a/tests/knr/empty.d.ref b/tests/knr/empty.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/knr/enum_attribs.d.ref b/tests/knr/enum_attribs.d.ref new file mode 100644 index 0000000..8ff4288 --- /dev/null +++ b/tests/knr/enum_attribs.d.ref @@ -0,0 +1,5 @@ +enum Foo { + + deprecated member0, + @UDA(0) member1 +} diff --git a/tests/knr/frontpage.d.ref b/tests/knr/frontpage.d.ref new file mode 100644 index 0000000..f7d9a45 --- /dev/null +++ b/tests/knr/frontpage.d.ref @@ -0,0 +1,13 @@ +// Computes average line length for standard input. +import std.stdio; + +void main() +{ + ulong lines = 0; + double sumLength = 0; + foreach (line; stdin.byLine()) { + ++lines; + sumLength += line.length; + } + writeln("Average line length: ", lines ? sumLength / lines : 0); +} diff --git a/tests/knr/func_param_attrib.d.ref b/tests/knr/func_param_attrib.d.ref new file mode 100644 index 0000000..8717517 --- /dev/null +++ b/tests/knr/func_param_attrib.d.ref @@ -0,0 +1 @@ +void foo(@UDA(0) @UDA(1) Bar bar); diff --git a/tests/knr/guessnumber.d.ref b/tests/knr/guessnumber.d.ref new file mode 100644 index 0000000..8ee4a28 --- /dev/null +++ b/tests/knr/guessnumber.d.ref @@ -0,0 +1,30 @@ +import std.stdio, std.random, std.typecons, std.conv, std.string, std.range; + +void main() +{ + immutable interval = tuple(1, 100); + writefln("Guess my target number that is between " ~ "%d and %d (inclusive).\n", interval[]); + immutable target = uniform!"[]"(interval[]); + + foreach (immutable i; sequence!q{n}) { + writef("Your guess #%d: ", i + 1); + immutable txt = stdin.readln.strip; + + Nullable!int answer; + try { + answer = txt.to!int; + } catch (ConvException e) { + writefln(" I don't understand your input '%s'", txt); + continue; + } + if (answer < interval[0] || answer > interval[1]) { + writeln(" Out of range!"); + continue; + } + if (answer == target) { + writeln(" Well guessed."); + break; + } + writeln(answer < target ? " Too low." : " Too high."); + } +} diff --git a/tests/knr/hello.d.ref b/tests/knr/hello.d.ref new file mode 100644 index 0000000..0beb9aa --- /dev/null +++ b/tests/knr/hello.d.ref @@ -0,0 +1,6 @@ +import std.stdio; + +void main() +{ + writeln("Hello, world without explicit compilations!"); +} diff --git a/tests/knr/higherorder.d.ref b/tests/knr/higherorder.d.ref new file mode 100644 index 0000000..be9b953 --- /dev/null +++ b/tests/knr/higherorder.d.ref @@ -0,0 +1,12 @@ +int hof(int a, int b, int delegate(int, int) f) +{ + return f(a, b); +} + +void main() +{ + import std.stdio; + + writeln("Add: ", hof(2, 3, (a, b) => a + b)); + writeln("Multiply: ", hof(2, 3, (a, b) => a * b)); +} diff --git a/tests/knr/issue0017.d.ref b/tests/knr/issue0017.d.ref new file mode 100644 index 0000000..541c22a --- /dev/null +++ b/tests/knr/issue0017.d.ref @@ -0,0 +1,4 @@ +immutable NameId[] namesA = [ + {"Aacgr", 0x00386}, // GREEK CAPITAL LETTER ALPHA WITH TONOS + {"aacgr", 0x003AC}, // GREEK SMALL LETTER ALPHA WITH TONOS +]; diff --git a/tests/knr/issue0018.d.ref b/tests/knr/issue0018.d.ref new file mode 100644 index 0000000..2e7d77c --- /dev/null +++ b/tests/knr/issue0018.d.ref @@ -0,0 +1,5 @@ +import core.stdc.ctype; + +/********************************************* + * + */ diff --git a/tests/knr/issue0021.d.ref b/tests/knr/issue0021.d.ref new file mode 100644 index 0000000..ed28391 --- /dev/null +++ b/tests/knr/issue0021.d.ref @@ -0,0 +1,9 @@ +void func() +{ + if (!negative) + return this; + else if (a.negative) + return max(); + else + return a.value == 0 ? a : this; +} diff --git a/tests/knr/issue0022.d.ref b/tests/knr/issue0022.d.ref new file mode 100644 index 0000000..81c0d3b --- /dev/null +++ b/tests/knr/issue0022.d.ref @@ -0,0 +1,5 @@ +struct X { + ~this() + { + } +} diff --git a/tests/knr/issue0023.d.d.ref b/tests/knr/issue0023.d.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/knr/issue0023.d.ref b/tests/knr/issue0023.d.ref new file mode 100644 index 0000000..64e52e3 --- /dev/null +++ b/tests/knr/issue0023.d.ref @@ -0,0 +1,36 @@ +string generateFixedLengthCases() +{ + int[] shortList = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; + + something[] items = [ + one, two, three, four, five, six, seven, eight, nine, ten, eleven, + twelve, thirteen, fourteen + ]; + + string[] fixedLengthTokens = [ + "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool", + "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", + "char", "class", "const", "continue", "creal", "dchar", "debug", "default", + "delegate", "delete", "deprecated", "do", "double", "else", "enum", + "export", "extern", "false", "final", "finally", "float", "for", "foreach", + "foreach_reverse", "function", "goto", "idouble", "if", "ifloat", + "immutable", "import", "in", "inout", "int", "interface", "invariant", + "ireal", "is", "lazy", "long", "macro", "mixin", "module", "new", + "nothrow", "null", "out", "override", "package", "pragma", "private", + "protected", "public", "pure", "real", "ref", "return", "scope", "shared", + "short", "static", "struct", "super", "switch", "synchronized", "template", + "this", "throw", "true", "try", "typedef", "typeid", "typeof", "ubyte", + "ucent", "uint", "ulong", "union", "unittest", "ushort", "version", "void", + "volatile", "wchar", "while", "with", "__DATE__", "__EOF__", + "__FILE__", "__FUNCTION__", "__gshared", "__LINE__", + "__MODULE__", "__parameters", "__PRETTY_FUNCTION__", "__TIME__", + "__TIMESTAMP__", "__traits", "__vector", "__VENDOR__", "__VERSION__", + ",", ".", "..", "...", "/", "/=", "!", "!<", "!<=", "!<>", "!<>=", + "!=", "!>", "!>=", "$", "%", "%=", "&", "&&", "&=", "(", ")", "*", + "*=", "+", "++", "+=", "-", "--", "-=", ":", ";", "<", "<<", "<<=", + "<=", "<>", "<>=", "=", "==", "=>", ">", ">=", ">>", ">>=", ">>>", + ">>>=", "?", "@", "[", "]", "^", "^=", "^^", "^^=", "{", "|", "|=", "||", + "}", "~", "~=" + ]; + +} diff --git a/tests/knr/issue0024.d.ref b/tests/knr/issue0024.d.ref new file mode 100644 index 0000000..ca5ade0 --- /dev/null +++ b/tests/knr/issue0024.d.ref @@ -0,0 +1,4 @@ +complex_t opMul_r(real x) +{ + return complex_t(x) * this; +} diff --git a/tests/knr/issue0025.d.ref b/tests/knr/issue0025.d.ref new file mode 100644 index 0000000..eac4846 --- /dev/null +++ b/tests/knr/issue0025.d.ref @@ -0,0 +1,4 @@ +complex_t opMul(real y) +{ + return this * complex_t(y); +} diff --git a/tests/knr/issue0026.d.ref b/tests/knr/issue0026.d.ref new file mode 100644 index 0000000..902bfd9 --- /dev/null +++ b/tests/knr/issue0026.d.ref @@ -0,0 +1 @@ +extern (C++) int HtmlNamedEntity(const(char)* p, size_t length); diff --git a/tests/knr/issue0027.d.ref b/tests/knr/issue0027.d.ref new file mode 100644 index 0000000..cfa0a90 --- /dev/null +++ b/tests/knr/issue0027.d.ref @@ -0,0 +1,46 @@ +SignExtendedNumber opMul(const SignExtendedNumber a) const +{ + // like 0x10 * 0x10 == 0x100 == 0. + + /* Special handling for zeros: + */ +} + +unittest { + if (Port.isNan(r1) || Port.isNan(r2)) // if unordered + { + } + + while (cur && cur.ty == Tsarray) // sizes of dimensions + { + TypeSArray sa = cast(TypeSArray) cur; + mangleNumber(sa.dim ? sa.dim.toInteger() : 0); + cur = cur.nextOf(); + } + + if (fd) { + /* Use storage_class2 instead of storage_class otherwise when we do .di generation + * we'll wind up with 'const const' rather than 'const'. + */ + /* Don't think we need to worry about mutually exclusive storage classes here + */ + fd.storage_class2 |= stc; + } + +} + +SignExtendedNumber opMul(const SignExtendedNumber a) const +{ + /* Special handling for zeros: + */ + + // like 0x10 * 0x10 == 0x100 == 0. +} + +// Because int64_t and friends may be any integral type of the +// correct size, we have to explicitly ask for the correct +// integer type to get the correct mangling with ddmd + +// Be careful not to care about sign when using dinteger_t +// use this instead of integer_t to +// avoid conflicts with system #include's diff --git a/tests/knr/issue0028.d.ref b/tests/knr/issue0028.d.ref new file mode 100644 index 0000000..c96ee7b --- /dev/null +++ b/tests/knr/issue0028.d.ref @@ -0,0 +1,16 @@ +unittest { + if (imin.value > 0x10FFFFUL) // ?? + imin.value = 0x10FFFFUL; // ?? + with (stuff) switch (a) { + case a: + doStuff(); + break; + } + switch (a) { + } + if (something) /** whatever */ + doStuff(); + if (something) /+ comment +/ { + doStuff(); + } +} diff --git a/tests/knr/issue0029.d.ref b/tests/knr/issue0029.d.ref new file mode 100644 index 0000000..43327e0 --- /dev/null +++ b/tests/knr/issue0029.d.ref @@ -0,0 +1,3 @@ +unittest { + char** buf = cast(char**) mem.xmalloc(dim * (char*).sizeof); +} diff --git a/tests/knr/issue0030.d.ref b/tests/knr/issue0030.d.ref new file mode 100644 index 0000000..d4c8ba0 --- /dev/null +++ b/tests/knr/issue0030.d.ref @@ -0,0 +1,3 @@ +unittest { + tolower(*p); +} diff --git a/tests/knr/issue0031.d.ref b/tests/knr/issue0031.d.ref new file mode 100644 index 0000000..c9ea8ef --- /dev/null +++ b/tests/knr/issue0031.d.ref @@ -0,0 +1,6 @@ +import std.stdio : writeln; + +void main() +{ + writeln(cast(dchar)uint.max); +} diff --git a/tests/knr/issue0032.d.ref b/tests/knr/issue0032.d.ref new file mode 100644 index 0000000..9a6f97c --- /dev/null +++ b/tests/knr/issue0032.d.ref @@ -0,0 +1,7 @@ +SignExtendedNumber opSub(const SignExtendedNumber a) const +{ + if (a.isMinimum()) + return negative ? SignExtendedNumber(value, false) : max(); + else + return this + (-a); +} diff --git a/tests/knr/issue0033.d.ref b/tests/knr/issue0033.d.ref new file mode 100644 index 0000000..6595e59 --- /dev/null +++ b/tests/knr/issue0033.d.ref @@ -0,0 +1,14 @@ +static IntRange fromType(Type type, bool isUnsigned) +{ + if (type.toBasetype().ty == Tdchar) + upper.value = 0x10FFFFUL; + else if (!isUnsigned) { + lower.value = ~(mask >> 1); + lower.value = ~(mask >> 1); + lower.negative = true; + upper.value = (mask >> 1); + } + uinteger_t minHalfChunk = imin.value & ~halfChunkMask; + uinteger_t maxHalfChunk = imax.value & ~halfChunkMask; + return IntRange(lower, upper); +} diff --git a/tests/knr/issue0034.d.ref b/tests/knr/issue0034.d.ref new file mode 100644 index 0000000..f2a1838 --- /dev/null +++ b/tests/knr/issue0034.d.ref @@ -0,0 +1,10 @@ +unittest { + if (a.value == 0) { + if (a.negative) + return SignExtendedNumber(value == 0 && negative); + else + return extreme(negative); + } + + uinteger_t aAbs = copySign(a.value, a.negative); +} diff --git a/tests/knr/issue0035.d.ref b/tests/knr/issue0035.d.ref new file mode 100644 index 0000000..0394671 --- /dev/null +++ b/tests/knr/issue0035.d.ref @@ -0,0 +1,5 @@ +unittest { + if (some_very_long_expression && some_very_long_expression && + some_very_long_expression && some_very_long_expression && some_very_long_expression) { + } +} diff --git a/tests/knr/issue0037.d.ref b/tests/knr/issue0037.d.ref new file mode 100644 index 0000000..f9c8d79 --- /dev/null +++ b/tests/knr/issue0037.d.ref @@ -0,0 +1,15 @@ +class U { +private: + unittest { + Label: + int a = 0; + } +} + +unittest { + loop: while (true) { + doStuff(); + } +Label: { + } +} diff --git a/tests/knr/issue0038.d.ref b/tests/knr/issue0038.d.ref new file mode 100644 index 0000000..97d7dc8 --- /dev/null +++ b/tests/knr/issue0038.d.ref @@ -0,0 +1,5 @@ +static int isInfinity(double r) +{ + auto a = r is double.infinity || r is -double.infinity; + auto b = r is double.infinity || r !is -double.infinity; +} diff --git a/tests/knr/issue0039.d.ref b/tests/knr/issue0039.d.ref new file mode 100644 index 0000000..206b331 --- /dev/null +++ b/tests/knr/issue0039.d.ref @@ -0,0 +1 @@ +version (AArch64) int x = 10; diff --git a/tests/knr/issue0041.d.ref b/tests/knr/issue0041.d.ref new file mode 100644 index 0000000..df92dd3 --- /dev/null +++ b/tests/knr/issue0041.d.ref @@ -0,0 +1,2 @@ +static if (is(typeof(T.init.apply(fp, null)))) { +} diff --git a/tests/knr/issue0042.d.ref b/tests/knr/issue0042.d.ref new file mode 100644 index 0000000..b5837e1 --- /dev/null +++ b/tests/knr/issue0042.d.ref @@ -0,0 +1,12 @@ +unittest { + version (Windows) + __locale_decpoint = save; +} + +unittest { + version (Windows) + __locale_decpoint = save; + else + __locale_decpoint = save; + version (Win32) int x; +} diff --git a/tests/knr/issue0043.d.ref b/tests/knr/issue0043.d.ref new file mode 100644 index 0000000..c749e7a --- /dev/null +++ b/tests/knr/issue0043.d.ref @@ -0,0 +1,13 @@ +unittest { + switch (something) with (stuff) { + case 1: + case 2: + label: + doStuff(); + case 3: .. case 4: + doOtherStuff(); + goto label; + default: + break; + } +} diff --git a/tests/knr/issue0044.d.ref b/tests/knr/issue0044.d.ref new file mode 100644 index 0000000..b7950c8 --- /dev/null +++ b/tests/knr/issue0044.d.ref @@ -0,0 +1,5 @@ +enum Sizeok : int { + SIZEOKnone, // size of aggregate is not computed yet + SIZEOKdone, // size of aggregate is set correctly + SIZEOKfwd, // error in computing size of aggregate +} diff --git a/tests/knr/issue0045.d.ref b/tests/knr/issue0045.d.ref new file mode 100644 index 0000000..405827c --- /dev/null +++ b/tests/knr/issue0045.d.ref @@ -0,0 +1,7 @@ +void doStuff() +{ + for (;;) { + } + for (size_t i = 0; i < se.len;) { + } +} diff --git a/tests/knr/issue0046.d.ref b/tests/knr/issue0046.d.ref new file mode 100644 index 0000000..fdc36ad --- /dev/null +++ b/tests/knr/issue0046.d.ref @@ -0,0 +1,13 @@ +class C { + void func() + { + switch (x) { + default: + assert(0); + } + } + + void main(string[] args) + { + } +} diff --git a/tests/knr/issue0047.d.ref b/tests/knr/issue0047.d.ref new file mode 100644 index 0000000..91a3bf4 --- /dev/null +++ b/tests/knr/issue0047.d.ref @@ -0,0 +1,29 @@ +unittest { + + FuncDeclaration* pFd = cast(FuncDeclaration*) dmd_aaGet(&arrayfuncs, cast(void*) ident); + FuncDeclaration fd = *pFd; + { + auto dd = new DtorDeclaration(declLoc, Loc(), stc, Identifier.idPool("__fieldDtor")); + auto dd = new DtorDeclaration(declLoc, Loc(), stc, extraParam, + midLengthFun(param, param), longIdentifier, Identifier.idPool("__fieldDtor")); + + memcpy(&saved_idents, &rvl.saved_idents, (const(char)*).sizeof * VC_SAVED_IDENT_CNT); + memcpy(&saved_types, &rvl.saved_types, (Type).sizeof * VC_SAVED_TYPE_CNT); + + auto ed = new EnumDeclaration(loc, ident, memtype ? memtype.syntaxCopy() : null); + } +} + +void doStuff(const Token[] tokens, ref const State current, + const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, int depth) +{ + return; +} + +unittest { + if (x) { + if (y) { + auto z = doCond(e.thisexp) || doCond(e.newargs) || doCond(e.arguments) || applyTo(e); + } + } +} diff --git a/tests/knr/issue0048.d.ref b/tests/knr/issue0048.d.ref new file mode 100644 index 0000000..d960f6e --- /dev/null +++ b/tests/knr/issue0048.d.ref @@ -0,0 +1,5 @@ +@Shortcut("[shift] + [tab]") +@MenuItem("Text/Decrease") +void textDecreaseIndent(BufferView v) +{ +} diff --git a/tests/knr/issue0049.d.ref b/tests/knr/issue0049.d.ref new file mode 100644 index 0000000..4be6943 --- /dev/null +++ b/tests/knr/issue0049.d.ref @@ -0,0 +1,11 @@ +void main(string[] args) +{ + switch (value) { + case 0: + return null; + case 1: + // Indented comment + /* fall through */ + default: + } +} diff --git a/tests/knr/issue0050.d.ref b/tests/knr/issue0050.d.ref new file mode 100644 index 0000000..58f7328 --- /dev/null +++ b/tests/knr/issue0050.d.ref @@ -0,0 +1,19 @@ +void fun() +{ + if (something) + foreach (_; 0 .. 100) + if (true) { + if (stuff) + doStuff(); + else + morestuff(); + } else + doStuff(); + + cast(structalign_t) 1; + for (*cost = 0; sc; sc = sc.enclosing, (*cost)++) + if (sc.scopesym == scopesym) + break; + else + a++; +} diff --git a/tests/knr/issue0051.d.ref b/tests/knr/issue0051.d.ref new file mode 100644 index 0000000..4b4ea73 --- /dev/null +++ b/tests/knr/issue0051.d.ref @@ -0,0 +1,12 @@ +void f() +{ + if (a) { + } else // wat + { + if (!is_temp_arg_ref) { + if (global.params.isOSX) + buf.writeByte('_'); + } + } + return; +} diff --git a/tests/knr/issue0052.d.ref b/tests/knr/issue0052.d.ref new file mode 100644 index 0000000..4816bf1 --- /dev/null +++ b/tests/knr/issue0052.d.ref @@ -0,0 +1,8 @@ +enum Flags : int { + IS_NOT_TOP_TYPE = 0x1, + MANGLE_RETURN_TYPE = 0x2, + IGNORE_CONST = 0x4, + IS_DMC = 0x8, +} + +auto a = [b, c, d,]; diff --git a/tests/knr/issue0053.d.ref b/tests/knr/issue0053.d.ref new file mode 100644 index 0000000..d595a7e --- /dev/null +++ b/tests/knr/issue0053.d.ref @@ -0,0 +1,11 @@ +enum DYNCAST : int { + DYNCAST_OBJECT, + DYNCAST_EXPRESSION, + DYNCAST_DSYMBOL, + DYNCAST_TYPE, + DYNCAST_IDENTIFIER, + DYNCAST_TUPLE, + DYNCAST_PARAMETER, +} + +alias MATCHnomatch = MATCH.MATCHnomatch; diff --git a/tests/knr/issue0054.d.ref b/tests/knr/issue0054.d.ref new file mode 100644 index 0000000..464dfb9 --- /dev/null +++ b/tests/knr/issue0054.d.ref @@ -0,0 +1,26 @@ +struct ClassFlags { + alias Type = uint; + enum Enum : int { + isCOMclass = 0x1, + noPointers = 0x2, + hasOffTi = 0x4, + hasCtor = 0x8, + hasGetMembers = 0x10, + hasTypeInfo = 0x20, + isAbstract = 0x40, + isCPPclass = 0x80, + hasDtor = 0x100, + + } + + alias isCOMclass = Enum.isCOMclass; + alias noPointers = Enum.noPointers; + alias hasOffTi = Enum.hasOffTi; + alias hasCtor = Enum.hasCtor; + alias hasGetMembers = Enum.hasGetMembers; + alias hasTypeInfo = Enum.hasTypeInfo; + alias isAbstract = Enum.isAbstract; + alias isCPPclass = Enum.isCPPclass; + alias hasDtor = Enum.hasDtor; + +} diff --git a/tests/knr/issue0056.d.ref b/tests/knr/issue0056.d.ref new file mode 100644 index 0000000..a707a88 --- /dev/null +++ b/tests/knr/issue0056.d.ref @@ -0,0 +1,16 @@ +unittest { + { + { + } + } + { + } + { + { + { + { + } + } + } + } +} diff --git a/tests/knr/issue0057.d.ref b/tests/knr/issue0057.d.ref new file mode 100644 index 0000000..f97cd04 --- /dev/null +++ b/tests/knr/issue0057.d.ref @@ -0,0 +1,14 @@ +~this() +{ +} + +extern (C++) ~this() +{ + global.gag = oldgag; +} + +struct S { + public ~this() + { + } +} diff --git a/tests/knr/issue0058.d.ref b/tests/knr/issue0058.d.ref new file mode 100644 index 0000000..547d359 --- /dev/null +++ b/tests/knr/issue0058.d.ref @@ -0,0 +1,9 @@ +/******************************************************** + * Helper function for checkAccess() + * Returns: + * false is not accessible + * true is accessible + */ +extern (C++) static bool isAccessible() +{ +} diff --git a/tests/knr/issue0059.d.ref b/tests/knr/issue0059.d.ref new file mode 100644 index 0000000..eb29149 --- /dev/null +++ b/tests/knr/issue0059.d.ref @@ -0,0 +1,13 @@ +extern (C++) FuncDeclaration buildXopEquals(StructDeclaration sd, Scope* sc) +{ + if (!needOpEquals(sd)) + return null; // bitwise comparison would work + //printf("StructDeclaration::buildXopEquals() %s\n", sd->toChars()); + if (Dsymbol eq = search_function(sd, Id.eq)) { + if (FuncDeclaration fd = eq.isFuncDeclaration()) { + TypeFunction tfeqptr; + { + } + } + } +} diff --git a/tests/knr/issue0060.d.ref b/tests/knr/issue0060.d.ref new file mode 100644 index 0000000..65e25c3 --- /dev/null +++ b/tests/knr/issue0060.d.ref @@ -0,0 +1,4 @@ +static if (a) { +} else static if (b) { +} else { +} diff --git a/tests/knr/issue0061.d.ref b/tests/knr/issue0061.d.ref new file mode 100644 index 0000000..8d3c642 --- /dev/null +++ b/tests/knr/issue0061.d.ref @@ -0,0 +1 @@ +const(char)*[VC_SAVED_IDENT_CNT] saved_idents; diff --git a/tests/knr/issue0062.d.ref b/tests/knr/issue0062.d.ref new file mode 100644 index 0000000..02ded66 --- /dev/null +++ b/tests/knr/issue0062.d.ref @@ -0,0 +1,5 @@ +unittest { + switch (op) { + return -1; // memory blocks are different + } +} diff --git a/tests/knr/issue0063.d.ref b/tests/knr/issue0063.d.ref new file mode 100644 index 0000000..e670eb6 --- /dev/null +++ b/tests/knr/issue0063.d.ref @@ -0,0 +1,4 @@ +import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration, + ddmd.dmodule, ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func, + ddmd.globals, ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array, + ddmd.root.file, ddmd.root.rootobject, ddmd.statement; diff --git a/tests/knr/issue0064.d.ref b/tests/knr/issue0064.d.ref new file mode 100644 index 0000000..c62925a --- /dev/null +++ b/tests/knr/issue0064.d.ref @@ -0,0 +1,17 @@ +unittest { + return true; // +Lnomatch: + //printf("nomatch\n"); + return false; // nomatch; +} + +unittest { + if (x) + return true; +} + +unittest { + return true; // match +Lnomatch: //printf("nomatch\n"); + return false; // nomatch; +} diff --git a/tests/knr/issue0065.d.ref b/tests/knr/issue0065.d.ref new file mode 100644 index 0000000..4c5f443 --- /dev/null +++ b/tests/knr/issue0065.d.ref @@ -0,0 +1,7 @@ +void main(string[] args) +{ + if ((*tempdecl.parameters)[i].isTemplateThisParameter() is null) { + } + if (a() in b || a() is b) { + } +} diff --git a/tests/knr/issue0066.d.ref b/tests/knr/issue0066.d.ref new file mode 100644 index 0000000..8928906 --- /dev/null +++ b/tests/knr/issue0066.d.ref @@ -0,0 +1,8 @@ +int overloadApply(int function(void*, Dsymbol) fp) +{ +} + +void takesArray(int[]) +{ + doesntUseArray(); +} diff --git a/tests/knr/issue0067.d.ref b/tests/knr/issue0067.d.ref new file mode 100644 index 0000000..597acf0 --- /dev/null +++ b/tests/knr/issue0067.d.ref @@ -0,0 +1 @@ +alias Key = void*; diff --git a/tests/knr/issue0068.d.ref b/tests/knr/issue0068.d.ref new file mode 100644 index 0000000..084f9cb --- /dev/null +++ b/tests/knr/issue0068.d.ref @@ -0,0 +1,3 @@ +version (all) { +} else version (none) { +} diff --git a/tests/knr/issue0069.d.ref b/tests/knr/issue0069.d.ref new file mode 100644 index 0000000..994988a --- /dev/null +++ b/tests/knr/issue0069.d.ref @@ -0,0 +1,7 @@ +unittest { + if (0) { + L1: + if (0) { + } + } +} diff --git a/tests/knr/issue0070.d.ref b/tests/knr/issue0070.d.ref new file mode 100644 index 0000000..46d19e0 --- /dev/null +++ b/tests/knr/issue0070.d.ref @@ -0,0 +1,7 @@ +unittest { + if (0) + if (0) { + something(); + something_else(); + } +} diff --git a/tests/knr/issue0073.d.ref b/tests/knr/issue0073.d.ref new file mode 100644 index 0000000..6119049 --- /dev/null +++ b/tests/knr/issue0073.d.ref @@ -0,0 +1,7 @@ +void presumed(out uint column) @trusted +{ + CXString cxstring; + + clang_getPresumedLocation(cx, &cxstring, &line, &column); + filename = toD(cxstring); +} diff --git a/tests/knr/issue0074.d.ref b/tests/knr/issue0074.d.ref new file mode 100644 index 0000000..aec2963 --- /dev/null +++ b/tests/knr/issue0074.d.ref @@ -0,0 +1,13 @@ +@property bool isFunctionType() +{ + with (CXTypeKind) + return kind == CXType_FunctionNoProto || kind == CXType_FunctionProto + || // FIXME: This "hack" shouldn't be needed. + func.resultType.isValid; +} + +@property bool isFunctionPointerType() +{ + with (CXTypeKind) + return kind == CXType_Pointer && pointeeType.isFunctionType; +} diff --git a/tests/knr/issue0076.d.ref b/tests/knr/issue0076.d.ref new file mode 100644 index 0000000..9568ea5 --- /dev/null +++ b/tests/knr/issue0076.d.ref @@ -0,0 +1,5 @@ +unittest { +Label: + while (1) { + } +} diff --git a/tests/knr/issue0079.d.ref b/tests/knr/issue0079.d.ref new file mode 100644 index 0000000..f5c6553 --- /dev/null +++ b/tests/knr/issue0079.d.ref @@ -0,0 +1,8 @@ +unittest { + switch (x) { + case a: { + } + case b: + return; + } +} diff --git a/tests/knr/issue0080.d.ref b/tests/knr/issue0080.d.ref new file mode 100644 index 0000000..ae440b7 --- /dev/null +++ b/tests/knr/issue0080.d.ref @@ -0,0 +1,10 @@ +unittest { + switch (x) { + case a: + return; + version (A) { + case b: + return; + } + } +} diff --git a/tests/knr/issue0081.d.ref b/tests/knr/issue0081.d.ref new file mode 100644 index 0000000..532810f --- /dev/null +++ b/tests/knr/issue0081.d.ref @@ -0,0 +1,15 @@ +unittest { + if (0) + if (0) { + } else if (0) { + } else { + } + doSomething(); +} + +unittest { + if (0) + if (0) { + } + doSomething(); +} diff --git a/tests/knr/issue0082.d.ref b/tests/knr/issue0082.d.ref new file mode 100644 index 0000000..5206d17 --- /dev/null +++ b/tests/knr/issue0082.d.ref @@ -0,0 +1,10 @@ +unittest { +label: + if (x) { + } +Label: + + // comment + statement(); +} +} diff --git a/tests/knr/issue0083.d.ref b/tests/knr/issue0083.d.ref new file mode 100644 index 0000000..787506e --- /dev/null +++ b/tests/knr/issue0083.d.ref @@ -0,0 +1,5 @@ +bool contains(T item) +{ + asm pure nothrow @nogc { + } +} diff --git a/tests/knr/issue0085.d.ref b/tests/knr/issue0085.d.ref new file mode 100644 index 0000000..bc54606 --- /dev/null +++ b/tests/knr/issue0085.d.ref @@ -0,0 +1 @@ +alias T = typeof(return); diff --git a/tests/knr/issue0086.d.ref b/tests/knr/issue0086.d.ref new file mode 100644 index 0000000..fdb7297 --- /dev/null +++ b/tests/knr/issue0086.d.ref @@ -0,0 +1,22 @@ +unittest { + if (a) + if (b) + doSomething(); + doSomethingElse(); +} + +void indent() +{ + import std.range : repeat, take; + + if (config.useTabs) + foreach (i; 0 .. indentLevel + tempIndent) { + currentLineLength += config.tabSize; + output.put("\t"); + } else + foreach (i; 0 .. indentLevel + tempIndent) + foreach (j; 0 .. config.indentSize) { + output.put(" "); + currentLineLength++; + } +} diff --git a/tests/knr/issue0088.d.ref b/tests/knr/issue0088.d.ref new file mode 100644 index 0000000..4e8a338 --- /dev/null +++ b/tests/knr/issue0088.d.ref @@ -0,0 +1,7 @@ +unittest { + switch (x) { + case +1: + case -1: + case (1): + } +} diff --git a/tests/knr/issue0089.d.ref b/tests/knr/issue0089.d.ref new file mode 100644 index 0000000..b91fbde --- /dev/null +++ b/tests/knr/issue0089.d.ref @@ -0,0 +1,5 @@ +unittest { + if (x) + doSomething(); + //doSomethingElse(); +} diff --git a/tests/knr/issue0090.d.ref b/tests/knr/issue0090.d.ref new file mode 100644 index 0000000..16cb849 --- /dev/null +++ b/tests/knr/issue0090.d.ref @@ -0,0 +1,8 @@ +unittest { +L1: + switch (x) { + case Case: + doSomething(); + doSomethingElse(); + } +} diff --git a/tests/knr/issue0091.d.ref b/tests/knr/issue0091.d.ref new file mode 100644 index 0000000..89ff419 --- /dev/null +++ b/tests/knr/issue0091.d.ref @@ -0,0 +1,10 @@ +unittest { + switch (x) { + version (none) { + x(); + case Case: + doSomething(); + doSomethingElse(); + } + } +} diff --git a/tests/knr/issue0092.d.ref b/tests/knr/issue0092.d.ref new file mode 100644 index 0000000..52fc7a0 --- /dev/null +++ b/tests/knr/issue0092.d.ref @@ -0,0 +1,15 @@ +unittest { + switch (cast(uint) sz) { + case 3: + if (!global.params.is64bit) + goto Lmemory; + case 4: + t1 = Type.tint32; + break; + case 5: + if (!global.params.is64bit) + goto Lmemory; + default: + break; + } +} diff --git a/tests/knr/issue0093.d.ref b/tests/knr/issue0093.d.ref new file mode 100644 index 0000000..4188bc2 --- /dev/null +++ b/tests/knr/issue0093.d.ref @@ -0,0 +1,7 @@ +unittest { + if (x) { + version (none) { + } else { + } + } +} diff --git a/tests/knr/issue0094.d.ref b/tests/knr/issue0094.d.ref new file mode 100644 index 0000000..0a70537 --- /dev/null +++ b/tests/knr/issue0094.d.ref @@ -0,0 +1,6 @@ +void test() +{ + fun((int x) { writeln(x); }, (int x) { writeln(x); }); + + return; +} diff --git a/tests/knr/issue0095.d.ref b/tests/knr/issue0095.d.ref new file mode 100644 index 0000000..453b074 --- /dev/null +++ b/tests/knr/issue0095.d.ref @@ -0,0 +1,6 @@ +unittest { + if (!fdmatch) + goto Lfd; + { + } +} diff --git a/tests/knr/issue0096.d.ref b/tests/knr/issue0096.d.ref new file mode 100644 index 0000000..441e7d9 --- /dev/null +++ b/tests/knr/issue0096.d.ref @@ -0,0 +1,13 @@ +version (Windows) void func(); +version (Windows) + void func(); +else + void func(); +version (Windows) { + void func(); +} +version (Windows) { + void func(); +} else { + void func(); +} diff --git a/tests/knr/issue0097.d.ref b/tests/knr/issue0097.d.ref new file mode 100644 index 0000000..c43ea0d --- /dev/null +++ b/tests/knr/issue0097.d.ref @@ -0,0 +1,33 @@ +unittest { + switch (x) { + case 0: + version (none) { + // Comment + case '\n': + break; + } + } +} + +unittest { + switch (x) { + case 0: { + Label: while (1) { + } + break; + } + Label2: + doStuff(); + } +} + +unittest { + switch (a) { + case a: + doStuff(); + doOtherStuff(); + break; + default: + break; + } +} diff --git a/tests/knr/issue0098.d.ref b/tests/knr/issue0098.d.ref new file mode 100644 index 0000000..ecb4ff9 --- /dev/null +++ b/tests/knr/issue0098.d.ref @@ -0,0 +1,6 @@ +unittest { + if (!fdmatch) + goto Lfd; // comment + { + } +} diff --git a/tests/knr/issue0099.d.ref b/tests/knr/issue0099.d.ref new file mode 100644 index 0000000..b615aa9 --- /dev/null +++ b/tests/knr/issue0099.d.ref @@ -0,0 +1,31 @@ +unittest { + if (a) { + if (b) + if (c) { + if (excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName) + excessivelyLongFunctionName(true); + else { + excessivelyLongFunctionName(false); + } + } else + a(); + } +} + +unittest { + if (a) { + if (b) { + if (c) { + if (excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName + && excessivelyLongVariableName.longAttributeName) + excessivelyLongFunctionName(true); + else { + excessivelyLongFunctionName(false); + } + } + } + } +} diff --git a/tests/knr/issue0100.d.ref b/tests/knr/issue0100.d.ref new file mode 100644 index 0000000..15f5cfa --- /dev/null +++ b/tests/knr/issue0100.d.ref @@ -0,0 +1,12 @@ +unittest { + loop: while (i < tokens.length) switch (tokens[i].type) { + case tok!"(": + parenDepth++; + i++; + break; + case tok!"{": + braceDepth++; + i++; + break; + } +} diff --git a/tests/knr/issue0101.d.ref b/tests/knr/issue0101.d.ref new file mode 100644 index 0000000..5d2e5fc --- /dev/null +++ b/tests/knr/issue0101.d.ref @@ -0,0 +1,9 @@ +#! /usr/bin/env rdmd + +import std.stdio : writeln; + +int main(immutable string[] args) +{ + writeln("Hello World!"); + return 0; +} diff --git a/tests/knr/issue0102.d.ref b/tests/knr/issue0102.d.ref new file mode 100644 index 0000000..8efd670 --- /dev/null +++ b/tests/knr/issue0102.d.ref @@ -0,0 +1 @@ +import std.stdio: stderr; diff --git a/tests/knr/issue0106.d.ref b/tests/knr/issue0106.d.ref new file mode 100644 index 0000000..9045b4f --- /dev/null +++ b/tests/knr/issue0106.d.ref @@ -0,0 +1,2 @@ +enum : int { +} diff --git a/tests/knr/issue0107.d.ref b/tests/knr/issue0107.d.ref new file mode 100644 index 0000000..045f087 --- /dev/null +++ b/tests/knr/issue0107.d.ref @@ -0,0 +1,14 @@ +void msgpackToGValue(MsgValue input) +{ + with (MsgValue.Type) switch (input.type) { + case boolean: + a(); + break; + case unsigned: + b(); + break; + default: + assert(false); + } + return retVal; +} diff --git a/tests/knr/issue0108.d.ref b/tests/knr/issue0108.d.ref new file mode 100644 index 0000000..1c120a1 --- /dev/null +++ b/tests/knr/issue0108.d.ref @@ -0,0 +1,10 @@ +unittest { + with (SomeEnum) final switch (value) { + case a: + aa(); + break; + case b: + bb(); + break; + } +} diff --git a/tests/knr/issue0109.d.ref b/tests/knr/issue0109.d.ref new file mode 100644 index 0000000..43e04fc --- /dev/null +++ b/tests/knr/issue0109.d.ref @@ -0,0 +1,5 @@ +unittest { + sourceLoop: for (; childCodes.length > 0 && sourceListStore.iterIsValid(sourceIter); + sourceListStore.iterNext(sourceIter)) { + } +} diff --git a/tests/knr/issue0111.d.ref b/tests/knr/issue0111.d.ref new file mode 100644 index 0000000..3f13a34 --- /dev/null +++ b/tests/knr/issue0111.d.ref @@ -0,0 +1,7 @@ +struct Test { + this(string name, string[] aliasList, string briefDescription, string examDesc, string onOpenDesc, + string openDesc, string onCloseDesc, string closeDesc, + Flag!"canOpen" canOpen, Flag!"canClose" canClose, Flag!"isOpen" isOpen) + { + } +} diff --git a/tests/knr/issue0112.d.ref b/tests/knr/issue0112.d.ref new file mode 100644 index 0000000..6977857 --- /dev/null +++ b/tests/knr/issue0112.d.ref @@ -0,0 +1,13 @@ +unittest { + testScene = new Scene("TestScene : Test", sceneDescriptions["TestScene"], + connectDescriptions["TestScene"], delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} diff --git a/tests/knr/issue0112_variation.d.ref b/tests/knr/issue0112_variation.d.ref new file mode 100644 index 0000000..424c1dd --- /dev/null +++ b/tests/knr/issue0112_variation.d.ref @@ -0,0 +1,13 @@ +unittest { + testScene = new Scene(longArgument, longArgument, longArgument, + longArgument, longArgument, longArgument, delegate(Scene scene) { + import std.stdio; + + if (!scene.alreadyEntered) { + fwriteln( + "This is a test. This is a test. This is a test. This is a test. This is a test. Test12."); + auto p = cast(Portal) sceneManager.previousScene; + scene.destroyCurrentScript(); + } + }); +} diff --git a/tests/knr/issue0114.d.ref b/tests/knr/issue0114.d.ref new file mode 100644 index 0000000..ae34f97 --- /dev/null +++ b/tests/knr/issue0114.d.ref @@ -0,0 +1,4 @@ +private { + import std.process; + import std.c.windows.windows; +} diff --git a/tests/knr/issue0116.d.ref b/tests/knr/issue0116.d.ref new file mode 100644 index 0000000..c8b6a99 --- /dev/null +++ b/tests/knr/issue0116.d.ref @@ -0,0 +1,7 @@ +static assert(!is(T : int)); + +unittest { + foo(!is(T : int)); +} + +enum a(T) = !is(T : int); diff --git a/tests/knr/issue0117.d.ref b/tests/knr/issue0117.d.ref new file mode 100644 index 0000000..d6fa3cb --- /dev/null +++ b/tests/knr/issue0117.d.ref @@ -0,0 +1,6 @@ +struct A { + int i; // Comment + ~this() + { + } +} diff --git a/tests/knr/issue0118.d.ref b/tests/knr/issue0118.d.ref new file mode 100644 index 0000000..c27fb60 --- /dev/null +++ b/tests/knr/issue0118.d.ref @@ -0,0 +1,14 @@ +auto foo = bar(1, 1, 1); +auto foo = A!(int, int, int); +enum foo = bar(1, 1, 1); +enum foo = A!(int, int, int); + +enum bar { + a = Struct(a, b, c), + b = Struct(d, e, f) +} + +enum bar { + a = Struct(a, b, c), + b = Struct(d, e, f), +} diff --git a/tests/knr/issue0119.d.ref b/tests/knr/issue0119.d.ref new file mode 100644 index 0000000..9f0d8d1 --- /dev/null +++ b/tests/knr/issue0119.d.ref @@ -0,0 +1,24 @@ +auto fun = function() {}; +auto fun = () {}; +auto fun = {}; + +auto fun = { int i; }; + +auto fun = { int i; int i; int i; int i; }; + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/knr/issue0120.d.ref b/tests/knr/issue0120.d.ref new file mode 100644 index 0000000..c3b6313 --- /dev/null +++ b/tests/knr/issue0120.d.ref @@ -0,0 +1,3 @@ +auto fun = { + int i; // Comment +}; diff --git a/tests/knr/issue0123.d.ref b/tests/knr/issue0123.d.ref new file mode 100644 index 0000000..e91a9c8 --- /dev/null +++ b/tests/knr/issue0123.d.ref @@ -0,0 +1,6 @@ +struct State { + this(uint breaks, const Token[] tokens, immutable short[] depths, + const Config* config, int currentLineLength, int indentLevel) pure @safe + { + } +} diff --git a/tests/knr/issue0125.d.ref b/tests/knr/issue0125.d.ref new file mode 100644 index 0000000..ce47f77 --- /dev/null +++ b/tests/knr/issue0125.d.ref @@ -0,0 +1,11 @@ +void main(string[] args) +{ + // dfmt off + getopt(args, + "optionOne", &optionOne, + "optionTwo", &optionTwo, + "optionThree", &optionThree); + // dfmt on + + getopt(args, "optionOne", &optionOne, "optionTwo", &optionTwo, "optionThree", &optionThree); +} diff --git a/tests/knr/issue0126.d.ref b/tests/knr/issue0126.d.ref new file mode 100644 index 0000000..a79c876 --- /dev/null +++ b/tests/knr/issue0126.d.ref @@ -0,0 +1,6 @@ +unittest { + try + doStuff(); + catch (Exception ex) + complain(ex.msg); +} diff --git a/tests/knr/issue0127.d.ref b/tests/knr/issue0127.d.ref new file mode 100644 index 0000000..a6b95af --- /dev/null +++ b/tests/knr/issue0127.d.ref @@ -0,0 +1,4 @@ +version (Windows) + enum root = `C:\`; +else + enum root = "/"; diff --git a/tests/knr/issue0128.d.ref b/tests/knr/issue0128.d.ref new file mode 100644 index 0000000..0b1261c --- /dev/null +++ b/tests/knr/issue0128.d.ref @@ -0,0 +1,4 @@ +unittest { + string[string] aa = ["a" : "b"]; + auto x = "a" in aa; +} diff --git a/tests/knr/issue0130.d.ref b/tests/knr/issue0130.d.ref new file mode 100644 index 0000000..616293a --- /dev/null +++ b/tests/knr/issue0130.d.ref @@ -0,0 +1,10 @@ +class SomeClass { + public: + int x; + int y; + private: + int z; +} + +public: + void doStuff(); diff --git a/tests/knr/issue0134.d.ref b/tests/knr/issue0134.d.ref new file mode 100644 index 0000000..9d10648 --- /dev/null +++ b/tests/knr/issue0134.d.ref @@ -0,0 +1,14 @@ +void foo() +{ + string command; + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + + unittest { + version (Posix) + command ~= " 2> /dev/null 1> /dev/null"; + } +} diff --git a/tests/knr/issue0136.d.ref b/tests/knr/issue0136.d.ref new file mode 100644 index 0000000..9f04038 --- /dev/null +++ b/tests/knr/issue0136.d.ref @@ -0,0 +1,3 @@ +unittest { + auto result = name !in aa; +} diff --git a/tests/knr/issue0138.d.ref b/tests/knr/issue0138.d.ref new file mode 100644 index 0000000..4f1d05b --- /dev/null +++ b/tests/knr/issue0138.d.ref @@ -0,0 +1,7 @@ +unittest { + auto result = a[0] in aa; +} + +void doStuff(in int a, in int b) +{ +} diff --git a/tests/knr/issue0139.d.ref b/tests/knr/issue0139.d.ref new file mode 100644 index 0000000..938bb75 --- /dev/null +++ b/tests/knr/issue0139.d.ref @@ -0,0 +1,24 @@ +void foo(auto in a, auto out int b) const +out { + assert(true); +} +body { +} + +void foo() const +in { +} +out { + assert(true); +} +body { +} + +void foo() const +in { +} +out (result) { + assert(true); +} +body { +} diff --git a/tests/knr/issue0140.d.ref b/tests/knr/issue0140.d.ref new file mode 100644 index 0000000..471bf96 --- /dev/null +++ b/tests/knr/issue0140.d.ref @@ -0,0 +1,5 @@ +class C { + + int foo; + +} diff --git a/tests/knr/issue0142.d.ref b/tests/knr/issue0142.d.ref new file mode 100644 index 0000000..0ff0108 --- /dev/null +++ b/tests/knr/issue0142.d.ref @@ -0,0 +1,3 @@ +class Bar(A) : Foo if (isFloating!A) { + +} diff --git a/tests/knr/issue0146.d.ref b/tests/knr/issue0146.d.ref new file mode 100644 index 0000000..9854d89 --- /dev/null +++ b/tests/knr/issue0146.d.ref @@ -0,0 +1 @@ +alias FooFactory = Foo delegate(); diff --git a/tests/knr/issue0147.d.ref b/tests/knr/issue0147.d.ref new file mode 100644 index 0000000..df7761e --- /dev/null +++ b/tests/knr/issue0147.d.ref @@ -0,0 +1 @@ +import ae.utils.meta : singleton, I; diff --git a/tests/knr/issue0148.d.ref b/tests/knr/issue0148.d.ref new file mode 100644 index 0000000..9b4cb05 --- /dev/null +++ b/tests/knr/issue0148.d.ref @@ -0,0 +1,6 @@ +class Foo { + @property Socket socket() + { + return this.socket; + } +} diff --git a/tests/knr/issue0150.d.ref b/tests/knr/issue0150.d.ref new file mode 100644 index 0000000..c4a484c --- /dev/null +++ b/tests/knr/issue0150.d.ref @@ -0,0 +1,5 @@ +void main() +{ + scope (success) { + } +} diff --git a/tests/knr/issue0151.d.ref b/tests/knr/issue0151.d.ref new file mode 100644 index 0000000..639e6bb --- /dev/null +++ b/tests/knr/issue0151.d.ref @@ -0,0 +1,7 @@ +void test() +{ /* ignore */ } + +void test2() +{ + test(); +} diff --git a/tests/knr/issue0152.d.ref b/tests/knr/issue0152.d.ref new file mode 100644 index 0000000..d6a32a2 --- /dev/null +++ b/tests/knr/issue0152.d.ref @@ -0,0 +1 @@ +enum IsPathHandler(alias T) = is(PathHandler == typeof(T)); diff --git a/tests/knr/issue0153.d.ref b/tests/knr/issue0153.d.ref new file mode 100644 index 0000000..86bbf90 --- /dev/null +++ b/tests/knr/issue0153.d.ref @@ -0,0 +1,6 @@ +class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName + if (is(T : Bar)) { + void foo() + { + } +} diff --git a/tests/knr/issue0154.d.ref b/tests/knr/issue0154.d.ref new file mode 100644 index 0000000..14d242d --- /dev/null +++ b/tests/knr/issue0154.d.ref @@ -0,0 +1,5 @@ +class Foo(T) if (is(T : Bar) && is(T : Baz)) { +} + +class Foo(T) if (is(T : Bar) || is(T : Baz)) { +} diff --git a/tests/knr/issue0155.d.ref b/tests/knr/issue0155.d.ref new file mode 100644 index 0000000..ee25a4d --- /dev/null +++ b/tests/knr/issue0155.d.ref @@ -0,0 +1,3 @@ +import foo; +public import bar; +import baz; diff --git a/tests/knr/issue0156.d.ref b/tests/knr/issue0156.d.ref new file mode 100644 index 0000000..01b5abd --- /dev/null +++ b/tests/knr/issue0156.d.ref @@ -0,0 +1,7 @@ +class C { + int foo() const + out (bar) { + } + body { + } +} diff --git a/tests/knr/issue0158.d.ref b/tests/knr/issue0158.d.ref new file mode 100644 index 0000000..c81b98e --- /dev/null +++ b/tests/knr/issue0158.d.ref @@ -0,0 +1,6 @@ +@Foo enum Bar { + a +} + +@foo class Baz { +} diff --git a/tests/knr/issue0162.d.ref b/tests/knr/issue0162.d.ref new file mode 100644 index 0000000..cc9715b --- /dev/null +++ b/tests/knr/issue0162.d.ref @@ -0,0 +1,8 @@ +void foo(int foobarbazqux1, /* */ + int foobarbazqux2, /* */ + int foobarbazqux3, /* */ + int foobarbazqux4, /* */ + int foobarbazqux5, /* */ + int foobarbazqux6, /* */ + int foobarbazqux7 /* */ +); diff --git a/tests/knr/issue0166.d.ref b/tests/knr/issue0166.d.ref new file mode 100644 index 0000000..f1d209f --- /dev/null +++ b/tests/knr/issue0166.d.ref @@ -0,0 +1,9 @@ +void foo() +{ // + void bar() + { // + baz({ // + qux(); // + }); // + } // +} // diff --git a/tests/knr/issue0169.d.ref b/tests/knr/issue0169.d.ref new file mode 100644 index 0000000..6d99247 --- /dev/null +++ b/tests/knr/issue0169.d.ref @@ -0,0 +1,10 @@ +unittest { + if (true) { + if (true) // comment + { + + } else { + + } + } +} diff --git a/tests/knr/issue0172.d.ref b/tests/knr/issue0172.d.ref new file mode 100644 index 0000000..b50c1b3 --- /dev/null +++ b/tests/knr/issue0172.d.ref @@ -0,0 +1,6 @@ +final class FormatVisitor : ASTVisitor { + this(ASTInformation* astInformation) + { + this.astInformation = astInformation; + } +} diff --git a/tests/knr/issue0174.d.ref b/tests/knr/issue0174.d.ref new file mode 100644 index 0000000..1a95194 --- /dev/null +++ b/tests/knr/issue0174.d.ref @@ -0,0 +1,5 @@ +void merge() +{ + static if (is(T == enum)) + *thisN = x; +} diff --git a/tests/knr/issue0177.d.ref b/tests/knr/issue0177.d.ref new file mode 100644 index 0000000..c2bbe3c --- /dev/null +++ b/tests/knr/issue0177.d.ref @@ -0,0 +1,26 @@ +unittest { + { + } + // + { + } +} + +unittest { + { + } + // + + { + } +} + +unittest { + { + } + + // + + { + } +} diff --git a/tests/knr/issue0185.d.ref b/tests/knr/issue0185.d.ref new file mode 100644 index 0000000..8932e46 --- /dev/null +++ b/tests/knr/issue0185.d.ref @@ -0,0 +1,12 @@ +unittest { + do + ++a; + while (true); +} + +unittest { + do { + ++a; + } + while (true); +} diff --git a/tests/knr/issue0186.d.ref b/tests/knr/issue0186.d.ref new file mode 100644 index 0000000..952a8af --- /dev/null +++ b/tests/knr/issue0186.d.ref @@ -0,0 +1,23 @@ +void functionName() +{ + +} + +void main() +{ + static if (true) { + if (true && { + functionName(); + functionName(); + functionName(); + functionName(); + return true; + }()) { + + } else { + + } + } else { + + } +} diff --git a/tests/knr/issue0187.d.ref b/tests/knr/issue0187.d.ref new file mode 100644 index 0000000..ee3cdbf --- /dev/null +++ b/tests/knr/issue0187.d.ref @@ -0,0 +1,3 @@ +void doStuff(T)() @safe if (isNumeric!T) +{ +} diff --git a/tests/knr/issue0189.d.ref b/tests/knr/issue0189.d.ref new file mode 100644 index 0000000..ff680f2 --- /dev/null +++ b/tests/knr/issue0189.d.ref @@ -0,0 +1,17 @@ +unittest { + Test("Something") in { + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + abcde_abcde_abcde(); + }; +} + +void aFunction(ParamType param) +in { + assert(stuff); +} +body { +} diff --git a/tests/knr/issue0190.d.ref b/tests/knr/issue0190.d.ref new file mode 100644 index 0000000..ed0d398 --- /dev/null +++ b/tests/knr/issue0190.d.ref @@ -0,0 +1,6 @@ +unittest { + asm { + dl 12345; + movdqu [R8], XMM0; + } +} diff --git a/tests/knr/issue0194.d.ref b/tests/knr/issue0194.d.ref new file mode 100644 index 0000000..6311e9a --- /dev/null +++ b/tests/knr/issue0194.d.ref @@ -0,0 +1,10 @@ +module test; + +void main() +{ + test("stringLiteral") in { + foreach (thing; things) { + doStuff(thing); + } + }; +} diff --git a/tests/knr/issue0195.d.ref b/tests/knr/issue0195.d.ref new file mode 100644 index 0000000..bfd97c3 --- /dev/null +++ b/tests/knr/issue0195.d.ref @@ -0,0 +1,15 @@ +void main() +{ + auto myTid = runTask({ + auto conn = connectTCP("localhost", 4222); + + auto l = Lexer(conn); + foreach (t; l) { + + } + conn.close(); + }); + + // foo + runEventLoop(); +} diff --git a/tests/knr/issue0204.d.ref b/tests/knr/issue0204.d.ref new file mode 100644 index 0000000..adab749 --- /dev/null +++ b/tests/knr/issue0204.d.ref @@ -0,0 +1,10 @@ +version (Foo) { + version (D_Version2) { + public import core.memory; + } else: +} + +version (Bar) + int foo(); +else: + int foo(int); diff --git a/tests/knr/issue0205.d.ref b/tests/knr/issue0205.d.ref new file mode 100644 index 0000000..a7f02f6 --- /dev/null +++ b/tests/knr/issue0205.d.ref @@ -0,0 +1,6 @@ +unittest { + asm { + } + d[] = a[]; + c[] = d[]; +} diff --git a/tests/knr/issue0206.d.ref b/tests/knr/issue0206.d.ref new file mode 100644 index 0000000..b0ec36a --- /dev/null +++ b/tests/knr/issue0206.d.ref @@ -0,0 +1,7 @@ +unittest { + import std.stdio : stderr; + + { + a = 10; + } +} diff --git a/tests/knr/issue0207.d.ref b/tests/knr/issue0207.d.ref new file mode 100644 index 0000000..5b779d8 --- /dev/null +++ b/tests/knr/issue0207.d.ref @@ -0,0 +1,10 @@ +enum a { + a, + b, + c, + d, + /* a comment */ + e, + f, + g +} diff --git a/tests/knr/issue0208.d.ref b/tests/knr/issue0208.d.ref new file mode 100644 index 0000000..379e02c --- /dev/null +++ b/tests/knr/issue0208.d.ref @@ -0,0 +1,5 @@ +unittest { + if (a && !is(b == q)) { + + } +} diff --git a/tests/knr/issue0209.d.ref b/tests/knr/issue0209.d.ref new file mode 100644 index 0000000..1bcfcd6 --- /dev/null +++ b/tests/knr/issue0209.d.ref @@ -0,0 +1,18 @@ +unittest { + { + public Vector!(T) opBinary(string op, string file = __FILE__, size_t line = __LINE__)( + const Vector!(T) x) const if (op == "*") + in { + } + body { + } + + } +} + +public Vector!(T) opBinary(string op, string file = __FILE__, size_t line = __LINE__)( + const Vector!(T) x) const if (op == "*") +in { +} +body { +} diff --git a/tests/knr/issue0210.d.ref b/tests/knr/issue0210.d.ref new file mode 100644 index 0000000..afef07a --- /dev/null +++ b/tests/knr/issue0210.d.ref @@ -0,0 +1,2 @@ +static assert(call(x) !is y); +static assert(call(x) is y); diff --git a/tests/knr/issue0212.d.ref b/tests/knr/issue0212.d.ref new file mode 100644 index 0000000..3f2df8e --- /dev/null +++ b/tests/knr/issue0212.d.ref @@ -0,0 +1,3 @@ +enum { + x = 3 +} diff --git a/tests/knr/issue0213.d.ref b/tests/knr/issue0213.d.ref new file mode 100644 index 0000000..b32eda7 --- /dev/null +++ b/tests/knr/issue0213.d.ref @@ -0,0 +1,6 @@ +version (linux) + import core.sys.linux.elf; +else version (FreeBSD) + import core.sys.freebsd.sys.elf; +else version (Solaris) + import core.sys.solaris.elf; diff --git a/tests/knr/issue0215a.d.ref b/tests/knr/issue0215a.d.ref new file mode 100644 index 0000000..96e2d7e --- /dev/null +++ b/tests/knr/issue0215a.d.ref @@ -0,0 +1,17 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0215b.d.ref b/tests/knr/issue0215b.d.ref new file mode 100644 index 0000000..59ff341 --- /dev/null +++ b/tests/knr/issue0215b.d.ref @@ -0,0 +1,17 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0215c.d.ref b/tests/knr/issue0215c.d.ref new file mode 100644 index 0000000..9a00fa1 --- /dev/null +++ b/tests/knr/issue0215c.d.ref @@ -0,0 +1,18 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) +if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0215d.d.ref b/tests/knr/issue0215d.d.ref new file mode 100644 index 0000000..2d52919 --- /dev/null +++ b/tests/knr/issue0215d.d.ref @@ -0,0 +1,18 @@ +module example; + +bool aTemplatedFunction(One)(One alpha) + if (isNumeric!One) +{ +} + +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + + } + } +} diff --git a/tests/knr/issue0216.d.ref b/tests/knr/issue0216.d.ref new file mode 100644 index 0000000..20d86fb --- /dev/null +++ b/tests/knr/issue0216.d.ref @@ -0,0 +1,5 @@ +unittest { + if (something || somethingElse || // I like putting comments here for no good reason + thirdThing) { + } +} diff --git a/tests/knr/issue0219.d.ref b/tests/knr/issue0219.d.ref new file mode 100644 index 0000000..cfab244 --- /dev/null +++ b/tests/knr/issue0219.d.ref @@ -0,0 +1,5 @@ +@OneOf("group1") { + JSONValue[string] fred; + bool mertz; + bool ethel; +} diff --git a/tests/knr/issue0220.d.ref b/tests/knr/issue0220.d.ref new file mode 100644 index 0000000..568c640 --- /dev/null +++ b/tests/knr/issue0220.d.ref @@ -0,0 +1,67 @@ +static if (someCondition) + void doStuff() + { + } +else + void doStuff() + { + } + +static if (someCondition) + void doStuff() + { + } +else static if (otherCondition) + void doStuff() + { + } + +static if (someCondition) + void doStuff() + { + } +else static if (otherCondition) + void doStuff() + { + } +else + void doStuff() + { + } + +static if (condition) + int a; +else + int b; + +static if (condition) + int a; +else static if (otherCondition) + int c; +else + int b; + +void doStuff(); + +static if (stuff) + int a; +else + class C { + public: + void aFunction(); + private: + int a; + int b; + } + +static if (condition) + int a; +else + int b; + +static if (condition) + int a; +else static if (otherCondition) + int c; +else + int b; diff --git a/tests/knr/issue0221.d.ref b/tests/knr/issue0221.d.ref new file mode 100644 index 0000000..a036bb7 --- /dev/null +++ b/tests/knr/issue0221.d.ref @@ -0,0 +1,4 @@ +unittest { + static if (stuff) // comment + things(); +} diff --git a/tests/knr/issue0222.d.ref b/tests/knr/issue0222.d.ref new file mode 100644 index 0000000..09a8058 --- /dev/null +++ b/tests/knr/issue0222.d.ref @@ -0,0 +1,4 @@ +unittest { + return (complicated % expression) / //------------------- + (other * complicated + expression); +} diff --git a/tests/knr/issue0223.d.ref b/tests/knr/issue0223.d.ref new file mode 100644 index 0000000..fc6f351 --- /dev/null +++ b/tests/knr/issue0223.d.ref @@ -0,0 +1,6 @@ +unittest { + if (info > 0) + throw new ExceptionWithLongName(std.string.format( + "During the LU factorization, it was found that the " ~ "%sth diagonal value is exactly zero.", + info), file, line); +} diff --git a/tests/knr/issue0224.d.ref b/tests/knr/issue0224.d.ref new file mode 100644 index 0000000..c0e868a --- /dev/null +++ b/tests/knr/issue0224.d.ref @@ -0,0 +1,5 @@ +unittest { + int a, /// comment + b, /// comment + c; /// comment +} diff --git a/tests/knr/issue0225.d.ref b/tests/knr/issue0225.d.ref new file mode 100644 index 0000000..b9ee234 --- /dev/null +++ b/tests/knr/issue0225.d.ref @@ -0,0 +1,4 @@ +static if (condition) + int declaration; +else { +} diff --git a/tests/knr/issue0226.d.ref b/tests/knr/issue0226.d.ref new file mode 100644 index 0000000..3406742 --- /dev/null +++ b/tests/knr/issue0226.d.ref @@ -0,0 +1,14 @@ +unittest { + auto a = 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + + 1234567890 + 1234567890 + 1234567890; + auto a = 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 + - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 + - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 + - 1234567890 - 1234567890 - 1234567890; + auto a = 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 + * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 + * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 + * 1234567890 * 1234567890 * 1234567890; +} diff --git a/tests/knr/issue0229.d.ref b/tests/knr/issue0229.d.ref new file mode 100644 index 0000000..bf8a8dc --- /dev/null +++ b/tests/knr/issue0229.d.ref @@ -0,0 +1,23 @@ +enum { + SQL_CA2_READ_ONLY_CONCURRENCY = 0x00000001L, + SQL_CA2_LOCK_CONCURRENCY = 0x00000002L, + SQL_CA2_OPT_ROWVER_CONCURRENCY = 0x00000004L, + SQL_CA2_OPT_VALUES_CONCURRENCY = 0x00000008L, + SQL_CA2_SENSITIVITY_ADDITIONS = 0x00000010L, + SQL_CA2_SENSITIVITY_DELETIONS = 0x00000020L, + SQL_CA2_SENSITIVITY_UPDATES = 0x00000040L, + // * semantics of SQL_ATTR_MAX_ROWS * + SQL_CA2_MAX_ROWS_SELECT = 0x00000080L, + SQL_CA2_MAX_ROWS_INSERT = 0x00000100L, + SQL_CA2_MAX_ROWS_DELETE = 0x00000200L, + SQL_CA2_MAX_ROWS_UPDATE = 0x00000400L, + SQL_CA2_MAX_ROWS_CATALOG = 0x00000800L, + SQL_CA2_MAX_ROWS_AFFECTS_ALL = ( + SQL_CA2_MAX_ROWS_SELECT | SQL_CA2_MAX_ROWS_INSERT | SQL_CA2_MAX_ROWS_DELETE + | SQL_CA2_MAX_ROWS_UPDATE | SQL_CA2_MAX_ROWS_CATALOG), + SQL_CA2_CRC_EXACT = 0x00001000L, + SQL_CA2_CRC_APPROXIMATE = 0x00002000L, + SQL_CA2_SIMULATE_NON_UNIQUE = 0x00004000L, + SQL_CA2_SIMULATE_TRY_UNIQUE = 0x00008000L, + SQL_CA2_SIMULATE_UNIQUE = 0x00010000L +} diff --git a/tests/knr/issue0237.d.ref b/tests/knr/issue0237.d.ref new file mode 100644 index 0000000..3d5f77d --- /dev/null +++ b/tests/knr/issue0237.d.ref @@ -0,0 +1,39 @@ +void fn() +{ + { + { + { + auto file = { + "integrationtest/feed/etc/config.iniaasdfaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "etc/config.ini" + }; + { + int x; + } + } + } + } +} + +struct A { + int x, y, z; +} + +int main() +{ + int fun() + { + import std.stdio : writeln; + import std.typecons : tuple; + + A a = { + tuple(Variant(1))[0].get!int, tuple(Variant(2))[0].get!int, + tuple(Variant(3))[0].get!int + }; + A b = { + tuple(Variant(1))[0].get!int, tuple(Variant(2))[0].get!int, + tuple(Variant(3))[0].get!int + }; + writeln(a); + } +} diff --git a/tests/knr/issue0241.d.ref b/tests/knr/issue0241.d.ref new file mode 100644 index 0000000..d7576cb --- /dev/null +++ b/tests/knr/issue0241.d.ref @@ -0,0 +1,3 @@ +void round() +body { +} diff --git a/tests/knr/issue0244.d.ref b/tests/knr/issue0244.d.ref new file mode 100644 index 0000000..cbb172d --- /dev/null +++ b/tests/knr/issue0244.d.ref @@ -0,0 +1,4 @@ +enum Status : bool { + abort = true, + ignore = false +} diff --git a/tests/knr/issue0246.d.ref b/tests/knr/issue0246.d.ref new file mode 100644 index 0000000..3637e2f --- /dev/null +++ b/tests/knr/issue0246.d.ref @@ -0,0 +1,17 @@ +unittest { + with (Object) { + // do something + } + with (Object) with (Object) { + // do something + } + with (Object) with (Object) with (Object) { + // do something + } + + with (Object) { + with (Object) { + // do something + } + } +} diff --git a/tests/knr/issue0248.d.ref b/tests/knr/issue0248.d.ref new file mode 100644 index 0000000..457d138 --- /dev/null +++ b/tests/knr/issue0248.d.ref @@ -0,0 +1,11 @@ +T[] arrayOp(T, Args...)(T res, Filter!(isType, Args) args) @trusted @nogc pure @things + if (Args[$ - 1] != "=") +{ + +} + +T[] arrayOp(T, Args...)(T res, Filter!(isType, Args) args) @trusted @nogc pure nothrow + if (Args[$ - 1] != "=") +{ + +} diff --git a/tests/knr/issue0251.d.ref b/tests/knr/issue0251.d.ref new file mode 100644 index 0000000..92cca93 --- /dev/null +++ b/tests/knr/issue0251.d.ref @@ -0,0 +1,8 @@ +void stuff() +{ + asm { + int 80; + int 0b10; + int 0x80; + } +} diff --git a/tests/knr/issue0256.d.ref b/tests/knr/issue0256.d.ref new file mode 100644 index 0000000..5776aec --- /dev/null +++ b/tests/knr/issue0256.d.ref @@ -0,0 +1,11 @@ +void main() +{ + S s1 = {a: 3}; + S s2 = {a: 3, b: "test string"}; + S s3 = {a: 3, b: "test string", c: {x: 3.14, y: 3 + 4}}; + T t = { + someStructMember1: 2, someStructMember2: 42, someStructMember3: null, // foobar + someOtherMember1: objA, someOtherMember2: objB, someOtherMember3: 0, + somethingMore: null, someFlagInThisStruct: -1 + }; +} diff --git a/tests/knr/issue0267.d.ref b/tests/knr/issue0267.d.ref new file mode 100644 index 0000000..24784cf --- /dev/null +++ b/tests/knr/issue0267.d.ref @@ -0,0 +1,19 @@ +void main() +{ + debug foo(); + else bar(); + + debug (0) + foo(); + else + bar(); + + // inlineElse reset check + + debug foo(); + + if (true) + foo(); + else + bar(); +} diff --git a/tests/knr/issue0273.d.ref b/tests/knr/issue0273.d.ref new file mode 100644 index 0000000..23afad9 --- /dev/null +++ b/tests/knr/issue0273.d.ref @@ -0,0 +1,4 @@ +void main() +{ + writeln("Expected " ~ descStr(type, data) ~ " but got " ~ this.descStr); +} diff --git a/tests/knr/issue0286.d.ref b/tests/knr/issue0286.d.ref new file mode 100644 index 0000000..b5b6ec2 --- /dev/null +++ b/tests/knr/issue0286.d.ref @@ -0,0 +1,14 @@ +void foo() +{ + if (true) + enum vectorizeable = aLongExpressionThatCausesWrapping() + && aLongExpressionThatCausesWrapping(); + else + enum vectorizeable = false; + + if (true) { + enum vectorizeable = aLongExpressionThatCausesWrapping() + && aLongExpressionThatCausesWrapping(); + } else + enum vectorizeable = false; +} diff --git a/tests/knr/issue0287.d.ref b/tests/knr/issue0287.d.ref new file mode 100644 index 0000000..9966542 --- /dev/null +++ b/tests/knr/issue0287.d.ref @@ -0,0 +1,3 @@ +alias foo = typeof({ import std.math; }); +alias bar = typeof({ write("aaa"); }); +alias baz = typeof({}); diff --git a/tests/knr/issue0303.d.ref b/tests/knr/issue0303.d.ref new file mode 100644 index 0000000..4f11f69 --- /dev/null +++ b/tests/knr/issue0303.d.ref @@ -0,0 +1,10 @@ +static foreach (thing; things) { + pragma(msg, thing); +} +static foreach_reverse (thing; things) { + pragma(msg, thing); +} +static foreach (thing; things) + pragma(msg, thing); +static foreach_reverse (thing; things) + pragma(msg, thing); diff --git a/tests/knr/issue0313.d.ref b/tests/knr/issue0313.d.ref new file mode 100644 index 0000000..bd3a545 --- /dev/null +++ b/tests/knr/issue0313.d.ref @@ -0,0 +1,13 @@ +void main() +{ + foreach (v; a) + try { + foo(); + } catch (Exception e) { + bar(); + } catch (Exception e) { + bar(); + } finally { + } + stuff(); +} diff --git a/tests/knr/issue0314.d.ref b/tests/knr/issue0314.d.ref new file mode 100644 index 0000000..c7e3541 --- /dev/null +++ b/tests/knr/issue0314.d.ref @@ -0,0 +1,10 @@ +void main() +{ + auto d = { + if (a) + foreach (b; c) { + } + else + e(); + }; +} diff --git a/tests/knr/issue0321.d.ref b/tests/knr/issue0321.d.ref new file mode 100644 index 0000000..7f891fd --- /dev/null +++ b/tests/knr/issue0321.d.ref @@ -0,0 +1,7 @@ +void test() +{ + #line 100 + int a; + #line 200 "anotherfile" + int b; +} diff --git a/tests/knr/issue0326.d.ref b/tests/knr/issue0326.d.ref new file mode 100644 index 0000000..0a51d21 --- /dev/null +++ b/tests/knr/issue0326.d.ref @@ -0,0 +1,4 @@ +void main() +{ + () @trusted { stderr.writeln("\033[01;33m", url, "\033[0m"); }(); +} diff --git a/tests/knr/issue0345.d.ref b/tests/knr/issue0345.d.ref new file mode 100644 index 0000000..5253831 --- /dev/null +++ b/tests/knr/issue0345.d.ref @@ -0,0 +1,3 @@ +class Bar(A) : Foo +if (isFloating!A) { +} diff --git a/tests/knr/issue0349.d.ref b/tests/knr/issue0349.d.ref new file mode 100644 index 0000000..c64f3e8 --- /dev/null +++ b/tests/knr/issue0349.d.ref @@ -0,0 +1,6 @@ +import super_long_import_module_name : withSuperLongSymbolNames, andAlsoLotsOfThem; +import super_long_import_module_name : withSuperLongSymbolNames, + andAlsoLotsOfThem, lotsAnsLots, andLots, andLotsOfThem, lineExceeds120; + +private: +void foo(); diff --git a/tests/knr/issue0361.d.ref b/tests/knr/issue0361.d.ref new file mode 100644 index 0000000..7e2b562 --- /dev/null +++ b/tests/knr/issue0361.d.ref @@ -0,0 +1,11 @@ +void foo() /**/ +in { +} +body { +} + +void bar() /**/ +out { +} +body { +} diff --git a/tests/knr/issue0372.d.ref b/tests/knr/issue0372.d.ref new file mode 100644 index 0000000..e47a83c --- /dev/null +++ b/tests/knr/issue0372.d.ref @@ -0,0 +1,22 @@ +void main(string[] args) +{ + // Test with catch + if (args.length > 1) + try + doSomeStuff(); + catch (Exception error) + ohNoSomeErrorHappened(); + else + thatsNotHowYouUseThisProgram(); + + // Test with finally + if (args.length > 2) + try + doOtherStuff(); + catch (Exception error) + ohNoSomeErrorHappened(); + finally + doSomeCleanup(); + else + dontDoOtherStuff(); +} diff --git a/tests/knr/issue0384.d.ref b/tests/knr/issue0384.d.ref new file mode 100644 index 0000000..cccd08b --- /dev/null +++ b/tests/knr/issue0384.d.ref @@ -0,0 +1,30 @@ +import std.stdio : readln, /* comment1 */ writeln; +import std.stdio : readln, // comment2 + writeln; +import std.stdio : readln, + // comment3 + writeln; +import std.stdio : readln, + /* comment4 */ + writeln; +import std.stdio : readln, readln, readln, readln, readln, readln, readln, + readln, readln, readln, readln, + // comment5 + writeln; +import std.stdio : // comment6 + readln, readln, readln, readln, readln, readln, // comment7 + // comment8 + writeln; +import std.stdio : /* comment9 */ + readln, readln, readln, readln, readln, readln, /* comment10 */ + // comment11 + writeln; +import std.stdio : readln, // comment12 + readln, readln, readln, readln, readln, readln, // comment13 + // comment14 + writeln; +import std.stdio : readln, + // comment15 + readln, readln, readln, readln, readln, readln, // comment16 + // comment17 + writeln; diff --git a/tests/knr/issue0426.d.ref b/tests/knr/issue0426.d.ref new file mode 100644 index 0000000..72d3d26 --- /dev/null +++ b/tests/knr/issue0426.d.ref @@ -0,0 +1,6 @@ +import std.stdio; + +@safe extern (C) void main() +{ + writeln("Hello World!"); +} diff --git a/tests/knr/issue0430.d.ref b/tests/knr/issue0430.d.ref new file mode 100644 index 0000000..1dd228b --- /dev/null +++ b/tests/knr/issue0430.d.ref @@ -0,0 +1,5 @@ +void f(bool body) +{ + if (body) { + } +} diff --git a/tests/knr/issue0433.d.ref b/tests/knr/issue0433.d.ref new file mode 100644 index 0000000..bde6071 --- /dev/null +++ b/tests/knr/issue0433.d.ref @@ -0,0 +1,7 @@ +int abs(int x) +{ + if (x < 0) // x negative, must negate + return -x; + else // x already non-negative, just return it + return x; +} diff --git a/tests/knr/issue0436.d.ref b/tests/knr/issue0436.d.ref new file mode 100644 index 0000000..fac85b5 --- /dev/null +++ b/tests/knr/issue0436.d.ref @@ -0,0 +1 @@ +extern (Objective-C) int a; diff --git a/tests/knr/issue0448.d.ref b/tests/knr/issue0448.d.ref new file mode 100644 index 0000000..d3392c2 --- /dev/null +++ b/tests/knr/issue0448.d.ref @@ -0,0 +1,3 @@ +struct S { + invariant (true); +} diff --git a/tests/knr/issue0452.d.ref b/tests/knr/issue0452.d.ref new file mode 100644 index 0000000..e4aed14 --- /dev/null +++ b/tests/knr/issue0452.d.ref @@ -0,0 +1,2 @@ +@nogc // +void foo(); diff --git a/tests/knr/issue0454.d.ref b/tests/knr/issue0454.d.ref new file mode 100644 index 0000000..27b0ef1 --- /dev/null +++ b/tests/knr/issue0454.d.ref @@ -0,0 +1,10 @@ +void main() +{ + format!"%s" // + (""); + format!("%s") // + (""); + format!("%s") // + ("", argument1, argument2, argument3, argument4, argument5, + argument6, argument7, argument8, argument9, argument10); +} diff --git a/tests/knr/issue0465.d.ref b/tests/knr/issue0465.d.ref new file mode 100644 index 0000000..b28f284 --- /dev/null +++ b/tests/knr/issue0465.d.ref @@ -0,0 +1,8 @@ +bool asdf(const string owner, const string mail) @safe +{ + requestHTTP(url, (scope HTTPClientRequest request) { + request.writeFormBody([owner: owner, mail: mail]); + }, (scope HTTPClientResponse response) {}); + + return true; +} diff --git a/tests/knr/issue0476.d.ref b/tests/knr/issue0476.d.ref new file mode 100644 index 0000000..c95e2de --- /dev/null +++ b/tests/knr/issue0476.d.ref @@ -0,0 +1,7 @@ +string BuildForwardCall() +{ + return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `))) + { + return (mocked___.` ~ methodString ~ argsPassed ~ `); + }`; +} diff --git a/tests/knr/issue0483.d.ref b/tests/knr/issue0483.d.ref new file mode 100644 index 0000000..7e3f860 --- /dev/null +++ b/tests/knr/issue0483.d.ref @@ -0,0 +1,14 @@ +module tests.issue0483; + +void main() +{ + switch (0) { + case 1: + case 2: + label: + case 3: + break; + default: + break; + } +} diff --git a/tests/knr/issue0485.d.ref b/tests/knr/issue0485.d.ref new file mode 100644 index 0000000..037932e --- /dev/null +++ b/tests/knr/issue0485.d.ref @@ -0,0 +1,5 @@ +void main() +{ + int a; + int[int] hashmap = [a : a, a : a, a : a]; +} diff --git a/tests/knr/issue0486.d.ref b/tests/knr/issue0486.d.ref new file mode 100644 index 0000000..de7a540 --- /dev/null +++ b/tests/knr/issue0486.d.ref @@ -0,0 +1,5 @@ +void main() +{ + auto someAutoVariableName = this.firstLink.secondLink + .filter!(shouldBeProbablySomeIdentifierOrNot); +} diff --git a/tests/knr/issue0497.d.ref b/tests/knr/issue0497.d.ref new file mode 100644 index 0000000..eec042e --- /dev/null +++ b/tests/knr/issue0497.d.ref @@ -0,0 +1,5 @@ +alias f1 = S function(); +alias f2 = S!"foo" function(); +alias f3 = S!5 function(); +alias f4 = S!S function(); +alias f5 = S!(S) function(); diff --git a/tests/knr/issue0501.d.ref b/tests/knr/issue0501.d.ref new file mode 100644 index 0000000..8f1cf11 --- /dev/null +++ b/tests/knr/issue0501.d.ref @@ -0,0 +1,4 @@ +void main() +{ + auto aa = ["aaa": 1, "bbb": 2]; +} diff --git a/tests/knr/issue0504.d.ref b/tests/knr/issue0504.d.ref new file mode 100644 index 0000000..7fb4598 --- /dev/null +++ b/tests/knr/issue0504.d.ref @@ -0,0 +1,40 @@ +deprecated("foo") +void test() +{ +} + +package(foo) +void bar() +{ +} + +@uda() +void baz() +{ +} + +deprecated +deprecated_() +{ +} + +@uda +void uda_() +{ +} + +@property +void property() +{ +} + +deprecated("Reason") @uda +void propertyuda() +{ +} + +deprecated("Reason") +@uda +void udaproperty() +{ +} diff --git a/tests/knr/issue0508.d.ref b/tests/knr/issue0508.d.ref new file mode 100644 index 0000000..acd5850 --- /dev/null +++ b/tests/knr/issue0508.d.ref @@ -0,0 +1,5 @@ +struct S { + @safe invariant { + assert(true); + } +} diff --git a/tests/knr/issue0509.d.ref b/tests/knr/issue0509.d.ref new file mode 100644 index 0000000..52b1c7c --- /dev/null +++ b/tests/knr/issue0509.d.ref @@ -0,0 +1,34 @@ +void main() +{ + string a = "foo" + ~ "bar" // bar + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf // blah + .flub; +} + +void main() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +void foo() +{ + afdsafds + .asdf /* blah */ + .flub; +} + +void foo() // hello +{ // world + // ok + writeln("hi"); // hi! +} // done +//finish diff --git a/tests/knr/issue0515.d.ref b/tests/knr/issue0515.d.ref new file mode 100644 index 0000000..21d91a4 --- /dev/null +++ b/tests/knr/issue0515.d.ref @@ -0,0 +1,6 @@ +struct S { + ref S foo() return + { + return this; + } +} diff --git a/tests/knr/issue0521.d.ref b/tests/knr/issue0521.d.ref new file mode 100644 index 0000000..1bf0602 --- /dev/null +++ b/tests/knr/issue0521.d.ref @@ -0,0 +1,16 @@ +public int f() return +in (true) +{ + return 0; +} + +public int g() return +out (; true) +{ + return 0; +} + +public int h() return +body { + return 0; +} diff --git a/tests/knr/keep_line_breaks.d.ref b/tests/knr/keep_line_breaks.d.ref new file mode 100644 index 0000000..977d797 --- /dev/null +++ b/tests/knr/keep_line_breaks.d.ref @@ -0,0 +1,35 @@ +@safe nothrow +@Read +@NonNull +public +int[] func(int argument_1_1, int argument_1_2, + int argument_2_1, int argument_2_2, + int argument_3_1, int argument_3_2) +{ + if (true && true + && true && true + && true && true) { + } else if (true && true && + true && true && + true && true) { + } + + func(argument_1_1).func(argument_1_2) + .func(argument_2_1) + .func(argument_2_2); + + auto x = func(argument_1_1, argument_1_2, + this.argument_2_1, this.argument_2_2, + argument_3_1, argument_3_2); + + ` + + + `.format!"%s"; + + return [ + 3, 5, + 5, 7, + 11, 13, + ]; +} diff --git a/tests/knr/lambda_param_attrib.d.ref b/tests/knr/lambda_param_attrib.d.ref new file mode 100644 index 0000000..a1feb0b --- /dev/null +++ b/tests/knr/lambda_param_attrib.d.ref @@ -0,0 +1 @@ +alias fun = (@(0) @(1) int p) => ((@Foo p) { return 0; })(p); diff --git a/tests/knr/longParamList.d.ref b/tests/knr/longParamList.d.ref new file mode 100644 index 0000000..76a508a --- /dev/null +++ b/tests/knr/longParamList.d.ref @@ -0,0 +1,17 @@ +version (AArch64) { + class SomeLongClassName { + public: + + double javaStyleFunctionName(double alpha, double bravo, double charlie, + double delta, double echo, double foxtrot, double golf, double hotel) + { + if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie && echo < delta) { + if (alpha < beta && alpha > golf && hotel < alpha && bravo >= charlie && echo < delta) { + if (alpha < beta && alpha > golf && hotel < alpha + && bravo >= charlie && echo < delta) { + } + } + } + } + } +} diff --git a/tests/knr/minimizeLength.d.ref b/tests/knr/minimizeLength.d.ref new file mode 100644 index 0000000..efd8252 --- /dev/null +++ b/tests/knr/minimizeLength.d.ref @@ -0,0 +1,19 @@ +unittest { + validMoves!(typeof(open))(open, tokens[0 .. tokensEnd], depths[0 .. tokensEnd], + current.breaks, config, currentLineLength, indentLevel); +} + +/+ +// good +unittest +{ + validMoves!(typeof(open))(open, tokens[0 .. tokensEnd], depths[0 .. tokensEnd], + current.breaks, config, currentLineLength, indentLevel); +} +// bad +unittest +{ + validMoves!(typeof(open))(open, tokens[0 .. tokensEnd], + depths[0 .. tokensEnd], current.breaks, config, currentLineLength, indentLevel); +} ++/ diff --git a/tests/knr/multiline_string.d.ref b/tests/knr/multiline_string.d.ref new file mode 100644 index 0000000..1aba27c --- /dev/null +++ b/tests/knr/multiline_string.d.ref @@ -0,0 +1,11 @@ +unittest { + someFunctionCall(` + multi-line string + multi-line string + multi-line string + multi-line string + multi-line string + multi-line string + multi-line string + `, paramater); +} diff --git a/tests/knr/parenIndent.d.ref b/tests/knr/parenIndent.d.ref new file mode 100644 index 0000000..053585f --- /dev/null +++ b/tests/knr/parenIndent.d.ref @@ -0,0 +1,31 @@ +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) { + a(); + } + } + + if (parenDepth == 0 && (peekIs(tok!"is") || peekIs(tok!"in") + || peekIs(tok!"out") || peekIs(tok!"body"))) + writeToken(); + + { + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" + && indents.top != tok!"version") || !peekIs(tok!"else"))) { + indents.pop(); + } + } + } + + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) { + indents.pop(); + } + } +} diff --git a/tests/knr/propertySpacing.d.ref b/tests/knr/propertySpacing.d.ref new file mode 100644 index 0000000..0dc8bcb --- /dev/null +++ b/tests/knr/propertySpacing.d.ref @@ -0,0 +1 @@ +@property double y(); diff --git a/tests/knr/swap.d.ref b/tests/knr/swap.d.ref new file mode 100644 index 0000000..660e05a --- /dev/null +++ b/tests/knr/swap.d.ref @@ -0,0 +1,26 @@ +import std.algorithm : swap; // from Phobos standard library + +// The D solution uses templates and it's similar to the C++ one: +void mySwap(T)(ref T left, ref T right) +{ + auto temp = left; + left = right; + right = temp; +} + +void main() +{ + import std.stdio; + + int[] a = [10, 20]; + writeln(a); + + // The std.algorithm standard library module + // contains a generic swap: + swap(a[0], a[1]); + writeln(a); + + // Using mySwap: + mySwap(a[0], a[1]); + writeln(a); +} diff --git a/tests/knr/ufcschain.d.ref b/tests/knr/ufcschain.d.ref new file mode 100644 index 0000000..c36b1ae --- /dev/null +++ b/tests/knr/ufcschain.d.ref @@ -0,0 +1,6 @@ +void main() +{ + stuff[].map!(things => stuff.doThings) + .filter!(stuff) + .array(); +} diff --git a/tests/knr/wrapping1.d.ref b/tests/knr/wrapping1.d.ref new file mode 100644 index 0000000..b757ff8 --- /dev/null +++ b/tests/knr/wrapping1.d.ref @@ -0,0 +1,7 @@ +void main(string[] args) +{ + if (prevLocation != size_t.max) { + addErrorMessage(line, column, KEY, "Expression %s is true: already checked on line %d.".format( + expressions[prevLocation].formatted, expressions[prevLocation].line)); + } +} diff --git a/tests/test.sh b/tests/test.sh index b465658..da44e97 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -for braceStyle in allman otbs +for braceStyle in allman otbs knr do for source in *.d do From ea36fbf58b3fd06c96a496ed45d8b06fa99ed090 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Mon, 17 May 2021 06:36:58 +0200 Subject: [PATCH 83/92] Add single_indent option --- README.md | 1 + src/dfmt/config.d | 3 ++ src/dfmt/formatter.d | 1 + src/dfmt/indentation.d | 26 ++++++++++++-- src/dfmt/main.d | 7 +++- tests/allman/keep_single_indent.d.ref | 49 +++++++++++++++++++++++++++ tests/allman/single_indent.d.ref | 41 ++++++++++++++++++++++ tests/keep_single_indent.args | 2 ++ tests/keep_single_indent.d | 49 +++++++++++++++++++++++++++ tests/otbs/keep_single_indent.d.ref | 42 +++++++++++++++++++++++ tests/otbs/single_indent.d.ref | 35 +++++++++++++++++++ tests/single_indent.args | 1 + tests/single_indent.d | 42 +++++++++++++++++++++++ 13 files changed, 296 insertions(+), 3 deletions(-) create mode 100644 tests/allman/keep_single_indent.d.ref create mode 100644 tests/allman/single_indent.d.ref create mode 100644 tests/keep_single_indent.args create mode 100644 tests/keep_single_indent.d create mode 100644 tests/otbs/keep_single_indent.d.ref create mode 100644 tests/otbs/single_indent.d.ref create mode 100644 tests/single_indent.args create mode 100644 tests/single_indent.d diff --git a/README.md b/README.md index 7ec9818..822d70e 100644 --- a/README.md +++ b/README.md @@ -116,6 +116,7 @@ dfmt_template_constraint_style | **`conditional_newline_indent`** `conditional_n dfmt_single_template_constraint_indent | `true`, **`false`** | Set if the constraints are indented by a single tab instead of two. Has only an effect if the style set to `always_newline_indent` or `conditional_newline_indent`. dfmt_space_before_aa_colon | `true`, **`false`** | Adds a space after an associative array key before the `:` like in older dfmt versions. dfmt_keep_line_breaks | `true`, **`false`** | Keep existing line breaks if these don't violate other formatting rules. +dfmt_single_indent | `true`, **`false`** | Set if the code in parens is indented by a single tab instead of two. ## Terminology * Braces - `{` and `}` diff --git a/src/dfmt/config.d b/src/dfmt/config.d index 86706d1..8cb1ac3 100644 --- a/src/dfmt/config.d +++ b/src/dfmt/config.d @@ -59,6 +59,8 @@ struct Config OptionalBoolean dfmt_space_before_aa_colon; /// OptionalBoolean dfmt_keep_line_breaks; + /// + OptionalBoolean dfmt_single_indent; mixin StandardEditorConfigFields; @@ -88,6 +90,7 @@ struct Config dfmt_single_template_constraint_indent = OptionalBoolean.f; dfmt_space_before_aa_colon = OptionalBoolean.f; dfmt_keep_line_breaks = OptionalBoolean.f; + dfmt_single_indent = OptionalBoolean.f; } /** diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index f8883da..1aca12d 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -110,6 +110,7 @@ struct TokenFormatter(OutputRange) this.output = output; this.astInformation = astInformation; this.config = config; + this.indents = IndentStack(config); { auto eol = config.end_of_line; diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d index c80c86c..7b5da72 100644 --- a/src/dfmt/indentation.d +++ b/src/dfmt/indentation.d @@ -5,6 +5,8 @@ module dfmt.indentation; +import dfmt.config; +import dfmt.editorconfig; import dparse.lexer; import std.bitmanip : bitfields; @@ -31,6 +33,14 @@ bool isTempIndent(IdType type) pure nothrow @nogc @safe */ struct IndentStack { + /// Configuration + private const Config* config; + + this(const Config* config) + { + this.config = config; + } + static struct Details { mixin(bitfields!( @@ -221,7 +231,7 @@ struct IndentStack /** * Dumps the current state of the indentation stack to `stderr`. Used for debugging. */ - void dump(size_t pos = size_t.max, string file = __FILE__, uint line = __LINE__) + void dump(size_t pos = size_t.max, string file = __FILE__, uint line = __LINE__) const { import dparse.lexer : str; import std.algorithm.iteration : map; @@ -260,6 +270,12 @@ private: if (i + 1 < index) { + if (config.dfmt_single_indent == OptionalBoolean.t && skipDoubleIndent(i, parenCount)) + { + parenCount = pc; + continue; + } + immutable currentIsNonWrapTemp = !details[i].wrap && details[i].temp && arr[i] != tok!")" && arr[i] != tok!"!"; if (arr[i] == tok!"static" @@ -276,7 +292,7 @@ private: continue; } } - else if (parenCount == 0 && arr[i] == tok!"(") + else if (parenCount == 0 && arr[i] == tok!"(" && config.dfmt_single_indent == OptionalBoolean.f) size++; if (arr[i] == tok!"!") @@ -287,6 +303,12 @@ private: } return size; } + + bool skipDoubleIndent(size_t i, int parenCount) const pure nothrow @safe @nogc + { + return (details[i + 1].wrap && arr[i] == tok!")") + || (parenCount == 0 && arr[i + 1] == tok!"," && arr[i] == tok!"("); + } } unittest diff --git a/src/dfmt/main.d b/src/dfmt/main.d index e4ee702..2bd03bb 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -95,6 +95,9 @@ else case "keep_line_breaks": optConfig.dfmt_keep_line_breaks = optVal; break; + case "single_indent": + optConfig.dfmt_single_indent = optVal; + break; default: assert(false, "Invalid command-line switch"); } @@ -125,7 +128,8 @@ else "space_before_aa_colon", &handleBooleans, "tab_width", &optConfig.tab_width, "template_constraint_style", &optConfig.dfmt_template_constraint_style, - "keep_line_breaks", &handleBooleans); + "keep_line_breaks", &handleBooleans, + "single_indent", &handleBooleans); // dfmt on } catch (GetOptException e) @@ -329,6 +333,7 @@ Formatting Options: --compact_labeled_statements --template_constraint_style --space_before_aa_colon + --single_indent `, optionsToString!(typeof(Config.dfmt_template_constraint_style))); } diff --git a/tests/allman/keep_single_indent.d.ref b/tests/allman/keep_single_indent.d.ref new file mode 100644 index 0000000..f164801 --- /dev/null +++ b/tests/allman/keep_single_indent.d.ref @@ -0,0 +1,49 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +void f() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/allman/single_indent.d.ref b/tests/allman/single_indent.d.ref new file mode 100644 index 0000000..b4b497a --- /dev/null +++ b/tests/allman/single_indent.d.ref @@ -0,0 +1,41 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/keep_single_indent.args b/tests/keep_single_indent.args new file mode 100644 index 0000000..74b1ea5 --- /dev/null +++ b/tests/keep_single_indent.args @@ -0,0 +1,2 @@ +--single_indent true +--keep_line_breaks true diff --git a/tests/keep_single_indent.d b/tests/keep_single_indent.d new file mode 100644 index 0000000..c1c2d16 --- /dev/null +++ b/tests/keep_single_indent.d @@ -0,0 +1,49 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +void f() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/otbs/keep_single_indent.d.ref b/tests/otbs/keep_single_indent.d.ref new file mode 100644 index 0000000..933dcde --- /dev/null +++ b/tests/otbs/keep_single_indent.d.ref @@ -0,0 +1,42 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +void f() { + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/otbs/single_indent.d.ref b/tests/otbs/single_indent.d.ref new file mode 100644 index 0000000..b84d23e --- /dev/null +++ b/tests/otbs/single_indent.d.ref @@ -0,0 +1,35 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/single_indent.args b/tests/single_indent.args new file mode 100644 index 0000000..246c076 --- /dev/null +++ b/tests/single_indent.args @@ -0,0 +1 @@ +--single_indent true diff --git a/tests/single_indent.d b/tests/single_indent.d new file mode 100644 index 0000000..ffb2d50 --- /dev/null +++ b/tests/single_indent.d @@ -0,0 +1,42 @@ +unittest +{ + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) + { + } + } + } +} + +unittest +{ + if (a) + { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest +{ + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} From 821b9be9e9b97ce1a5abb9b446fc5dae8e537879 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Thu, 10 Jun 2021 20:23:07 +0200 Subject: [PATCH 84/92] Fix double array indentation inside parens --- src/dfmt/formatter.d | 4 ++ tests/allman/array_access.d.ref | 6 +-- tests/allman/associative_array.d.ref | 36 +++++++++--------- tests/allman/associative_array_complex.d.ref | 40 ++++++++++---------- tests/otbs/array_access.d.ref | 6 +-- tests/otbs/associative_array.d.ref | 36 +++++++++--------- tests/otbs/associative_array_complex.d.ref | 40 ++++++++++---------- 7 files changed, 86 insertions(+), 82 deletions(-) diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index f8883da..0a355db 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -629,6 +629,10 @@ private: } else if (arrayInitializerStart && isMultilineAt(index - 1)) { + if (peekBack2Is(tok!"(")) { + indents.pop(); + } + // Use the close bracket as the indent token to distinguish // the array initialiazer from an array index in the newline // handling code diff --git a/tests/allman/array_access.d.ref b/tests/allman/array_access.d.ref index 7c7a6cc..b09ebfe 100644 --- a/tests/allman/array_access.d.ref +++ b/tests/allman/array_access.d.ref @@ -1,7 +1,7 @@ unittest { foo([ - target.value.region[1], target.value.region[1], - target.value.region[1], target.value.region[1], target.value.region[1] - ]); + target.value.region[1], target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1] + ]); } diff --git a/tests/allman/associative_array.d.ref b/tests/allman/associative_array.d.ref index d1db193..b0e671b 100644 --- a/tests/allman/associative_array.d.ref +++ b/tests/allman/associative_array.d.ref @@ -1,24 +1,24 @@ unittest { Bson base = Bson([ - "maps": Bson([ - Bson(["id": Bson(4), "comment": Bson("hello")]), - Bson(["id": Bson(49), "comment": Bson(null)]) - ]), - "short": Bson(["a": "b", "c": "d"]), - "numbers": Bson([ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 - ]), - "shuffleOnReset": serializeToBson([ - "all": false, - "selected": true, - "maybe": false - ]), - "resetOnEmpty": Bson(false), - "applyMods": Bson(true), - "sendComments": Bson(true) - ]); + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); int[] x = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 diff --git a/tests/allman/associative_array_complex.d.ref b/tests/allman/associative_array_complex.d.ref index c7b803b..f637ca3 100644 --- a/tests/allman/associative_array_complex.d.ref +++ b/tests/allman/associative_array_complex.d.ref @@ -1,25 +1,25 @@ auto find() { return Map.findRange([ - "$and": [ - ["deleted": Bson(false)], - [ - "$or": Bson([ - serializeToBson(["forceUpdate": Bson(true)]), - serializeToBson([ - "info.approved": ["$eq": Bson(1)], - "fetchDate": [ - "$lte": Bson(BsonDate(currentTime - 60.days)) - ] - ]), - serializeToBson([ - "info.approved": ["$ne": Bson(1)], - "fetchDate": [ - "$lte": Bson(BsonDate(currentTime - 14.days)) - ] - ]) - ]) - ] + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) ] - ]); + ] + ]); } diff --git a/tests/otbs/array_access.d.ref b/tests/otbs/array_access.d.ref index 7a2ac55..cf66c3d 100644 --- a/tests/otbs/array_access.d.ref +++ b/tests/otbs/array_access.d.ref @@ -1,6 +1,6 @@ unittest { foo([ - target.value.region[1], target.value.region[1], - target.value.region[1], target.value.region[1], target.value.region[1] - ]); + target.value.region[1], target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1] + ]); } diff --git a/tests/otbs/associative_array.d.ref b/tests/otbs/associative_array.d.ref index 39f18c6..48442a3 100644 --- a/tests/otbs/associative_array.d.ref +++ b/tests/otbs/associative_array.d.ref @@ -1,23 +1,23 @@ unittest { Bson base = Bson([ - "maps": Bson([ - Bson(["id": Bson(4), "comment": Bson("hello")]), - Bson(["id": Bson(49), "comment": Bson(null)]) - ]), - "short": Bson(["a": "b", "c": "d"]), - "numbers": Bson([ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 - ]), - "shuffleOnReset": serializeToBson([ - "all": false, - "selected": true, - "maybe": false - ]), - "resetOnEmpty": Bson(false), - "applyMods": Bson(true), - "sendComments": Bson(true) - ]); + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); int[] x = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 diff --git a/tests/otbs/associative_array_complex.d.ref b/tests/otbs/associative_array_complex.d.ref index ddcbcd7..c3c9d00 100644 --- a/tests/otbs/associative_array_complex.d.ref +++ b/tests/otbs/associative_array_complex.d.ref @@ -1,24 +1,24 @@ auto find() { return Map.findRange([ - "$and": [ - ["deleted": Bson(false)], - [ - "$or": Bson([ - serializeToBson(["forceUpdate": Bson(true)]), - serializeToBson([ - "info.approved": ["$eq": Bson(1)], - "fetchDate": [ - "$lte": Bson(BsonDate(currentTime - 60.days)) - ] - ]), - serializeToBson([ - "info.approved": ["$ne": Bson(1)], - "fetchDate": [ - "$lte": Bson(BsonDate(currentTime - 14.days)) - ] - ]) - ]) - ] + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) ] - ]); + ] + ]); } From 995c21ab87e3bfe1b56ce80a36bc499a7485b83e Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Sun, 13 Jun 2021 06:42:08 +0200 Subject: [PATCH 85/92] Format do like body after function attributes --- src/dfmt/formatter.d | 8 ++++---- tests/allman/issue0528.d.ref | 4 ++++ tests/issue0528.d | 4 ++++ tests/otbs/issue0528.d.ref | 3 +++ 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 tests/allman/issue0528.d.ref create mode 100644 tests/issue0528.d create mode 100644 tests/otbs/issue0528.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 0a355db..1165fcb 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -274,6 +274,10 @@ private: else formatBlockHeader(); } + else if ((current.text == "body" || current == tok!"do") && peekBackIsFunctionDeclarationEnding()) + { + formatKeyword(); + } else if (currentIs(tok!"do")) { formatBlockHeader(); @@ -321,10 +325,6 @@ private: inlineElse = true; formatKeyword(); } - else if (current.text == "body" && peekBackIsFunctionDeclarationEnding()) - { - formatKeyword(); - } else if (isBasicType(current.type)) { writeToken(); diff --git a/tests/allman/issue0528.d.ref b/tests/allman/issue0528.d.ref new file mode 100644 index 0000000..3592591 --- /dev/null +++ b/tests/allman/issue0528.d.ref @@ -0,0 +1,4 @@ +void f() return +do +{ +} diff --git a/tests/issue0528.d b/tests/issue0528.d new file mode 100644 index 0000000..3592591 --- /dev/null +++ b/tests/issue0528.d @@ -0,0 +1,4 @@ +void f() return +do +{ +} diff --git a/tests/otbs/issue0528.d.ref b/tests/otbs/issue0528.d.ref new file mode 100644 index 0000000..304b696 --- /dev/null +++ b/tests/otbs/issue0528.d.ref @@ -0,0 +1,3 @@ +void f() return +do { +} From f6490b31c969e7ec07f57958c2104a2479060b75 Mon Sep 17 00:00:00 2001 From: belka-ew Date: Wed, 16 Jun 2021 16:23:27 +0200 Subject: [PATCH 86/92] Format multiline arrays first (#538) --- src/dfmt/formatter.d | 32 ++++++++++---------- tests/allman/keep_break_in_array_chain.d.ref | 7 +++++ tests/keep_break_in_array_chain.d | 7 +++++ tests/keep_break_in_array_chain.d.args | 1 + tests/otbs/keep_break_in_array_chain.d.ref | 6 ++++ 5 files changed, 37 insertions(+), 16 deletions(-) create mode 100644 tests/allman/keep_break_in_array_chain.d.ref create mode 100644 tests/keep_break_in_array_chain.d create mode 100644 tests/keep_break_in_array_chain.d.args create mode 100644 tests/otbs/keep_break_in_array_chain.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 1165fcb..47ae31f 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -612,22 +612,7 @@ private: immutable bool arrayInitializerStart = p == tok!"[" && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); - if (p == tok!"[" && config.dfmt_keep_line_breaks == OptionalBoolean.t) - { - IndentStack.Details detail; - - detail.wrap = false; - detail.temp = false; - detail.breakEveryItem = false; - detail.mini = tokens[index].line == tokens[index - 1].line; - - indents.push(tok!"]", detail); - if (!detail.mini) - { - newline(); - } - } - else if (arrayInitializerStart && isMultilineAt(index - 1)) + if (arrayInitializerStart && isMultilineAt(index - 1)) { if (peekBack2Is(tok!"(")) { indents.pop(); @@ -653,6 +638,21 @@ private: linebreakHints = chooseLineBreakTokens(index, tokens[index .. j], depths[index .. j], config, currentLineLength, indentLevel); } + else if (p == tok!"[" && config.dfmt_keep_line_breaks == OptionalBoolean.t) + { + IndentStack.Details detail; + + detail.wrap = false; + detail.temp = false; + detail.breakEveryItem = false; + detail.mini = tokens[index].line == tokens[index - 1].line; + + indents.push(tok!"]", detail); + if (!detail.mini) + { + newline(); + } + } else if (arrayInitializerStart) { // This is a short (non-breaking) array/AA value diff --git a/tests/allman/keep_break_in_array_chain.d.ref b/tests/allman/keep_break_in_array_chain.d.ref new file mode 100644 index 0000000..b6c691a --- /dev/null +++ b/tests/allman/keep_break_in_array_chain.d.ref @@ -0,0 +1,7 @@ +unittest +{ + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} diff --git a/tests/keep_break_in_array_chain.d b/tests/keep_break_in_array_chain.d new file mode 100644 index 0000000..03771ef --- /dev/null +++ b/tests/keep_break_in_array_chain.d @@ -0,0 +1,7 @@ +unittest +{ + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} diff --git a/tests/keep_break_in_array_chain.d.args b/tests/keep_break_in_array_chain.d.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/keep_break_in_array_chain.d.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/otbs/keep_break_in_array_chain.d.ref b/tests/otbs/keep_break_in_array_chain.d.ref new file mode 100644 index 0000000..b8cf577 --- /dev/null +++ b/tests/otbs/keep_break_in_array_chain.d.ref @@ -0,0 +1,6 @@ +unittest { + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} From 0e5615e13ea33da9232d7b8605ce8f607bd9438f Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Tue, 3 Aug 2021 16:40:22 -0500 Subject: [PATCH 87/92] Fix the CLI help output about the `--config` option (#541) --- src/dfmt/main.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dfmt/main.d b/src/dfmt/main.d index e4ee702..e86456d 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -177,7 +177,7 @@ else if (!exists(explicitConfigDir) || !isDir(explicitConfigDir)) { - stderr.writeln("--config_dir|c must specify existing directory path"); + stderr.writeln("--config|c must specify existing directory path"); return 1; } explicitConfig = getConfigFor!Config(explicitConfigDir); @@ -306,7 +306,7 @@ https://github.com/dlang-community/dfmt Options: --help, -h Print this help message --inplace, -i Edit files in place - --config_dir, -c Path to directory to load .editorconfig file from. + --config, -c Path to directory to load .editorconfig file from. --version Print the version number and then exit Formatting Options: From b3b8ff1a43278ccb67a5c8f8e761e363137b0d89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Mon, 16 Aug 2021 18:09:57 +0200 Subject: [PATCH 88/92] Avoid possible null pointer access. --- src/dfmt/ast_info.d | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index 961b8f9..56030f1 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -210,7 +210,10 @@ final class FormatVisitor : ASTVisitor { if (auto bd = functionBody.specifiedFunctionBody) { - astInformation.funBodyLocations ~= bd.blockStatement.startLocation; + if (bd.blockStatement) + { + astInformation.funBodyLocations ~= bd.blockStatement.startLocation; + } } functionBody.accept(this); } From e8bd41c70d5abdc44509c45479a4ec5dbde9dbf5 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Tue, 7 Sep 2021 14:29:45 +0200 Subject: [PATCH 89/92] Fix comment before contract Fixes #451. --- src/dfmt/formatter.d | 26 +++++++++++++---------- tests/allman/issue0451.d.ref | 40 ++++++++++++++++++++++++++++++++++++ tests/issue0451.d | 40 ++++++++++++++++++++++++++++++++++++ tests/otbs/issue0451.d.ref | 36 ++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+), 11 deletions(-) create mode 100644 tests/allman/issue0451.d.ref create mode 100644 tests/issue0451.d create mode 100644 tests/otbs/issue0451.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 47ae31f..48e93d9 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1192,11 +1192,13 @@ private: writeParens(config.dfmt_space_after_cast == OptionalBoolean.t); break; case tok!"out": - if (!peekBackIs(tok!"}") - && astInformation.contractLocations.canFindIndex(current.index)) - newline(); - else if (peekBackIsKeyword) - write(" "); + if (!peekBackIsSlashSlash) { + if (!peekBackIs(tok!"}") + && astInformation.contractLocations.canFindIndex(current.index)) + newline(); + else if (peekBackIsKeyword) + write(" "); + } writeToken(); if (!currentIs(tok!"{") && !currentIs(tok!"comment")) write(" "); @@ -1220,13 +1222,15 @@ private: break; case tok!"in": immutable isContract = astInformation.contractLocations.canFindIndex(current.index); - if (isContract) - { - indents.popTempIndents(); - newline(); + if (!peekBackIsSlashSlash) { + if (isContract) + { + indents.popTempIndents(); + newline(); + } + else if (!peekBackIsOneOf(false, tok!"(", tok!",", tok!"!")) + write(" "); } - else if (!peekBackIsOneOf(false, tok!"(", tok!",", tok!"!")) - write(" "); writeToken(); immutable isFunctionLit = astInformation.funLitStartLocations.canFindIndex( current.index); diff --git a/tests/allman/issue0451.d.ref b/tests/allman/issue0451.d.ref new file mode 100644 index 0000000..c5b2f27 --- /dev/null +++ b/tests/allman/issue0451.d.ref @@ -0,0 +1,40 @@ +class C +{ + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do + { + } + + abstract void f6() /* */ + do + { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ + { + return true; + } +} diff --git a/tests/issue0451.d b/tests/issue0451.d new file mode 100644 index 0000000..c5b2f27 --- /dev/null +++ b/tests/issue0451.d @@ -0,0 +1,40 @@ +class C +{ + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do + { + } + + abstract void f6() /* */ + do + { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ + { + return true; + } +} diff --git a/tests/otbs/issue0451.d.ref b/tests/otbs/issue0451.d.ref new file mode 100644 index 0000000..fed04e5 --- /dev/null +++ b/tests/otbs/issue0451.d.ref @@ -0,0 +1,36 @@ +class C { + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do { + } + + abstract void f6() /* */ + do { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ { + return true; + } +} From b776d5a9b96df283ab93b19a9bc689d633bdcb83 Mon Sep 17 00:00:00 2001 From: Martin Kinkelin Date: Sat, 30 Oct 2021 19:43:31 +0200 Subject: [PATCH 90/92] Fix tests --- tests/knr/array_access.d.ref | 6 ++-- tests/knr/associative_array.d.ref | 36 +++++++++---------- tests/knr/associative_array_complex.d.ref | 40 ++++++++++----------- tests/knr/issue0451.d.ref | 37 +++++++++++++++++++ tests/knr/issue0528.d.ref | 3 ++ tests/knr/keep_break_in_array_chain.d.ref | 6 ++++ tests/knr/keep_single_indent.d.ref | 44 +++++++++++++++++++++++ tests/knr/single_indent.d.ref | 36 +++++++++++++++++++ 8 files changed, 167 insertions(+), 41 deletions(-) create mode 100644 tests/knr/issue0451.d.ref create mode 100644 tests/knr/issue0528.d.ref create mode 100644 tests/knr/keep_break_in_array_chain.d.ref create mode 100644 tests/knr/keep_single_indent.d.ref create mode 100644 tests/knr/single_indent.d.ref diff --git a/tests/knr/array_access.d.ref b/tests/knr/array_access.d.ref index 7a2ac55..cf66c3d 100644 --- a/tests/knr/array_access.d.ref +++ b/tests/knr/array_access.d.ref @@ -1,6 +1,6 @@ unittest { foo([ - target.value.region[1], target.value.region[1], - target.value.region[1], target.value.region[1], target.value.region[1] - ]); + target.value.region[1], target.value.region[1], target.value.region[1], + target.value.region[1], target.value.region[1] + ]); } diff --git a/tests/knr/associative_array.d.ref b/tests/knr/associative_array.d.ref index 39f18c6..48442a3 100644 --- a/tests/knr/associative_array.d.ref +++ b/tests/knr/associative_array.d.ref @@ -1,23 +1,23 @@ unittest { Bson base = Bson([ - "maps": Bson([ - Bson(["id": Bson(4), "comment": Bson("hello")]), - Bson(["id": Bson(49), "comment": Bson(null)]) - ]), - "short": Bson(["a": "b", "c": "d"]), - "numbers": Bson([ - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 - ]), - "shuffleOnReset": serializeToBson([ - "all": false, - "selected": true, - "maybe": false - ]), - "resetOnEmpty": Bson(false), - "applyMods": Bson(true), - "sendComments": Bson(true) - ]); + "maps": Bson([ + Bson(["id": Bson(4), "comment": Bson("hello")]), + Bson(["id": Bson(49), "comment": Bson(null)]) + ]), + "short": Bson(["a": "b", "c": "d"]), + "numbers": Bson([ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, + 3, 4, 5, 6, 7, 8, 9, 0 + ]), + "shuffleOnReset": serializeToBson([ + "all": false, + "selected": true, + "maybe": false + ]), + "resetOnEmpty": Bson(false), + "applyMods": Bson(true), + "sendComments": Bson(true) + ]); int[] x = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 diff --git a/tests/knr/associative_array_complex.d.ref b/tests/knr/associative_array_complex.d.ref index c7b803b..f637ca3 100644 --- a/tests/knr/associative_array_complex.d.ref +++ b/tests/knr/associative_array_complex.d.ref @@ -1,25 +1,25 @@ auto find() { return Map.findRange([ - "$and": [ - ["deleted": Bson(false)], - [ - "$or": Bson([ - serializeToBson(["forceUpdate": Bson(true)]), - serializeToBson([ - "info.approved": ["$eq": Bson(1)], - "fetchDate": [ - "$lte": Bson(BsonDate(currentTime - 60.days)) - ] - ]), - serializeToBson([ - "info.approved": ["$ne": Bson(1)], - "fetchDate": [ - "$lte": Bson(BsonDate(currentTime - 14.days)) - ] - ]) - ]) - ] + "$and": [ + ["deleted": Bson(false)], + [ + "$or": Bson([ + serializeToBson(["forceUpdate": Bson(true)]), + serializeToBson([ + "info.approved": ["$eq": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 60.days)) + ] + ]), + serializeToBson([ + "info.approved": ["$ne": Bson(1)], + "fetchDate": [ + "$lte": Bson(BsonDate(currentTime - 14.days)) + ] + ]) + ]) ] - ]); + ] + ]); } diff --git a/tests/knr/issue0451.d.ref b/tests/knr/issue0451.d.ref new file mode 100644 index 0000000..fbd790f --- /dev/null +++ b/tests/knr/issue0451.d.ref @@ -0,0 +1,37 @@ +class C { + abstract void f1() // + in (true); + + abstract void f2() /* */ + in (true); + + abstract bool f3() // + out (r; r); + + abstract bool f4() /* */ + out (r; r); + + abstract void f5() // + do { + } + + abstract void f6() /* */ + do { + } + + abstract bool f7() // + in (true) // + out (r; r) // + do // + { + return true; + } + + abstract bool f8() /* */ + in (true) /* */ + out (r; r) /* */ + do /* */ + { + return true; + } +} diff --git a/tests/knr/issue0528.d.ref b/tests/knr/issue0528.d.ref new file mode 100644 index 0000000..304b696 --- /dev/null +++ b/tests/knr/issue0528.d.ref @@ -0,0 +1,3 @@ +void f() return +do { +} diff --git a/tests/knr/keep_break_in_array_chain.d.ref b/tests/knr/keep_break_in_array_chain.d.ref new file mode 100644 index 0000000..b8cf577 --- /dev/null +++ b/tests/knr/keep_break_in_array_chain.d.ref @@ -0,0 +1,6 @@ +unittest { + functionLengthDoesMatter([ + firstFunctionInChain("A").seconFunctionInChain("B").value, + firstFunctionInChain("A").seconFunctionInChain("B").value + ]); +} diff --git a/tests/knr/keep_single_indent.d.ref b/tests/knr/keep_single_indent.d.ref new file mode 100644 index 0000000..5faf64a --- /dev/null +++ b/tests/knr/keep_single_indent.d.ref @@ -0,0 +1,44 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +void f() +{ + string a = "foo" + ~ "bar" /* bar */ + ~ "baz"; +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") + || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} diff --git a/tests/knr/single_indent.d.ref b/tests/knr/single_indent.d.ref new file mode 100644 index 0000000..47e34b5 --- /dev/null +++ b/tests/knr/single_indent.d.ref @@ -0,0 +1,36 @@ +unittest { + { + bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo, + Three charlie, double delta) + { + if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo + && foxtrot && golf && hotel && india && juliet) { + } + } + } +} + +unittest { + if (a) { + while (sBraceDepth == 0 && indents.topIsTemp() + && ((indents.top != tok!"if" && indents.top != tok!"version") || !peekIs(tok!"else"))) + a(); + } +} + +unittest { + callFunc({ int i = 10; return i; }); + callFunc({ + int i = 10; + foo(alpha, bravo, charlie, delta, echo, foxtrot, golf, echo); + doStuff(withThings, andOtherStuff); + return i; + }); + callFunc({ + int i = 10; + foo(alpha_longVarName, bravo_longVarName, charlie_longVarName, delta_longVarName, + echo_longVarName, foxtrot_longVarName, golf_longVarName, echo_longVarName); + doStuff(withThings, andOtherStuff); + return i; + }, more_stuff); +} From 6a24f0dc7c490f4cb06cdc9d21b841bee84615f4 Mon Sep 17 00:00:00 2001 From: RazvanN7 Date: Wed, 28 Jul 2021 18:36:05 +0300 Subject: [PATCH 91/92] Upgrade libdparse to latest version --- dub.json | 2 +- libdparse | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dub.json b/dub.json index bc64b76..edaa129 100644 --- a/dub.json +++ b/dub.json @@ -4,7 +4,7 @@ "targetType": "autodetect", "license": "BSL-1.0", "dependencies": { - "libdparse": ">=0.14.0 <0.18.0" + "libdparse": ">=0.14.0 <1.0.0" }, "targetPath" : "bin/", "targetName" : "dfmt", diff --git a/libdparse b/libdparse index 9aefc9c..7112880 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 9aefc9c5e6e1495aca094d5c403f35f1052677d1 +Subproject commit 7112880dae3f25553d96dae53a445c16261de7f9 From 77e2ba4e3d2b72bea71c9a5973327047bcc29ab4 Mon Sep 17 00:00:00 2001 From: Eugen Wissner Date: Mon, 23 May 2022 08:30:41 +0200 Subject: [PATCH 92/92] Fix array indentation as argument --- src/dfmt/formatter.d | 3 +++ tests/allman/keep_break_in_array_arg.d.ref | 6 ++++++ ...k_in_array_chain.d.args => keep_break_in_array_arg.args} | 0 tests/keep_break_in_array_arg.d | 6 ++++++ tests/keep_break_in_array_chain.args | 1 + tests/knr/keep_break_in_array_arg.d.ref | 5 +++++ tests/otbs/keep_break_in_array_arg.d.ref | 5 +++++ 7 files changed, 26 insertions(+) create mode 100644 tests/allman/keep_break_in_array_arg.d.ref rename tests/{keep_break_in_array_chain.d.args => keep_break_in_array_arg.args} (100%) create mode 100644 tests/keep_break_in_array_arg.d create mode 100644 tests/keep_break_in_array_chain.args create mode 100644 tests/knr/keep_break_in_array_arg.d.ref create mode 100644 tests/otbs/keep_break_in_array_arg.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index c4d2e68..acd4724 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -642,6 +642,9 @@ private: } else if (p == tok!"[" && config.dfmt_keep_line_breaks == OptionalBoolean.t) { + if (peekBack2Is(tok!"(")) { + indents.pop(); + } IndentStack.Details detail; detail.wrap = false; diff --git a/tests/allman/keep_break_in_array_arg.d.ref b/tests/allman/keep_break_in_array_arg.d.ref new file mode 100644 index 0000000..88bc23f --- /dev/null +++ b/tests/allman/keep_break_in_array_arg.d.ref @@ -0,0 +1,6 @@ +unittest +{ + f([ + x + ]); +} diff --git a/tests/keep_break_in_array_chain.d.args b/tests/keep_break_in_array_arg.args similarity index 100% rename from tests/keep_break_in_array_chain.d.args rename to tests/keep_break_in_array_arg.args diff --git a/tests/keep_break_in_array_arg.d b/tests/keep_break_in_array_arg.d new file mode 100644 index 0000000..88bc23f --- /dev/null +++ b/tests/keep_break_in_array_arg.d @@ -0,0 +1,6 @@ +unittest +{ + f([ + x + ]); +} diff --git a/tests/keep_break_in_array_chain.args b/tests/keep_break_in_array_chain.args new file mode 100644 index 0000000..7e7e52d --- /dev/null +++ b/tests/keep_break_in_array_chain.args @@ -0,0 +1 @@ +--keep_line_breaks=true diff --git a/tests/knr/keep_break_in_array_arg.d.ref b/tests/knr/keep_break_in_array_arg.d.ref new file mode 100644 index 0000000..5f56bb7 --- /dev/null +++ b/tests/knr/keep_break_in_array_arg.d.ref @@ -0,0 +1,5 @@ +unittest { + f([ + x + ]); +} diff --git a/tests/otbs/keep_break_in_array_arg.d.ref b/tests/otbs/keep_break_in_array_arg.d.ref new file mode 100644 index 0000000..5f56bb7 --- /dev/null +++ b/tests/otbs/keep_break_in_array_arg.d.ref @@ -0,0 +1,5 @@ +unittest { + f([ + x + ]); +}