Suppress lint error according to error code level markers

hhvm · Nov 10, 2021 · c53996c · c53996c
1 parent 14a11d4
commit c53996c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 9 deletions.
diff --git a/src/Linters/HHClientLintError.hack b/src/Linters/HHClientLintError.hack
@@ -63,7 +63,7 @@ final class HHClientLintError implements LintError {
   }
 
   <<__Memoize>>
-  public function getLintRule(): LintRule {
+  public function getLintRule(): HHClientLintRule {
     return new HHClientLintRule($this->error['code']);
   }
 

diff --git a/src/Linters/HHClientLinter.hack b/src/Linters/HHClientLinter.hack
@@ -59,13 +59,35 @@ final class HHClientLinter implements Linter {
       ),
     );
     $file_lines = Str\split($this->getFile()->getContents(), "\n");
-    return Vec\map(
-      $hh_client_lint_result['errors'],
-      $error ==> new HHClientLintError(
-        $this->file,
-        $error,
-        $this::blameCode($file_lines, $error),
-      ),
-    );
+    return $hh_client_lint_result['errors']
+      |> Vec\map(
+        $$,
+        $error ==> new HHClientLintError(
+          $this->file,
+          $error,
+          $this::blameCode($file_lines, $error),
+        ),
+      )
+      |> Vec\filter($$, $error ==> {
+        if ($error->getLintRule()->isSuppressedForFile($this->file)) {
+          return false;
+        }
+        $range = $error->getRange();
+        if ($range is null) {
+          return true;
+        }
+        list(list($line_number, $_), $_) = $range;
+        $previous_line_number = $line_number - 1;
+        if ($this->isSuppressedForLine($this->file, $previous_line_number)) {
+          return false;
+        }
+        if (
+          $error->getLintRule()
+            ->isSuppressedForLine($this->file, $previous_line_number)
+        ) {
+          return false;
+        }
+        return true;
+      });
   }
 }
diff --git a/tests/HHClientLinterTest.hack b/tests/HHClientLinterTest.hack
@@ -24,6 +24,16 @@ final class HHClientLinterTest extends TestCase {
   public function getCleanExamples(): vec<(string)> {
     return vec[
       tuple("<?hh\nclass Foo {}"),
+      tuple(
+        '<?hh
+        function invalid_null_check(): void {
+          $cannot_be_null = 42;
+          // HHAST_FIXME[5611]
+          if ($cannot_be_null is null) {
+            throw new Exception();
+          }
+        }',
+      ),
     ];
   }