Format a chunk of the codebase

Summary:
https://fb.workplace.com/groups/668453703203248/posts/7137820676266486

the_time_has_come

Running the files in this commit through the equivilant of `hackfmt -i <file>`

allow-large-files
allow_many_files
bypass-lint
drop-conflicts

Reviewed By: ravibhoraskar, shashkambh

Differential Revision: D32712845

fbshipit-source-id: 6e195773762601f3ca63b9808f35de5f00fac880

Author: DavidSnider

src/ColoredUnifiedDiff.php

@@ -98,13 +98,10 @@ final public static function create(
       if ($line[0] === '-') {
         $next = C\first($lines);
         if (
-          $next !== null
-          && $next !== ''
-          && $next[0] === '+'
+          $next !== null && $next !== '' && $next[0] === '+'
           // Levenshtein function throws for strings with length > 255
           // Don't need intra word diffs for long lines
-          && Str\length($line) < 256
-          && Str\length($next) < 256
+          && Str\length($line) < 256 && Str\length($next) < 256
           // -2 to deal with the prefix
           /* HH_FIXME[4107] using directly because this is open source */
           /* HH_FIXME[2049] using directly because this is open source */
@@ -115,8 +112,18 @@ final public static function create(
           $next = Str\slice($next, 1);
           $lines = Vec\drop($lines, 1);
 
-          $words_line = vec(\preg_split('/([^a-zA-Z0-9_]+)/', $line, -1, \PREG_SPLIT_DELIM_CAPTURE));
-          $words_next = vec(\preg_split('/([^a-zA-Z0-9_]+)/', $next, -1, \PREG_SPLIT_DELIM_CAPTURE));
+          $words_line = vec(\preg_split(
+            '/([^a-zA-Z0-9_]+)/',
+            $line,
+            -1,
+            \PREG_SPLIT_DELIM_CAPTURE,
+          ));
+          $words_next = vec(\preg_split(
+            '/([^a-zA-Z0-9_]+)/',
+            $next,
+            -1,
+            \PREG_SPLIT_DELIM_CAPTURE,
+          ));
           $intraline = (new StringDiff($words_line, $words_next))->getDiff();
           $out[] = $intraline
             |> Vec\filter($$, $op ==> !$op->isInsertOp())

src/Diff.php

@@ -76,27 +76,18 @@ final public function getDiff(): vec<DiffOp<this::TContent>> {
       list($x, $y) = $from;
       $prev = $to;
       if ($to === tuple($x + 1, $y + 1)) {
-        $diff[] = new DiffKeepOp(
-          $a[$x]['pos'],
-          $b[$y]['pos'],
-          $a[$x]['content'],
-        );
+        $diff[] =
+          new DiffKeepOp($a[$x]['pos'], $b[$y]['pos'], $a[$x]['content']);
         continue;
       }
 
       if ($to === tuple($x + 1, $y)) {
-        $diff[] = new DiffDeleteOp(
-          $a[$x]['pos'],
-          $a[$x]['content'],
-        );
+        $diff[] = new DiffDeleteOp($a[$x]['pos'], $a[$x]['content']);
         continue;
       }
 
       if ($to === tuple($x, $y + 1)) {
-        $diff[] = new DiffInsertOp(
-          $b[$y]['pos'],
-          $b[$y]['content'],
-        );
+        $diff[] = new DiffInsertOp($b[$y]['pos'], $b[$y]['content']);
         continue;
       }
 
@@ -206,8 +197,8 @@ private function getMoves(): vec<this::TMove> {
         // Decide which option we're taking for this diagonal
         if (
           // if ===, can't be -1 as $diagonal >= -$cost
-          $diagonal === -$cost
-          || (
+          $diagonal === -$cost ||
+          (
             // if ===, must be -1 as $diagonal <= $cost
             $diagonal !== $cost
             // Okay, we can choose.
@@ -218,7 +209,8 @@ private function getMoves(): vec<this::TMove> {
             // is generally expected, and considered more readable than:
             //     +foof
             //     -foo
-            && $best_points[$diagonal - 1] < $best_points[$diagonal + 1]
+            &&
+            $best_points[$diagonal - 1] < $best_points[$diagonal + 1]
           )
         ) {
           // keep x, increase $y (add a insertion)
@@ -278,10 +270,10 @@ private function backtrackPath(
        * diagonal moves. Which?
        */
       if (
-        $diagonal === -$cost
-        || (
-          $diagonal !== $cost
-          && $best_points[$diagonal - 1] < $best_points[$diagonal + 1]
+        $diagonal === -$cost ||
+        (
+          $diagonal !== $cost &&
+          $best_points[$diagonal - 1] < $best_points[$diagonal + 1]
         )
       ) {
         $diagonal = $diagonal + 1;

src/DiffDeleteOp.php

@@ -12,10 +12,7 @@
 
 /** An operation representing deleting an element from the original sequence */
 final class DiffDeleteOp<TContent> extends DiffOp<TContent> {
-  public function __construct(
-    private int $oldPos,
-    private TContent $content,
-  ) {
+  public function __construct(private int $oldPos, private TContent $content) {
   }
 
   public function getOldPos(): int {

src/DiffInsertOp.php

@@ -12,10 +12,7 @@
 
 /** An operation representing an insertion into the sequence */
 final class DiffInsertOp<TContent> extends DiffOp<TContent> {
-  public function __construct(
-    private int $newPos,
-    private TContent $content,
-  ) {
+  public function __construct(private int $newPos, private TContent $content) {
   }
 
   public function getNewPos(): int {
@@ -29,7 +26,7 @@ public function getContent(): TContent {
 
   <<__Override>>
   public function isInsertOp(): bool {
-      return true;
+    return true;
   }
 
   <<__Override>>

src/StringDiff.php

@@ -90,9 +90,7 @@ public function getUnifiedDiff(int $context = 3): string {
       |> Str\join($$, '');
   }
 
-  private function getUnifiedDiffHunk(
-    vec<DiffOp<string>> $hunk,
-  ): ?string {
+  private function getUnifiedDiffHunk(vec<DiffOp<string>> $hunk): ?string {
     if (C\is_empty($hunk)) {
       return null;
     }
@@ -132,10 +130,7 @@ private function getUnifiedDiffHunk(
         continue;
       }
 
-      invariant_violation(
-        'Unsupported diff op: %s',
-        \get_class($op),
-      );
+      invariant_violation('Unsupported diff op: %s', \get_class($op));
     }
     invariant($old_start !== null, 'failed to find an old pos');
     invariant($new_start !== null, 'failed to find a new pos');
@@ -148,6 +143,8 @@ private function getUnifiedDiffHunk(
       "@@ -%s +%s @@\n",
       $format($old_start + 1, $old_lines),
       $format($new_start + 1, $new_lines),
-    ).Str\join($lines, "\n")."\n";
+    ).
+      Str\join($lines, "\n").
+      "\n";
   }
 }

src/cluster.php

@@ -17,9 +17,7 @@
  * For example, `[insert(a), insert(b), keep(c), insert(d), insert(e)]` will
  * be transformed to `[insert([a, b]), keep([c]), insert([d, e])`.
  */
-function cluster<T>(
-  vec<DiffOp<T>> $diff,
-): vec<DiffOp<vec<T>>> {
+function cluster<T>(vec<DiffOp<T>> $diff): vec<DiffOp<vec<T>>> {
   $clusters = vec[];
   while (!C\is_empty($diff)) {
     $class = $diff[0]->getDiffOpClass();
@@ -63,6 +61,6 @@ function cluster<T>(
       }
 
       invariant_violation('invalid op kind: %s', \get_class($first));
-    }
+    },
   );
 }