Fix #223

src/dfmt/formatter.d

@@ -493,6 +493,9 @@ private:
         writeToken();
         if (p == tok!"(")
         {
+            if (isBlockHeaderToken(tokens[index - 2].type))
+                indents.push(tok!")");
+            else
                 indents.push(p);
             spaceAfterParens = true;
             parenDepth++;
@@ -527,9 +530,9 @@ private:
     body
     {
         parenDepth--;
-        if (parenDepth == 0 && indents.topIs(tok!"!"))
-            indents.pop();
         indents.popWrapIndents();
+        while (indents.topIsOneOf(tok!"!", tok!")"))
+            indents.pop();
         if (indents.topIs(tok!"("))
             indents.pop();
 

src/dfmt/globmatch_editorconfig.d

@@ -11,9 +11,9 @@ 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 if (isForwardRange!Range
+    Range path, const(C)[] pattern) @safe pure nothrow 
-        && isSomeChar!(ElementEncodingType!Range) && isSomeChar!C
+        if (isForwardRange!Range && isSomeChar!(ElementEncodingType!Range)
-        && is(Unqual!C == Unqual!(ElementEncodingType!Range)))
+            && isSomeChar!C && is(Unqual!C == Unqual!(ElementEncodingType!Range)))
 in
 {
     // Verify that pattern[] is valid

src/dfmt/indentation.d

@@ -13,7 +13,7 @@ import dparse.lexer;
 bool isWrapIndent(IdType type) pure nothrow @nogc @safe
 {
     return type != tok!"{" && type != tok!"case" && type != tok!"@"
-        && type != tok!"]" && type != tok!"(" && isOperator(type);
+        && type != tok!"]" && type != tok!"(" && type != tok!")" && isOperator(type);
 }
 
 /**
@@ -21,7 +21,7 @@ bool isWrapIndent(IdType type) pure nothrow @nogc @safe
  */
 bool isTempIndent(IdType type) pure nothrow @nogc @safe
 {
-    return type != tok!"{" && type != tok!"case" && type != tok!"@";
+    return type != tok!")" && type != tok!"{" && type != tok!"case" && type != tok!"@";
 }
 
 /**
@@ -175,29 +175,29 @@ private:
         int parenCount;
         foreach (i; 0 .. j)
         {
+            immutable int pc = (arr[i] == tok!"!" || arr[i] == tok!"(" || arr[i] == tok!")") ? parenCount + 1
+                : parenCount;
+            if ((isWrapIndent(arr[i]) || arr[i] == tok!"(") && parenCount > 1)
+            {
+                parenCount = pc;
+                continue;
+            }
             if (i + 1 < index)
             {
-                if (arr[i] == tok!"(")
+                if (arr[i] == tok!"]")
-                    parenCount++;
-                else if (arr[i] == tok!"]")
                     continue;
-                else
+                immutable currentIsNonWrapTemp = !isWrapIndent(arr[i])
+                    && isTempIndent(arr[i]) && arr[i] != tok!")" && arr[i] != tok!"!";
+                if (currentIsNonWrapTemp && (arr[i + 1] == tok!"switch"
+                        || arr[i + 1] == tok!"{" || arr[i + 1] == tok!")"))
                 {
-                    if (isWrapIndent(arr[i]) && parenCount > 0)
+                    parenCount = pc;
-                    {
-                        parenCount = 0;
                     continue;
                 }
-                    parenCount = 0;
-                }
-                immutable currentIsNonWrapTemp = !isWrapIndent(arr[i]) && isTempIndent(arr[i]);
-                immutable nextIsParenOrSwitch = arr[i + 1] == tok!"("
-                    || arr[i + 1] == tok!"switch" || arr[i + 1] == tok!"{";
-                if (currentIsNonWrapTemp && nextIsParenOrSwitch)
-                    continue;
             }
             if (arr[i] == tok!"!")
                 size++;
+            parenCount = pc;
             size++;
         }
         return size;

src/dfmt/wrapping.d

@@ -153,8 +153,7 @@ size_t[] chooseLineBreakTokens(size_t index, const Token[] tokens,
             return genRetVal(current.breaks, index);
         }
         validMoves!(typeof(open))(open, tokens[0 .. tokensEnd],
-                depths[0 .. tokensEnd], current.breaks, config, currentLineLength,
+                depths[0 .. tokensEnd], current.breaks, config, currentLineLength, indentLevel);
-                indentLevel);
     }
     if (open.empty)
         return genRetVal(lowest.breaks, index);

tests/allman/issue0223.d.ref

@@ -0,0 +1,8 @@
+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);
+}

tests/issue0223.d

@@ -0,0 +1,8 @@
+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);
+}

tests/otbs/issue0223.d.ref

@@ -0,0 +1,7 @@
+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);
+}