437 changed files with 544 additions and 6202 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,16 +0,0 @@
-tests/issue0228.d               text eol=lf
-tests/allman/issue0228.d.ref    text eol=crlf
-tests/knr/issue0228.d.ref       text eol=crlf
-tests/otbs/issue0228.d.ref      text eol=crlf
-tests/issue0552_lf.d            text eol=lf
-tests/allman/issue0552_lf.d.ref text eol=lf
-tests/knr/issue0552_lf.d.ref    text eol=lf
-tests/otbs/issue0552_lf.d.ref   text eol=lf
-tests/issue0552_cr.d            text eol=cr
-tests/allman/issue0552_cr.d.ref text eol=cr
-tests/knr/issue0552_cr.d.ref    text eol=cr
-tests/otbs/issue0552_cr.d.ref   text eol=cr
-tests/issue0552_crlf.d            text eol=crlf
-tests/allman/issue0552_crlf.d.ref text eol=crlf
-tests/knr/issue0552_crlf.d.ref    text eol=crlf
-tests/otbs/issue0552_crlf.d.ref   text eol=crlf
--- a/.github/workflows/d.yml
+++ b/.github/workflows/d.yml
@ -1,34 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-name: D
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - uses: dlang-community/setup-dlang@4c99aa991ce7d19dd3064de0a4f2f6b2f152e2d7
-
-    - name: 'Build & Test'
-      run: |
-        # Build the project, with its main file included, without unittests
-        dub build --compiler=$DC
-        # Build and run tests, as defined by `unittest` configuration
-        # In this mode, `mainSourceFile` is excluded and `version (unittest)` are included
-        # See https://dub.pm/package-format-json.html#configurations
-        dub test --compiler=$DC
-        # Run tests
-        cd tests && rdmd test
--- a/.gitmodules
+++ b/.gitmodules
@ -4,6 +4,3 @@
 [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
--- a/.travis.sh
+++ b/.travis.sh
@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+if [[ $BUILD == dub ]]; then
+    dub build --build=release
+elif [[ $DC == ldc2 ]]; then
+    git submodule update --init --recursive
+    make ldc -j2
+else
+    git submodule update --init --recursive
+    make debug -j2
+fi
+
+cd tests && ./test.sh
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,94 @@
+sudo: false
+language: d
+d:
+  - dmd
+  - ldc
+
+os:
+  - linux
+  - osx
+
+branches:
+  only:
+  - master
+  - /^v\d+\.\d+\.\d+([+-]\S*)*$/
+
+env:
+  - BUILD=
+  - BUILD=dub
+
+script: ./.travis.sh
+
+jobs:
+    include:
+        - stage: GitHub Release
+          #if: tag IS present
+          d: ldc-1.13.0
+          os: linux
+          script: echo "Deploying to GitHub releases ..." && ./release.sh
+          deploy:
+            provider: releases
+            api_key: $GH_REPO_TOKEN
+            file_glob: true
+            file: bin/dfmt-*.tar.gz
+            skip_cleanup: true
+            on:
+              repo: dlang-community/dfmt
+              tags: true
+        - stage: GitHub Release
+          #if: tag IS present
+          d: ldc-1.13.0
+          os: osx
+          script: echo "Deploying to GitHub releases ..." && ./release.sh
+          deploy:
+            provider: releases
+            api_key: $GH_REPO_TOKEN
+            file_glob: true
+            file: bin/dfmt-*.tar.gz
+            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 ..." && ./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
+        - 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)
--- a/README.md
+++ b/README.md
@ -1,28 +1,22 @@
-# dfmt [![Build Status](https://github.com/dlang-community/dfmt/actions/workflows/d.yml/badge.svg)](https://github.com/dlang-community/dfmt/actions?query=workflow%3A%22D%22)
-
+# dfmt [![Build Status](https://travis-ci.org/dlang-community/dfmt.svg?branch=master)](https://travis-ci.org/dlang-community/dfmt)
 **dfmt** is a formatter for D source code

 ## Status
 **dfmt** is beta quality. Make backups of your files or use source control
 when using the **--inplace** option.

-## Installation
-
-### Installing with DUB
-
-```sh
-> dub run dfmt -- -h
-```
-
-### Building from source using Make
+## 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/```.

-### Building from source using dub
-* Clone the repository
-* run `dub build --build=release`, optionally with `--compiler=ldc2`
+### Installing with DUB
+
+```sh
+> dub fetch --version='~master' dfmt && dub run dfmt -- -h
+```

 ## Using
 By default, dfmt reads its input from **stdin** and writes to **stdout**.
@ -52,15 +46,10 @@ found there.
 * `--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_named_arg_colon`: *see dfmt_space_before_named_arg_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)*
