Clean up more unused @psalm-suppress annotations

src/Psalm/Config/FileFilter.php

@@ -75,17 +75,8 @@ class FileFilter
      */
     protected $declare_strict_types = [];
 
-    /**
-     * @param  bool             $inclusive
-     *
-     * @psalm-suppress DocblockTypeContradiction
-     */
-    public function __construct($inclusive)
+    public function __construct(bool $inclusive)
     {
-        if (!is_bool($inclusive)) {
-            throw new \InvalidArgumentException('Filter arg must be bool');
-        }
-
         $this->inclusive = $inclusive;
     }
 

src/Psalm/Internal/Codebase/Analyzer.php

@@ -539,10 +539,6 @@ class Analyzer
                 $codebase->file_reference_provider->addIssue($issue_data['file_path'], $issue_data);
             }
         }
-
-        if ($codebase->track_unused_suppressions) {
-            IssueBuffer::processUnusedSuppressions($codebase->file_provider);
-        }
     }
 
     /**

src/Psalm/Internal/Diff/NamespaceStatementsDiffer.php

@@ -34,7 +34,6 @@ class NamespaceStatementsDiffer extends AstDiffer
             /**
              * @param string $a_code
              * @param string $b_code
-             * @psalm-suppress UnusedParam
              *
              * @return bool
              */

src/Psalm/Internal/Fork/PsalmRestarter.php

@@ -34,8 +34,6 @@ class PsalmRestarter extends \Composer\XdebugHandler\XdebugHandler
     }
 
     /**
-     * @psalm-suppress UnusedMethod
-     *
      * @param mixed $loaded
      */
     protected function requiresRestart($loaded)
@@ -56,8 +54,6 @@ class PsalmRestarter extends \Composer\XdebugHandler\XdebugHandler
     }
 
     /**
-     * @psalm-suppress UnusedMethod
-     *
      * @param mixed $command
      *
      * @return void

src/Psalm/Internal/LanguageServer/EmitterTrait.php

@@ -122,7 +122,6 @@ trait EmitterTrait
         // The list is not sorted
         if (!$this->listeners[$eventName][0]) {
             // Sorting
-            /** @psalm-suppress MixedArgument */
             \array_multisort($this->listeners[$eventName][1], SORT_NUMERIC, $this->listeners[$eventName][2]);
 
             // Marking the listeners as sorted

src/Psalm/Internal/PluginManager/Command/ShowCommand.php

@@ -30,7 +30,6 @@ class ShowCommand extends Command
 
     /**
      * @return void
-     * @psalm-suppress UnusedMethod
      */
     protected function configure()
     {
@@ -42,7 +41,6 @@ class ShowCommand extends Command
 
     /**
      * @return null|int
-     * @psalm-suppress UnusedMethod
      */
     protected function execute(InputInterface $i, OutputInterface $o)
     {

src/Psalm/Internal/Visitor/SimpleNameResolver.php

@@ -175,7 +175,6 @@ class SimpleNameResolver extends NodeVisitorAbstract
      * @param  PhpParser\Node|string|null $node
      *
      * @return null|PhpParser\Node\Identifier|PhpParser\Node\Name|PhpParser\Node\NullableType
-     * @psalm-suppress MoreSpecificReturnType
      * @psalm-suppress InvalidReturnType
      * @psalm-suppress InvalidReturnStatement
      */

tests/PsalmPluginTest.php

@@ -142,7 +142,6 @@ class PsalmPluginTest extends TestCase
      * @return void
      * @dataProvider commands
      * @test
-     * @psalm-suppress RedundantConditionGivenDocblockType
      */
     public function showsHelpForCommand(string $command)
     {

tests/TestCase.php

@@ -105,9 +105,7 @@ class TestCase extends BaseTestCase
             $this->project_analyzer->interpretRefactors();
         }
 
-        if ($track_unused_suppressions) {
-            $this->project_analyzer->trackUnusedSuppressions();
-        }
+        $this->project_analyzer->trackUnusedSuppressions();
 
         $file_analyzer = new FileAnalyzer(
             $this->project_analyzer,

tests/UnusedCodeTest.php

@@ -64,6 +64,8 @@ class UnusedCodeTest extends TestCase
         $this->analyzeFile($file_path, $context, false);
 
         $this->project_analyzer->checkClassReferences();
+
+        \Psalm\IssueBuffer::processUnusedSuppressions($this->project_analyzer->getCodebase()->file_provider);
     }
 
     /**
@@ -98,9 +100,11 @@ class UnusedCodeTest extends TestCase
         $context = new Context();
         $context->collect_references = true;
 
-        $this->analyzeFile($file_path, $context);
+        $this->analyzeFile($file_path, $context, false);
 
         $this->project_analyzer->checkClassReferences();
+
+        \Psalm\IssueBuffer::processUnusedSuppressions($this->project_analyzer->getCodebase()->file_provider);
     }
 
     /**
@@ -499,6 +503,17 @@ class UnusedCodeTest extends TestCase
                         return $foo;
                     }',
             ],
+            'suppressUnusedMethod' => [
+                '<?php
+                    class A {
+                        /**
+                         * @psalm-suppress UnusedMethod
+                         */
+                        public function foo() : void {}
+                    }
+
+                    new A();'
+            ],
         ];
     }