Merge pull request #423 from WebFreak001/aa3

fix array item access regression
merged-on-behalf-of: Brian Schott <Hackerpilot@users.noreply.github.com>

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(" ");

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]
+            ]);
+}

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();
+        }
+    });
+}

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]]);
+}

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();
+			 }
+		 }
+	);
+}

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]
+            ]);
+}

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();
+        }
+    });
+}