-* `--keep_line_breaks`: *see dfmt_keep_line_breaks [below](#dfmt-specific-properties)*
-* `--single_indent`: *see dfmt_single_indent [below](#dfmt-specific-properties)*
-* `--reflow_property_chains`: *see dfmt_property_chains [below](#dfmt-specific-properties)*
-* `--space_after_keywords`: *see dfmt_space_after_keywords [below](#dfmt-specific-properties)*

 ### Example
 ```
@ -96,7 +85,7 @@ void main(string[] args)
 ### Standard EditorConfig properties
 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) When not set, `dfmt` adopts the first line ending in the input.
+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)
@ -107,9 +96,9 @@ max_line_length | positive integers (**`120`**) | [See EditorConfig documentatio
 ### dfmt-specific properties
 Property Name | Allowed Values | Description
 --------------|----------------|------------
-dfmt_brace_style | **`allman`**, `otbs`, `stroustrup` or `knr` | [See Wikipedia](https://en.wikipedia.org/wiki/Brace_style)
+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 | **`true`**, `false` | Align labels, cases, and defaults with their enclosing switch.
+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.
@ -120,11 +109,6 @@ 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_space_before_named_arg_colon | `true`, **`false`** | Adds a space after a named function argument or named struct constructor argument before the `:`.
-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.
-dfmt_reflow_property_chains | **`true`**, `false` | Recalculate the splitting of property chains into multiple lines.
-dfmt_space_after_keywords | **`true`**, `false` | Insert space after keywords (if,while,foreach,for, etc.).

 ## Terminology
 * Braces - `{` and `}`
--- a/appveyor.yml
+++ b/appveyor.yml
@ -0,0 +1,112 @@
+platform: x64
+environment:
+ matrix:
+  - DC: dmd
+    DVersion: stable
+    arch: x64
+  - DC: dmd
+    DVersion: stable
+    arch: x86
+#  - DC: ldc
+#    DVersion: beta
+#    arch: x86
+#  - DC: ldc
+#    DVersion: beta
+#    arch: x64
+#  - DC: ldc
+#    DVersion: stable
+#    arch: x86
+#  - DC: ldc
+#    DVersion: stable
+#    arch: x64
+
+skip_tags: false
+branches:
+  only:
+    - master
+    - /^v\d+\.\d+\.\d+([+-]\S*)*$/
+
+install:
+  - ps: function ResolveLatestDMD
+        {
+            $version = $env:DVersion;
+            if($version -eq "stable") {
+                $latest = (Invoke-WebRequest "http://downloads.dlang.org/releases/LATEST").toString();
+                $url = "http://downloads.dlang.org/releases/2.x/$($latest)/dmd.$($latest).windows.7z";
+            }elseif($version -eq "beta") {
+                $latest = (Invoke-WebRequest "http://downloads.dlang.org/pre-releases/LATEST").toString();
+                $latestVersion = $latest.split("-")[0].split("~")[0];
+                $url = "http://downloads.dlang.org/pre-releases/2.x/$($latestVersion)/dmd.$($latest).windows.7z";
+            }elseif($version -eq "nightly") {
+                $url = "http://nightlies.dlang.org/dmd-master-2017-05-20/dmd.master.windows.7z"
+            }else {
+                $url = "http://downloads.dlang.org/releases/2.x/$($version)/dmd.$($version).windows.7z";
+            }
+            $env:PATH += ";C:\dmd2\windows\bin;";
+            return $url;
+        }
+  - ps: function ResolveLatestLDC
+        {
+            $version = $env:DVersion;
+            if($version -eq "stable") {
+                $latest = (Invoke-WebRequest "https://ldc-developers.github.io/LATEST").toString().replace("`n","").replace("`r","");
+                $url = "https://github.com/ldc-developers/ldc/releases/download/v$($latest)/ldc2-$($latest)-win64-msvc.zip";
+            }elseif($version -eq "beta") {
+                $latest = (Invoke-WebRequest "https://ldc-developers.github.io/LATEST_BETA").toString().replace("`n","").replace("`r","");
+                $url = "https://github.com/ldc-developers/ldc/releases/download/v$($latest)/ldc2-$($latest)-win64-msvc.zip";
+            } else {
+                $latest = $version;
+                $url = "https://github.com/ldc-developers/ldc/releases/download/v$($version)/ldc2-$($version)-win64-msvc.zip";
+            }
+            $env:PATH += ";C:\ldc2-$($latest)-win64-msvc\bin";
+            $env:DC = "ldc2";
+            return $url;
+        }
+  - ps: function SetUpDCompiler
+        {
+            $env:toolchain = "msvc";
+            if($env:DC -eq "dmd"){
+              echo "downloading ...";
+              $url = ResolveLatestDMD;
+              echo $url;
+              Invoke-WebRequest $url -OutFile "c:\dmd.7z";
+              echo "finished.";
+              pushd c:\\;
+              7z x dmd.7z > $null;
+              popd;
+            }
+            elseif($env:DC -eq "ldc"){
+              echo "downloading ...";
+              $url = ResolveLatestLDC;
+              echo $url;
+              Invoke-WebRequest $url -OutFile "c:\ldc.zip";
+              echo "finished.";
+              pushd c:\\;
+              7z x ldc.zip > $null;
+              popd;
+            }
+        }
+  - ps: SetUpDCompiler
+
+build_script:
+  - ps: if($env:arch -eq "x86"){
+            $env:compilersetupargs = "x86";
+            $env:Darch = "x86";
+            $env:DConf = "m32";
+        }elseif($env:arch -eq "x64"){
+            $env:compilersetupargs = "amd64";
+            $env:Darch = "x86_64";
+            $env:DConf = "m64";
+        }
+  - ps: $env:compilersetup = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall";
+  - '"%compilersetup%" %compilersetupargs%'
+
+test_script:
+ - echo %PLATFORM%
+ - echo %Darch%
+ - echo %DC%
+ - echo %PATH%
+ - '%DC% --version'
+ - dub test --arch=%Darch% --compiler=%DC%
+ - git submodule update --init --recursive
+ - build.bat
--- a/bash-completion/completions/dfmt
+++ b/bash-completion/completions/dfmt
@ -24,7 +24,7 @@ _dfmt()

 	eolOpts="lf cr crlf"
 	boolOpts="true false"
-	braceOpts="allman otbs stroustrup knr"
+	braceOpts="allman otbs stroustrup"
 	indentOpts="tab space"
 	constraintOpts="conditional_newline_indent conditional_newline always_newline always_newline_indent"

--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 206a2e6abd97b4462f3a320e4f2d23986fad3cff
--- a/dub.json
+++ b/dub.json
@ -4,7 +4,7 @@
    "targetType": "autodetect",
    "license": "BSL-1.0",
    "dependencies": {
-      "libdparse": ">=0.19.2 <1.0.0"
+      "libdparse": "~>0.11.4"
    },
    "targetPath" : "bin/",
    "targetName" : "dfmt",
@ -14,7 +14,7 @@
    "versions" : [
        "built_with_dub"
    ],
-    "preBuildCommands" : [
-      "$DC -run \"$PACKAGE_DIR/dubhash.d\""
+    "preGenerateCommands" : [
+      "rdmd \"$PACKAGE_DIR/dubhash.d\""
    ]
 }
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit fe6d1e38fb4fc04323170389cfec67ed7fd4e24a
+Subproject commit aae371931a99027465952cd6fdaede4eb4743e76
--- a/62
+++ b/62
@ -1,63 +1,53 @@
-PREFIX = /usr/local
-
 SRC := $(shell find src -name "*.d") \
-	$(shell find libdparse/src -name "*.d")
-IMPORTS := -Ilibdparse/src -Isrc -Jbin
-
+	$(shell find libdparse/src -name "*.d") \
+	$(shell find stdx-allocator/source -name "*.d")
+INCLUDE_PATHS := -Ilibdparse/src -Istdx-allocator/source -Isrc -Jbin
+DMD_COMMON_FLAGS := -dip25 -w $(INCLUDE_PATHS)
+DMD_DEBUG_FLAGS := -debug -g $(DMD_COMMON_FLAGS)
+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

-DMD_COMMON_FLAGS := -w $(IMPORTS)
-DMD_DEBUG_FLAGS := -debug -g $(DMD_COMMON_FLAGS)
-DMD_FLAGS := -O -inline $(DMD_COMMON_FLAGS)
-DMD_TEST_FLAGS := -unittest -g $(DMD_COMMON_FLAGS)
-LDC_FLAGS := -g -w -oq $(IMPORTS)
-GDC_FLAGS := -g -w -oq $(IMPORTS)
-override DMD_FLAGS += $(DFLAGS)
-override LDC_FLAGS += $(DFLAGS)
-override GDC_FLAGS += $(DFLAGS)
-
-.PHONY: all clean install debug dmd ldc gdc pkg release test
-
-all: bin/dfmt
-
-bin/githash.txt:
-	mkdir -p bin
-	git describe --tags > bin/githash.txt
+.PHONY: dmd ldc gdc test

 dmd: bin/dfmt

-ldc: bin/githash.txt
+githash:
+	mkdir -p bin
+	git describe --tags > bin/githash.txt
+
+ldc: githash
 	$(LDC) $(SRC) $(LDC_FLAGS) -ofbin/dfmt
 	-rm -f *.o

-gdc: bin/githash.txt
+gdc:githash
 	$(GDC) $(SRC) $(GDC_FLAGS) -obin/dfmt

 test: debug
-	cd tests && ./test.d
+	cd tests && ./test.sh

-bin/dfmt-test: bin/githash.txt $(SRC)
-	$(DC) $(DMD_TEST_FLAGS) $(filter %.d,$^) -of$@
+bin/dfmt-test: githash $(SRC)
+	$(DC) $(DMD_TEST_FLAGS) $^ -of$@

-bin/dfmt: bin/githash.txt $(SRC)
+bin/dfmt: githash $(SRC)
 	$(DC) $(DMD_FLAGS) $(filter %.d,$^) -of$@

-debug: bin/githash.txt $(SRC)
+debug: githash $(SRC)
 	$(DC) $(DMD_DEBUG_FLAGS) $(filter %.d,$^) -ofbin/dfmt

 pkg: dmd
 	$(MAKE) -f makd/Makd.mak pkg

 clean:
-	$(RM) bin/dfmt bin/dfmt-test bin/githash.txt
-
-install:
-	chmod +x bin/dfmt
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f bin/dfmt $(DESTDIR)$(PREFIX)/bin/dfmt
+	$(RM) bin/dfmt

 release:
 	./release.sh
-	$(MAKE) bin/githash.txt
+	githash
--- a/src/dfmt/ast_info.d
+++ b/src/dfmt/ast_info.d
@ -23,12 +23,6 @@ struct BraceIndentInfo
    uint beginIndentLevel;
 }

-struct StructInitializerInfo
-{
-    size_t startLocation;
-    size_t endLocation;
-}
-
 /// AST information that is needed by the formatter.
 struct ASTInformation
 {
@ -59,12 +53,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();
-        sort(ternaryColonLocations);
-        sort(namedArgumentColonLocations);
    }

    /// Locations of end braces for struct bodies
@ -97,12 +87,6 @@ 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;

@ -134,15 +118,6 @@ struct ASTInformation
    size_t[] ufcsHintLocations;

    BraceIndentInfo[] indentInfoSortedByEndLocation;
-
-    /// Opening & closing braces of struct initializers
-    StructInitializerInfo[] structInfoSortedByEndLocation;
-
-    /// Locations ternary expression colons.
-    size_t[] ternaryColonLocations;
-
-    /// Locations of named arguments of function call or struct constructor.
-    size_t[] namedArgumentColonLocations;
 }

 /// Collects information from the AST that is useful for the formatter
@ -214,18 +189,6 @@ final class FormatVisitor : ASTVisitor
        destructor.accept(this);
    }

-    override void visit (const FunctionBody functionBody)
-    {
-        if (auto bd = functionBody.specifiedFunctionBody)
-        {
-            if (bd.blockStatement)
-            {
-                astInformation.funBodyLocations ~= bd.blockStatement.startLocation;
-            }
-        }
-        functionBody.accept(this);
-    }
-
    override void visit(const ConditionalDeclaration dec)
    {
        if (dec.hasElse)
@ -309,8 +272,6 @@ 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);

@ -339,7 +300,6 @@ final class FormatVisitor : ASTVisitor

    override void visit(const StructBody structBody)
    {
-        astInformation.aggregateBodyLocations ~= structBody.startLocation;
        astInformation.doubleNewlineLocations ~= structBody.endLocation;
        structBody.accept(this);
    }
@ -446,58 +406,6 @@ final class FormatVisitor : ASTVisitor
        outStatement.accept(this);
    }

-    override void visit(const TernaryExpression ternaryExpression)
-    {
-        astInformation.ternaryColonLocations ~= ternaryExpression.colon.index;
-        ternaryExpression.accept(this);
-    }
-
-    override void visit(const FunctionCallExpression functionCall)
-    {
-        visit(functionCall.arguments);
-        functionCall.accept(this);
-    }
-
-    override void visit(const NewExpression newCall)
-    {
-        visit(newCall.arguments);
-        newCall.accept(this);
-    }
-
-    override void visit(const NewAnonClassExpression newAnonClassCall)
-    {
-        visit(newAnonClassCall.constructorArguments);
-        newAnonClassCall.accept(this);
-    }
-
-    private void visit(const Arguments arguments)
-    {
-        // Check if call has any arguments.
-        if (!arguments || arguments.namedArgumentList is null)
-        {
-            return;
-        }
-
-        foreach (item; arguments.namedArgumentList.items)
-        {
-            // Do nothing if not a named argument.
-            if (item.name == tok!"")
-            {
-                continue;
-            }
-
-            // Find first colon if named argument.
-            foreach (t; item.tokens)
-            {
-                if (t.type == tok!":")
-                {
-                    astInformation.namedArgumentColonLocations ~= t.index;
-                    break;
-                }
-            }
-        }
-    }
-
 private:
    ASTInformation* astInformation;
 }
--- a/src/dfmt/config.d
+++ b/src/dfmt/config.d
@ -10,20 +10,18 @@ import dfmt.editorconfig;
 /// Brace styles
 enum BraceStyle
 {
-    _unspecified,
+    unspecified,
    /// $(LINK https://en.wikipedia.org/wiki/Indent_style#Allman_style)
    allman,
    /// $(LINK https://en.wikipedia.org/wiki/Indent_style#Variant:_1TBS)
    otbs,
    /// $(LINK https://en.wikipedia.org/wiki/Indent_style#Variant:_Stroustrup)
-    stroustrup,
-    /// $(LINK https://en.wikipedia.org/wiki/Indentation_style#K&R_style)
-    knr,
+    stroustrup
 }

 enum TemplateConstraintStyle
 {
-    _unspecified,
+    unspecified,
    conditional_newline_indent,
    conditional_newline,
    always_newline,
@ -59,16 +57,6 @@ struct Config
    OptionalBoolean dfmt_single_template_constraint_indent;
    ///
    OptionalBoolean dfmt_space_before_aa_colon;
-    ///
-    OptionalBoolean dfmt_keep_line_breaks;
-    ///
-    OptionalBoolean dfmt_single_indent;
-    ///
-    OptionalBoolean dfmt_reflow_property_chains;
-    ///
-    OptionalBoolean dfmt_space_after_statement_keyword;
-    ///
-    OptionalBoolean dfmt_space_before_named_arg_colon;

    mixin StandardEditorConfigFields;

@ -79,7 +67,7 @@ struct Config
    void initializeWithDefaults()
    {
        pattern = "*.d";
-        end_of_line = EOL._default;
+        end_of_line = EOL.lf;
        indent_style = IndentStyle.space;
        indent_size = 4;
        tab_width = 4;
@ -97,10 +85,6 @@ 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;
-        dfmt_single_indent = OptionalBoolean.f;
-        dfmt_reflow_property_chains = OptionalBoolean.t;
-        dfmt_space_before_named_arg_colon = OptionalBoolean.f;
    }

    /**
--- a/src/dfmt/editorconfig.d
+++ b/src/dfmt/editorconfig.d
@ -26,22 +26,21 @@ private auto commentRe = ctRegex!(`^\s*[#;].*$`);

 enum OptionalBoolean : ubyte
 {
-    _unspecified = 3,
+    unspecified = 3,
    t = 1,
    f = 0
 }

 enum IndentStyle : ubyte
 {
-    _unspecified,
+    unspecified,
    tab,
    space
 }

 enum EOL : ubyte
 {
-    _unspecified,
-    _default,
+    unspecified,
    lf,
    cr,
    crlf
@ -75,7 +74,7 @@ mixin template StandardEditorConfigFields()
            static if (N == "pattern")
                continue;
            else static if (is(T == enum))
-                *thisN = otherN != T._unspecified ? otherN : *thisN;
+                *thisN = otherN != T.unspecified ? otherN : *thisN;
            else static if (is(T == int))
                *thisN = otherN != -1 ? otherN : *thisN;
            else static if (is(T == string))
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
--- 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
+        Range path, const(C)[] pattern) @safe pure nothrow 
        if (isForwardRange!Range && isSomeChar!(ElementEncodingType!Range)
            && isSomeChar!C && is(Unqual!C == Unqual!(ElementEncodingType!Range)))
 in
@ -23,7 +23,7 @@ in
    assert(balancedParens(pattern, '[', ']', 0));
    assert(balancedParens(pattern, '{', '}', 0));
 }
-do
+body
 {
    alias RC = Unqual!(ElementEncodingType!Range);

--- a/src/dfmt/indentation.d
+++ b/src/dfmt/indentation.d
@ -5,8 +5,6 @@

 module dfmt.indentation;

-import dfmt.config;
-import dfmt.editorconfig;
 import dparse.lexer;

 import std.bitmanip : bitfields;
@ -33,14 +31,6 @@ 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!(
@ -231,7 +221,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__) const
+    void dump(size_t pos = size_t.max, string file = __FILE__, uint line = __LINE__)
    {
        import dparse.lexer : str;
        import std.algorithm.iteration : map;
@ -270,20 +260,8 @@ 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 (currentIsNonWrapTemp && arr[i + 1] == tok!"]")
-                {
-                    parenCount = pc;
-                    continue;
-                }
                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!"{"))
@ -298,7 +276,7 @@ private:
                    continue;
                }
            }
-            else if (parenCount == 0 && arr[i] == tok!"(" && config.dfmt_single_indent == OptionalBoolean.f)
+            else if (parenCount == 0 && arr[i] == tok!"(")
                size++;

            if (arr[i] == tok!"!")
@ -309,12 +287,6 @@ 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
--- 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;
@ -38,13 +38,13 @@ version (NoMain)
 }
 else
 {
+    import std.array : front, popFront;
+    import std.stdio : stdout, stdin, stderr, writeln, File;
    import dfmt.config : Config;
-    import dfmt.editorconfig : getConfigFor;
    import dfmt.formatter : format;
-    import std.array : appender, front, popFront;
-    import std.getopt : getopt, GetOptException;
    import std.path : buildPath, dirName, expandTilde;
-    import std.stdio : File, stderr, stdin, stdout, writeln;
+    import dfmt.editorconfig : getConfigFor;
+    import std.getopt : getopt, GetOptException;

    int main(string[] args)
    {
@ -92,21 +92,6 @@ else
            case "space_before_aa_colon":
                optConfig.dfmt_space_before_aa_colon = optVal;
                break;
-            case "space_before_named_arg_colon":
-                optConfig.dfmt_space_before_named_arg_colon = optVal;
-                break;
-            case "keep_line_breaks":
-                optConfig.dfmt_keep_line_breaks = optVal;
-                break;
-            case "single_indent":
-                optConfig.dfmt_single_indent = optVal;
-                break;
-            case "reflow_property_chains":
-                optConfig.dfmt_reflow_property_chains = optVal;
-                break;
-            case "space_after_keywords":
-                optConfig.dfmt_space_after_keywords = optVal;
-                break;
            default:
                assert(false, "Invalid command-line switch");
            }
@ -129,19 +114,14 @@ else
                "soft_max_line_length", &optConfig.dfmt_soft_max_line_length,
                "outdent_attributes", &handleBooleans,
                "space_after_cast", &handleBooleans,
-                "space_after_keywords", &handleBooleans,
                "selective_import_space", &handleBooleans,
                "space_before_function_parameters", &handleBooleans,
                "split_operator_at_line_end", &handleBooleans,
                "compact_labeled_statements", &handleBooleans,
                "single_template_constraint_indent", &handleBooleans,
                "space_before_aa_colon", &handleBooleans,
-                "space_before_named_arg_colon", &handleBooleans,
                "tab_width", &optConfig.tab_width,
-                "template_constraint_style", &optConfig.dfmt_template_constraint_style,
-                "keep_line_breaks", &handleBooleans,
-                "single_indent", &handleBooleans,
-                "reflow_property_chains", &handleBooleans);
+                "template_constraint_style", &optConfig.dfmt_template_constraint_style);
            // dfmt on
        }
        catch (GetOptException e)
