Sync with FB www

fbshipit-source-id: a44ef3ef5326a9f948ce5057ad69317062ae9dfa

Author: fredemmott

src/ColoredUnifiedDiff.php

@@ -56,13 +56,13 @@ protected static function colorDeleteLineWithIntralineEdits(
    * The default implementation prepends `+ ` then delegates to
    * `colorInsertLine()` without doing any special handling.
    */
-	protected static function colorInsertLineWithIntralineEdits(
-		vec<DiffOp<string>> $ops,
-	): TOut {
-		return static::colorInsertLine(
-			'+ '.(Vec\map($ops, $op ==> $op->getContent()) |> Str\join($$, '')),
-		);
-	}
+  protected static function colorInsertLineWithIntralineEdits(
+    vec<DiffOp<string>> $ops,
+  ): TOut {
+    return static::colorInsertLine(
+      '+ '.(Vec\map($ops, $op ==> $op->getContent()) |> Str\join($$, '')),
+    );
+  }
 
 
   abstract protected static function join(vec<TOut> $lines): TOut;
@@ -103,6 +103,8 @@ final public static function create(
           && $next !== ''
           && $next[0] === '+'
           // -2 to deal with the prefix
+          /* HH_IGNORE_ERROR[4107] using directly because this is open source */
+          /* HH_IGNORE_ERROR[2049] using directly because this is open source */
           && \levenshtein($line, $next) - 2 <= (0.5 * (Str\length($line) - 2))
         ) {
           // Drop the prefix

tests/StringDiffTest.php

@@ -13,6 +13,8 @@
 use namespace HH\Lib\{C, Str, Vec};
 use function Facebook\FBExpect\expect;
 
+// @oss-disable: use type \DataProvider;
+
 /** Test string-specific functionality */
 final class StringDiffTest extends \Facebook\HackTest\HackTest {
   public function testDiffLines(): void {