From 58302432cc5fdc3c191ef20bf104b6f803b6731d Mon Sep 17 00:00:00 2001
From: Joshua Spence <josh@joshuaspence.com>
Date: Fri, 17 Jul 2015 16:40:45 +1000
Subject: [PATCH] Fix brace formatting linter rule

Summary: Fixes T8847.

Test Plan:
Ran `arc lint` on a test file:

```lang=php
<?php

if ($x) {
  echo 'foo';
}else {
  echo 'bar';
}
```

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T8847

Differential Revision: https://secure.phabricator.com/D13633
---
 .../linter/__tests__/xhpast/creative-brace-use.lint-test     | 5 +++++
 .../xhpast/rules/ArcanistBraceFormattingXHPASTLinterRule.php | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test b/src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test
index 969417cc..1832ec1e 100644
--- a/src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test
+++ b/src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test
@@ -35,6 +35,8 @@ if ($x) {}
 else if ($y) {}
 else {}
 
+if ($x) {}else{}
+
 declare(ticks = 1);
 ~~~~~~~~~~
 advice:3:14
@@ -52,6 +54,7 @@ warning:31:6
 warning:32:4
 warning:34:11
 warning:35:16
+warning:38:11
 ~~~~~~~~~~
 <?php
 
@@ -77,4 +80,6 @@ do baz(); while ($x);
 
 if ($x) {} else if ($y) {} else {}
 
+if ($x) {} else{}
+
 declare(ticks = 1);
diff --git a/src/lint/linter/xhpast/rules/ArcanistBraceFormattingXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistBraceFormattingXHPASTLinterRule.php
index b1bbedc4..d2908154 100644
--- a/src/lint/linter/xhpast/rules/ArcanistBraceFormattingXHPASTLinterRule.php
+++ b/src/lint/linter/xhpast/rules/ArcanistBraceFormattingXHPASTLinterRule.php
@@ -20,6 +20,7 @@ final class ArcanistBraceFormattingXHPASTLinterRule
         continue;
       }
       list($before, $after) = $list->getSurroundingNonsemanticTokens();
+
       if (!$before) {
         $first = head($tokens);
 
@@ -39,6 +40,7 @@ final class ArcanistBraceFormattingXHPASTLinterRule
           ' '.$first->getValue());
       } else if (count($before) === 1) {
         $before = reset($before);
+
         if ($before->getValue() !== ' ') {
           $this->raiseLintAtToken(
             $before,
@@ -78,7 +80,7 @@ final class ArcanistBraceFormattingXHPASTLinterRule
       }
       list($before, $after) = $list->getSurroundingNonsemanticTokens();
       if (!$before) {
-        $first = last($tokens);
+        $first = head($tokens);
 
         $this->raiseLintAtToken(
           $first,