@ -165,13 +145,14 @@ else
        args.popFront();
        immutable bool readFromStdin = args.length == 0;

+        File output = stdout;
        version (Windows)
        {
            // On Windows, set stdout to binary mode (needed for correct EOL writing)
            // See Phobos' stdio.File.rawWrite
            {
                import std.stdio : _O_BINARY;
-                immutable fd = stdout.fileno;
+                immutable fd = output.fileno;
                _setmode(fd, _O_BINARY);
                version (CRuntime_DigitalMars)
                {
@ -192,7 +173,7 @@ else

            if (!exists(explicitConfigDir) || !isDir(explicitConfigDir))
            {
-                stderr.writeln("--config|c must specify existing directory path");
+                stderr.writeln("--config_dir|c must specify existing directory path");
                return 1;
            }
            explicitConfig = getConfigFor!Config(explicitConfigDir);
@ -230,9 +211,7 @@ else
                else
                    break;
            }
-            immutable bool formatSuccess = format("stdin", buffer,
-                stdout.lockingTextWriter(), &config);
-            return formatSuccess ? 0 : 1;
+            format("stdin", buffer, output.lockingTextWriter(), &config);
        }
        else
        {
@ -240,7 +219,6 @@ else

            if (args.length >= 2)
                inplace = true;
-            int retVal;
            while (args.length > 0)
            {
                const path = args.front;
@ -273,21 +251,13 @@ else
                {
                    buffer = new ubyte[](cast(size_t) f.size);
                    f.rawRead(buffer);
-                    auto output = appender!string;
-                    immutable bool formatSuccess = format(path, buffer, output, &config);
-                    if (formatSuccess)
-                    {
-                        if (inplace)
-                            File(path, "wb").rawWrite(output.data);
-                        else
-                            stdout.rawWrite(output.data);
-                    }
-                    else
-                        retVal = 1;
+                    if (inplace)
+                        output = File(path, "wb");
+                    format(path, buffer, output.lockingTextWriter(), &config);
                }
            }
-            return retVal;
        }
+        return 0;
    }
 }

@ -306,14 +276,12 @@ private version (Windows)

 template optionsToString(E) if (is(E == enum))
 {
-    import std.algorithm.searching : startsWith;
-
    enum optionsToString = () {

        string result = "(";
        foreach (s; [__traits(allMembers, E)])
        {
-            if (!s.startsWith("_"))
+            if (s != "unspecified")
                result ~= s ~ "|";
        }
        result = result[0 .. $ - 1] ~ ")";
@ -329,7 +297,7 @@ https://github.com/dlang-community/dfmt
 Options:
    --help, -h          Print this help message
    --inplace, -i       Edit files in place
-    --config, -c    Path to directory to load .editorconfig file from.
+    --config_dir, -c    Path to directory to load .editorconfig file from.
    --version           Print the version number and then exit

 Formatting Options:
@ -340,22 +308,17 @@ Formatting Options:
    --indent_size
    --indent_style, -t          `,
            optionsToString!(typeof(Config.indent_style)), `
-    --keep_line_breaks
    --soft_max_line_length
    --max_line_length
    --outdent_attributes
    --space_after_cast
    --space_before_function_parameters
-    --space_after_keywords
    --selective_import_space
    --single_template_constraint_indent
    --split_operator_at_line_end
    --compact_labeled_statements
    --template_constraint_style
    --space_before_aa_colon
-    --space_before_named_arg_colon
-    --single_indent
-    --reflow_property_chains
        `,
            optionsToString!(typeof(Config.dfmt_template_constraint_style)));
 }
--- a/src/dfmt/tokens.d
+++ b/src/dfmt/tokens.d
@ -15,7 +15,7 @@ in
 {
    assert(tokens[0].type == tok!"(");
 }
-do
+body
 {
    uint length = 0;
    size_t i = 1;
--- a/src/dfmt/wrapping.d
+++ b/src/dfmt/wrapping.d
@ -172,6 +172,9 @@ 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))
--- a/tests/allman/argument_chain_indent.d.ref
+++ b/tests/allman/argument_chain_indent.d.ref
@ -1,23 +0,0 @@
-class C
-{
-    void f()
-    {
-        if (true)
-        {
-            f(map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map
-                    .map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
-                __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
-                __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
-
-            g(map && map && map && map && map && map && map && map && map && map && map
-                    && map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
-                __FILE__, __FILE__, __LINE__);
-            h(map || map || map || map || map || map || map || map || map || map || map
-                    || map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
-                __FILE__, __FILE__, __LINE__);
-            i(map + map + map + map + map + map + map + map + map + map + map + map + map
-                    + map + map + map + map + map, __FILE__, __FILE__, __FILE__,
-                __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
-        }
-    }
-}
--- a/tests/allman/argument_chain_keep_breaks.d.ref
+++ b/tests/allman/argument_chain_keep_breaks.d.ref
@ -1,31 +0,0 @@
-class C
-{
-    void f()
-    {
-        if (true)
-        {
-            f(
-                array.map!(a => a.prop)
-                    .array
-                    .to!string,
-                __FILE__,
-                __LINE__);
-
-            g(
-                map &&
-                    map,
-                __FILE__,
-                __LINE__);
-            h(
-                map ||
-                    map,
-                __FILE__,
-                __LINE__);
-            i(
-                map
-                    + map,
-                __FILE__,
-                __LINE__);
-        }
-    }
-}
--- 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]
+            ]);
 }
--- a/tests/allman/assoc_key_indent.d.ref
+++ b/tests/allman/assoc_key_indent.d.ref
@ -1,8 +0,0 @@
-void main()
-{
-    string key;
-
-    int[string] var = [
-        key: 5
-    ];
-}
--- 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
--- 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))
+                                ]
+                            ])
+                        ])
+                ]
            ]
-        ]
-    ]);
+            ]);
 }
--- a/tests/allman/comments.d.ref
+++ b/tests/allman/comments.d.ref
@ -2,6 +2,6 @@ int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/
 {
    // comment on its own line
    foo() // comment on same line
-        .bar(); // also on same line
+    .bar(); // also on same line
    /* again */ // same line
 }
--- 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;
--- a/tests/allman/foreach_array.d.ref
+++ b/tests/allman/foreach_array.d.ref
@ -1,54 +0,0 @@
-static foreach (x; [
-    1,
-    2,
-    3,
-])
-{
-}
-
-static foreach_reverse (x; [
-    1,
-    2,
-    3,
-])
-{
-}
-
-void f()
-{
-    foreach (x; [
-        1,
-        2,
-        3,
-    ])
-    {
-    }
-    foreach_reverse (x; [
-        1,
-        2,
-        3,
-    ])
-    {
-    }
-
-    if (!SymbolTool.instance.workspacesFilesUris.canFind!sameFile(uri))
-    {
-        send(TextDocument.publishDiagnostics, new PublishDiagnosticsParams(uri, [
-        ]));
-    }
-
-    foreach (x; map([
-        1,
-        2,
-        3,
-    ]))
-    {
-    }
-    foreach (x; foo!(map!([
-        1,
-        2,
-        3,
-    ])))
-    {
-    }
-}
--- a/tests/allman/incomplete_alias.d.ref
+++ b/tests/allman/incomplete_alias.d.ref
@ -1 +0,0 @@
-alias u8 = ubyte
--- a/tests/allman/issue0134.d.ref
+++ b/tests/allman/issue0134.d.ref
@ -1,15 +0,0 @@
-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";
-    }
-}
--- a/tests/allman/issue0195.d.ref
+++ b/tests/allman/issue0195.d.ref
@ -1,16 +0,0 @@
-void main()
-{
-    auto myTid = runTask({
-        auto conn = connectTCP("localhost", 4222);
-
-        auto l = Lexer(conn);
-        foreach (t; l)
-        {
-
-        }
-        conn.close();
-    });
-
-    // foo
-    runEventLoop();
-}
--- a/tests/allman/issue0228.d.ref
+++ b/tests/allman/issue0228.d.ref
@ -1,8 +0,0 @@
-/* This test relies on ../.gitattributes to contain these lines:
-
-tests/issue0228.d               text eol=lf
-tests/allman/issue0228.d.ref    text eol=crlf
-tests/knr/issue0228.d.ref       text eol=crlf
-tests/otbs/issue0228.d.ref      text eol=crlf
-
-*/
--- a/tests/allman/issue0256.d.ref
+++ b/tests/allman/issue0256.d.ref
@ -1,11 +0,0 @@
-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
-    };
-}
--- a/tests/allman/issue0361.d.ref
+++ b/tests/allman/issue0361.d.ref
@ -1,15 +0,0 @@
-void foo() /**/
-in
-{
-}
-body
-{
-}
-
-void bar() /**/
-out
-{
-}
-body
-{
-}
--- a/tests/allman/issue0426.d.ref
+++ b/tests/allman/issue0426.d.ref
@ -1,6 +0,0 @@
-import std.stdio;
-
-@safe extern (C) void main()
-{
-    writeln("Hello World!");
-}
--- a/tests/allman/issue0430.d.ref
+++ b/tests/allman/issue0430.d.ref
@ -1,6 +0,0 @@
-void f(bool body)
-{
-    if (body)
-    {
-    }
-}
--- a/tests/allman/issue0432.d.ref
+++ b/tests/allman/issue0432.d.ref
@ -1,40 +0,0 @@
-struct S1
-{
-    ulong x;
-    ulong y;
-    ulong function(ulong) f;
-}
-
-struct S2
-{
-    ulong x;
-    ulong y;
-    ulong z;
-    ulong w;
-}
-
-// -----------------------------------------------------------------------------
-// Example 1
-// Anonymous function in struct, long struct initializer
-
-immutable S1 s1 = {
-    1111111111111111111, 1111111111111111111, (x) { return x + 1111; },
-};
-
-void f1()
-{
-}
-
-// -----------------------------------------------------------------------------
-// Example 2
-// Anonymous function anywhere, long struct initializer
-
-int function(int) f2 = (x) { return x + 1111; };
-
-immutable S2 s = {
-    1111111111111111111, 1111111111111111111, 1111111111111111111, 1111111111111111111,
-};
-
-void f2()
-{
-}
--- a/tests/allman/issue0433.d.ref
+++ b/tests/allman/issue0433.d.ref
@ -1,7 +0,0 @@
-int abs(int x)
-{
-    if (x < 0) // x negative, must negate
-        return -x;
-    else // x already non-negative, just return it
-        return x;
-}
--- a/tests/allman/issue0448.d.ref
+++ b/tests/allman/issue0448.d.ref
@ -1,4 +0,0 @@
-struct S
-{
-    invariant (true);
-}
--- a/tests/allman/issue0451.d.ref
+++ b/tests/allman/issue0451.d.ref
@ -1,40 +0,0 @@
-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;
-    }
-}
--- a/tests/allman/issue0452.d.ref
+++ b/tests/allman/issue0452.d.ref
@ -1,2 +0,0 @@
-@nogc //
-void foo();
--- a/tests/allman/issue0454.d.ref
+++ b/tests/allman/issue0454.d.ref
@ -1,10 +0,0 @@
-void main()
-{
-    format!"%s" //
-            ("");
-    format!("%s") //
-            ("");
-    format!("%s") //
-            ("", argument1, argument2, argument3, argument4, argument5,
-            argument6, argument7, argument8, argument9, argument10);
-}
--- a/tests/allman/issue0465.d.ref
+++ b/tests/allman/issue0465.d.ref
@ -1,8 +0,0 @@
-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;
-}
--- a/tests/allman/issue0476.d.ref
+++ b/tests/allman/issue0476.d.ref
@ -1,7 +0,0 @@
-string BuildForwardCall()
-{
-    return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `)))
-            {
-                return (mocked___.` ~ methodString ~ argsPassed ~ `);
-            }`;
-}
--- a/tests/allman/issue0483.d.ref
+++ b/tests/allman/issue0483.d.ref
@ -1,15 +0,0 @@
-module tests.issue0483;
-
-void main()
-{
-    switch (0)
-    {
-        case 1:
-        case 2:
-    label:
-        case 3:
-            break;
-        default:
-            break;
-    }
-}
--- a/tests/allman/issue0485.d.ref
+++ b/tests/allman/issue0485.d.ref
@ -1,5 +0,0 @@
-void main()
-{
-    int a;
-    int[int] hashmap = [a : a, a : a, a : a];
-}
--- a/tests/allman/issue0486.d.ref
+++ b/tests/allman/issue0486.d.ref
@ -1,5 +0,0 @@
-void main()
-{
-    auto someAutoVariableName = this.firstLink.secondLink
-        .filter!(shouldBeProbablySomeIdentifierOrNot);
-}
--- a/tests/allman/issue0494.d.ref
+++ b/tests/allman/issue0494.d.ref
@ -1,29 +0,0 @@
-void main()
-{
-    const a1 = [
-        builder.rebuild!((x, y, z) => x + y + z)
-            .rebuild!(x => x)
-            .rebuild!(x => x),
-    ];
-
-    const a2 = [
-        builder.rebuild!(x => x)
-            .rebuild!(x => x)
-            .rebuild!(x => x),
-        builder.rebuild!(x => x)
-            .rebuild!(x => x)
-            .rebuild!(x => x),
-    ];
-
-    foo([
-        line1,
-        value_line2_bla_bla_bla.propertyCallBlaBlaBla(a, b, c)
-            .propertyCallBlaBlaBla(a, b, c, d).propertyCallBlaBlaBla(a, b, c)
-            .propertyCallBlaBlaBla(a, b, c).value,
-    ]);
-}
-
-void foo()
-{
-    afdsafds.asdf.flub;
-}
--- a/tests/allman/issue0494_else.d.ref
+++ b/tests/allman/issue0494_else.d.ref
@ -1,74 +0,0 @@
-private void selectMember(Args...)(Args args)
-{
-    static if (true)
-    {
-        static if (args[0])
-        {
-        }
-        else
-        {
-        }
-    }
-    if (true)
-    {
-        if (args[0])
-        {
-        }
-        else
-        {
-        }
-    }
-}
-
-private void selectMember(Args...)(Args args)
-{
-    static if (true)
-    {
-        static if ([
-            0,
-            1,
-            2,
-            3,
-            4,
-        ])
-        {
-        }
-        else
-        {
-        }
-    }
-    if (true)
-    {
-        if (args[
-            0,
-            1,
-            2,
-            3,
-            4,
-        ])
-        {
-        }
-        else
-        {
-        }
-    }
-}
-
-void f()
-{
-    foreach (x; y)
-        if (foo)
-        {
-        }
-        else
-        {
-        }
-
-    if (a)
-        if (b)
-        {
-        }
-        else
-        {
-        }
-}
--- a/tests/allman/issue0494_keep_line_break.d.ref
+++ b/tests/allman/issue0494_keep_line_break.d.ref
@ -1,34 +0,0 @@
-void main()
-{
-    const a1 = [
-        builder
-            .rebuild!((x, y, z) => x + y + z)
-            .rebuild!(x => x)
-            .rebuild!(x => x),
-    ];
-
-    const a2 = [
-        builder
-            .rebuild!(x => x)
-            .rebuild!(x => x)
-            .rebuild!(x => x),
-        builder
-            .rebuild!(x => x)
-            .rebuild!(x => x)
-            .rebuild!(x => x),
-    ];
-
-    foo([
-        line1,
-        value_line2_bla_bla_bla.propertyCallBlaBlaBla(a, b, c)
-            .propertyCallBlaBlaBla(a, b, c, d).propertyCallBlaBlaBla(a, b, c)
-            .propertyCallBlaBlaBla(a, b, c).value,
-    ]);
-}
-
-void foo()
-{
-    afdsafds
-        .asdf
-        .flub;
-}
--- a/tests/allman/issue0497.d.ref
+++ b/tests/allman/issue0497.d.ref
@ -1,5 +0,0 @@
-alias f1 = S function();
-alias f2 = S!"foo" function();
-alias f3 = S!5 function();
-alias f4 = S!S function();
-alias f5 = S!(S) function();
--- a/tests/allman/issue0501.d.ref
+++ b/tests/allman/issue0501.d.ref
@ -1,4 +0,0 @@
-void main()
-{
-    auto aa = ["aaa": 1, "bbb": 2];
-}
--- a/tests/allman/issue0503.d.ref
+++ b/tests/allman/issue0503.d.ref
@ -1,15 +0,0 @@
-string f()
-{
-    return duration.total!"seconds".to!string;
-}
-
-string g()
-{
-    return duration.total!"seconds"().to!string;
-}
-
-string h()
-{
-    return duration.total!"seconds"().to!string.to!string.to!string.to!string.to!string.to!string
-        .to!string.to!string.to!string;
-}
--- a/tests/allman/issue0504.d.ref
+++ b/tests/allman/issue0504.d.ref
@ -1,40 +0,0 @@
-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()
-{
-}
--- a/tests/allman/issue0508.d.ref
+++ b/tests/allman/issue0508.d.ref
@ -1,7 +0,0 @@
-struct S
-{
-    @safe invariant
-    {
-        assert(true);
-    }
-}
--- a/tests/allman/issue0509.d.ref
+++ b/tests/allman/issue0509.d.ref
@ -1,34 +0,0 @@
-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
--- a/tests/allman/issue0515.d.ref
+++ b/tests/allman/issue0515.d.ref
@ -1,7 +0,0 @@
-struct S
-{
-    ref S foo() return
-    {
-        return this;
-    }
-}
--- a/tests/allman/issue0521.d.ref
+++ b/tests/allman/issue0521.d.ref
@ -1,17 +0,0 @@
-public int f() return
-in (true)
-{
-    return 0;
-}
-
-public int g() return
-out (; true)
-{
-    return 0;
-}
-
-public int h() return
-body
-{
-    return 0;
-}
--- a/tests/allman/issue0528.d.ref
+++ b/tests/allman/issue0528.d.ref
@ -1,4 +0,0 @@
-void f() return
-do
-{
-}
--- a/tests/allman/issue0552_cr.d.ref
+++ b/tests/allman/issue0552_cr.d.ref
@ -1 +0,0 @@
-/// Testing CR line endings.
void main()
{
}
--- a/tests/allman/issue0552_crlf.d.ref
+++ b/tests/allman/issue0552_crlf.d.ref
@ -1,4 +0,0 @@
-/// Testing CRLF line endings.
-void main()
-{
-}
--- a/tests/allman/issue0552_lf.d.ref
+++ b/tests/allman/issue0552_lf.d.ref
@ -1,4 +0,0 @@
-/// Testing LF line endings.
-void main()
-{
-}
--- a/tests/allman/issue0578.d.ref
+++ b/tests/allman/issue0578.d.ref
@ -1,8 +0,0 @@
-void f()
-{
-    auto t = true ? 1 : 0;
-    auto a = [true ? 1 : 0];
-    auto aa1 = [0: true ? 1 : 0];
-    auto aa2 = [0: true ? (false ? 1 : 2) : 3];
-    auto aa3 = [0: true ? false ? 1 : 2 : 3];
-}
--- a/tests/allman/issue0586.d.ref
+++ b/tests/allman/issue0586.d.ref
@ -1,38 +0,0 @@
-void temp(int v1, int v2)
-{
-}
-
-int f(int i)
-{
-    return i;
-}
-
-struct S
-{
-    int i;
-    int j;
-}
-
-void main()
-{
-    temp(v1: 1, v2: 2);
-    temp(v1: 1, v2: 2,);
-
-    auto s = S(5, j: 3);
-
-    temp(v1: 1, v2: f(i: 2));
-
-    temp(v1: true ? i : false ? 2 : f(i: 3), v2: 4);
-
-    temp(v1: () { S s = S(i: 5); return s.i; }, v2: 1);
-}
-
-void test()
-{
-    return Struct(foo: field.foo, bar: field.bar, baz: field.baz);
-    return new Class(foo: field.foo, bar: field.bar, baz: field.baz);
-    // anonymous class
-    return new class(foo: field.foo, bar: field.bar, baz: field.baz) Class
-    {
-    };
-}
--- a/tests/allman/keep_break_in_array_arg.d.ref
+++ b/tests/allman/keep_break_in_array_arg.d.ref
@ -1,11 +0,0 @@
-unittest
-{
-    f([
-        x
-    ]);
-}
-
-void f(T[] x,
-        const U y)
-{
-}
--- a/tests/allman/keep_break_in_array_chain.d.ref
+++ b/tests/allman/keep_break_in_array_chain.d.ref
@ -1,7 +0,0 @@
-unittest
-{
-    functionLengthDoesMatter([
-        firstFunctionInChain("A").seconFunctionInChain("B").value,
-        firstFunctionInChain("A").seconFunctionInChain("B").value
-    ]);
-}
--- a/tests/allman/keep_line_breaks.d.ref
+++ b/tests/allman/keep_line_breaks.d.ref
@ -1,38 +0,0 @@
-@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);
-
-    `
-        <html>
-        </html>
-    `.format!"%s";
-
-    return [
-        3, 5,
-        5, 7,
-        11, 13,
-    ];
-}
--- a/tests/allman/keep_single_indent.d.ref
+++ b/tests/allman/keep_single_indent.d.ref
@ -1,49 +0,0 @@
-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);
-}
--- a/tests/allman/single_indent.d.ref
+++ b/tests/allman/single_indent.d.ref
@ -1,41 +0,0 @@
-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);
-}
--- a/tests/allman/space_after_keywords.d.ref
+++ b/tests/allman/space_after_keywords.d.ref
@ -1,15 +0,0 @@
-void main(string[] args)
-{
-    for(int i = 0; i < 10; ++i)
-    {
-        if(i == 9)
-            break;
-    }
-    while(false)
-    {
-    }
-
-    foreach(i; 0 .. 9)
-    {
-    }
-}
--- a/tests/argument_chain_indent.args
+++ b/tests/argument_chain_indent.args
@ -1 +0,0 @@
--single_indent=true
--- a/tests/argument_chain_indent.d
+++ b/tests/argument_chain_indent.d
@ -1,60 +0,0 @@
-class C
-{
-    void f()
-    {
-        if (true)
-        {
-            f(
-                map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __LINE__);
-
-            g(
-                map && map && map && map && map && map && map && map && map && map && map && map,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __LINE__);
-            h(
-                map || map || map || map || map || map || map || map || map || map || map || map,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __LINE__);
-            i(
-                map + map + map + map + map + map + map + map + map + map + map + map + map + map + map + map + map
-                    + map,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __FILE__,
-                    __LINE__);
-        }
-    }
-}
--- a/tests/argument_chain_keep_breaks.args
+++ b/tests/argument_chain_keep_breaks.args
@ -1,2 +0,0 @@
--single_indent=true
--keep_line_breaks=true
--- a/tests/argument_chain_keep_breaks.d
+++ b/tests/argument_chain_keep_breaks.d
@ -1,31 +0,0 @@
-class C
-{
-    void f()
-    {
-        if (true)
-        {
-            f(
-                array.map!(a => a.prop)
-                    .array
-                    .to!string,
-                __FILE__,
-                __LINE__);
-
-            g(
-                map &&
-                    map,
-                    __FILE__,
-                    __LINE__);
-            h(
-                map ||
-                    map,
-                    __FILE__,
-                    __LINE__);
-            i(
-                map
-                    + map,
-                    __FILE__,
-                    __LINE__);
-        }
-    }
-}
--- a/tests/assoc_key_indent.args
+++ b/tests/assoc_key_indent.args
@ -1 +0,0 @@
--keep_line_breaks=true
--- a/tests/assoc_key_indent.d
+++ b/tests/assoc_key_indent.d
@ -1,8 +0,0 @@
-void main()
-{
-    string key;
-
-    int[string] var = [
-        key: 5
-    ];
-}
--- a/tests/expected_failures/issue0469.d
+++ b/tests/expected_failures/issue0469.d
@ -1 +0,0 @@
-import std.stdio; void main() { writeln("\eee8Hello"); int a = 5; }
--- a/tests/expected_failures/issue0568.d
+++ b/tests/expected_failures/issue0568.d
@ -1 +0,0 @@
-### This file should not be erased just because it is not formatted correctly
--- a/tests/foreach_array.args
+++ b/tests/foreach_array.args
@ -1 +0,0 @@
--keep_line_breaks true
--- a/tests/foreach_array.d
+++ b/tests/foreach_array.d
@ -1,53 +0,0 @@
-static foreach (x; [
-    1,
-    2,
-    3,
-])
-{
-}
-
-static foreach_reverse (x; [
-    1,
-    2,
-    3,
-])
-{
-}
-
-void f()
-{
-    foreach (x; [
-        1,
-        2,
-        3,
-    ])
-    {
-    }
-    foreach_reverse (x; [
-        1,
-        2,
-        3,
-    ])
-    {
-    }
-
-    if (!SymbolTool.instance.workspacesFilesUris.canFind!sameFile(uri))
-    {
-        send(TextDocument.publishDiagnostics, new PublishDiagnosticsParams(uri, []));
-    }
-
-    foreach (x; map([
-            1,
-            2,
-            3,
-        ]))
-    {
-    }
-    foreach (x; foo!(map!([
-            1,
-            2,
-            3,
-        ])))
-    {
-    }
-}
--- a/tests/gen_expected.sh
+++ b/tests/gen_expected.sh
@ -1,12 +1,10 @@
-#!/usr/bin/env bash
-
 argsFile=$1.args
 if [ -e ${argsFile} ]; then
 	args=$(cat ${argsFile})
 fi
 echo "Args:" ${args}
-../bin/dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref
-../bin/dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref
+dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref
+dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref

 echo "------------------"
 echo "allman:"
--- a/tests/incomplete_alias.d
+++ b/tests/incomplete_alias.d
@ -1 +0,0 @@
-alias u8 = ubyte
--- a/tests/issue0134.d
+++ b/tests/issue0134.d
@ -1,11 +0,0 @@
-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";
-	}
-}
--- a/tests/issue0195.d
+++ b/tests/issue0195.d
@ -1,17 +0,0 @@
-void main()
-{
-    auto myTid = runTask({
-        auto conn = connectTCP("localhost", 4222);
-
-        auto l = Lexer(conn);
-        foreach (t;
-        l)
-        {
-
-        }
-        conn.close();
-    });
-
-    // foo
-    runEventLoop();
-}
--- a/tests/issue0228.args
+++ b/tests/issue0228.args
@ -1 +0,0 @@
--end_of_line=crlf
--- a/tests/issue0228.d
+++ b/tests/issue0228.d
@ -1,8 +0,0 @@
-/* This test relies on ../.gitattributes to contain these lines:
-
-tests/issue0228.d               text eol=lf
-tests/allman/issue0228.d.ref    text eol=crlf
-tests/knr/issue0228.d.ref       text eol=crlf
-tests/otbs/issue0228.d.ref      text eol=crlf
-
-*/
--- a/tests/issue0256.d
+++ b/tests/issue0256.d
@ -1,15 +0,0 @@
-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
-    };
-}
--- a/tests/issue0361.d
+++ b/tests/issue0361.d
@ -1,15 +0,0 @@
-void foo() /**/
-in
-{
-}
-body
-{
-}
-
-void bar() /**/
-out
-{
-}
-body
-{
-}
--- a/tests/issue0426.d
+++ b/tests/issue0426.d
@ -1,5 +0,0 @@
-import std.stdio;
-
-@safe extern(C) void main() {
-    writeln("Hello World!");
-}
--- a/tests/issue0430.d
+++ b/tests/issue0430.d
@ -1,4 +0,0 @@
-void f(bool body) {
-	if (body) {
-	}
-}
--- a/tests/issue0432.d
+++ b/tests/issue0432.d
@ -1,38 +0,0 @@
-struct S1
-{
-    ulong x;
-    ulong y;
-    ulong function(ulong)f;
-}
-
-struct S2
-{
-    ulong x;
-    ulong y;
-    ulong z;
-    ulong w;
-}
-
-// -----------------------------------------------------------------------------
-// Example 1
-// Anonymous function in struct, long struct initializer
-
-immutable S1 s1 = {
-    1111111111111111111, 1111111111111111111, (x) { return x + 1111; },};
-
-    void f1()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// Example 2
-// Anonymous function anywhere, long struct initializer
-
-int function(int) f2 = (x) { return x + 1111; };
-
-immutable S2 s = {
-    1111111111111111111, 1111111111111111111, 1111111111111111111, 1111111111111111111,};
-
-    void f2()
-    {
-    }
--- a/tests/issue0433.d
+++ b/tests/issue0433.d
@ -1,8 +0,0 @@
-int abs(int x) {
-	if (x < 0)
-		// x negative, must negate
-		return -x;
-	else
-		// x already non-negative, just return it
-		return x;
-}
--- a/tests/issue0448.d
+++ b/tests/issue0448.d
@ -1,4 +0,0 @@
-struct S
-{
-    invariant(true);
-}
--- a/tests/issue0451.d
+++ b/tests/issue0451.d
@ -1,40 +0,0 @@
-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;
-    }
-}
--- a/tests/issue0452.d
+++ b/tests/issue0452.d
@ -1,3 +0,0 @@
-@nogc
-//
-void foo();
--- a/tests/issue0454.d
+++ b/tests/issue0454.d
@ -1,9 +0,0 @@
-void main()
-{
-    format!"%s" //
-        ("");
-    format!("%s") //
-        ("");
-    format!("%s") //
-        ("", argument1, argument2, argument3, argument4, argument5, argument6, argument7, argument8, argument9, argument10);
-}
--- a/tests/issue0465.d
+++ b/tests/issue0465.d
@ -1,9 +0,0 @@
-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;
-}
--- a/tests/issue0476.d
+++ b/tests/issue0476.d
@ -1,7 +0,0 @@
-string BuildForwardCall()
-{
-    return `static if (is(typeof(mocked___.` ~ methodString ~ argsPassed ~ `)))
-            {
-                return (mocked___.` ~ methodString ~ argsPassed ~ `);
-            }`;
-}
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Subproject commit 206a2e6abd97b4462f3a320e4f2d23986fad3cff`
				`@ -1 +0,0 @@`
				`/// Testing CR line endings. void main() { }`
				`@ -1 +0,0 @@`
				`import std.stdio; void main() { writeln("\eee8Hello"); int a = 5; }`
				`@ -1 +0,0 @@`
				`### This file should not be erased just because it is not formatted correctly`