Add number of threads to progress output

Author: danog

src/Psalm/Internal/Analyzer/ProjectAnalyzer.php

@@ -462,7 +462,7 @@ public function check(string $base_dir, bool $is_diff = false): void
         }
 
         $this->progress->write($this->generatePHPVersionMessage());
-        $this->progress->startPhase(Phase::SCAN);
+        $this->progress->startPhase(Phase::SCAN, $this->scanThreads);
 
         $diff_no_files = false;
 
@@ -520,7 +520,7 @@ public function check(string $base_dir, bool $is_diff = false): void
             $this->config->eventDispatcher->dispatchAfterCodebasePopulated($event);
         }
 
-        $this->progress->startPhase(Phase::ANALYSIS);
+        $this->progress->startPhase(Phase::ANALYSIS, $this->threads);
 
         $this->codebase->analyzer->analyzeFiles(
             $this,
@@ -876,15 +876,15 @@ public function checkDir(string $dir_name): void
         $this->checkDirWithConfig($dir_name, $this->config, true);
 
         $this->progress->write($this->generatePHPVersionMessage());
-        $this->progress->startPhase(Phase::SCAN);
+        $this->progress->startPhase(Phase::SCAN, $this->scanThreads);
 
         $this->config->initializePlugins($this);
 
         $this->codebase->scanFiles($this->scanThreads);
 
         $this->config->visitStubFiles($this->codebase, $this->progress);
 
-        $this->progress->startPhase(Phase::ANALYSIS);
+        $this->progress->startPhase(Phase::ANALYSIS, $this->threads);
 
         $this->codebase->analyzer->analyzeFiles(
             $this,
@@ -976,15 +976,15 @@ public function checkFile(string $file_path): void
         $this->file_reference_provider->loadReferenceCache();
 
         $this->progress->write($this->generatePHPVersionMessage());
-        $this->progress->startPhase(Phase::SCAN);
+        $this->progress->startPhase(Phase::SCAN, $this->scanThreads);
 
         $this->config->initializePlugins($this);
 
         $this->codebase->scanFiles($this->scanThreads);
 
         $this->config->visitStubFiles($this->codebase, $this->progress);
 
-        $this->progress->startPhase(Phase::ANALYSIS);
+        $this->progress->startPhase(Phase::ANALYSIS, $this->threads);
 
         $this->codebase->analyzer->analyzeFiles(
             $this,
@@ -1000,7 +1000,7 @@ public function checkFile(string $file_path): void
     public function checkPaths(array $paths_to_check): void
     {
         $this->progress->write($this->generatePHPVersionMessage());
-        $this->progress->startPhase(Phase::SCAN);
+        $this->progress->startPhase(Phase::SCAN, $this->scanThreads);
 
         $this->config->visitPreloadedStubFiles($this->codebase, $this->progress);
         $this->visitAutoloadFiles();
@@ -1032,7 +1032,7 @@ public function checkPaths(array $paths_to_check): void
 
         $this->config->eventDispatcher->dispatchAfterCodebasePopulated($event);
 
-        $this->progress->startPhase(Phase::ANALYSIS);
+        $this->progress->startPhase(Phase::ANALYSIS, $this->threads);
 
         $this->codebase->analyzer->analyzeFiles(
             $this,

src/Psalm/Internal/LanguageServer/Progress.php

@@ -32,7 +32,7 @@ public function debug(string $message): void
     }
 
     #[Override]
-    public function startPhase(Phase $phase): void
+    public function startPhase(Phase $phase, int $threads = 1): void
     {
     }
 

src/Psalm/Progress/DebugProgress.php

@@ -25,16 +25,17 @@ public function debug(string $message): void
     }
 
     #[Override]
-    public function startPhase(Phase $phase): void
+    public function startPhase(Phase $phase, int $threads = 1): void
     {
+        $threads = $threads === 1 ? '' : " ($threads threads)";
         $this->write(match ($phase) {
-            Phase::SCAN => "\nScanning files...\n\n",
-            Phase::ANALYSIS => "\nAnalyzing files...\n",
-            Phase::ALTERING => "\nUpdating files...\n",
-            Phase::TAINT_GRAPH_RESOLUTION => "\nResolving taint graph...\n",
-            Phase::JIT_COMPILATION => "\nJIT compilation in progress...\n",
-            Phase::PRELOADING => "\nPreloading in progress...\n",
-            Phase::MERGING_THREAD_RESULTS => "\nMerging thread results...\n",
+            Phase::SCAN => "\nScanning files$threads...\n\n",
+            Phase::ANALYSIS => "\nAnalyzing files$threads...\n",
+            Phase::ALTERING => "\nUpdating files$threads...\n",
+            Phase::TAINT_GRAPH_RESOLUTION => "\nResolving taint graph$threads...\n",
+            Phase::JIT_COMPILATION => "\nJIT compilation in progress$threads...\n",
+            Phase::PRELOADING => "\nPreloading in progress$threads...\n",
+            Phase::MERGING_THREAD_RESULTS => "\nMerging thread results$threads...\n",
         });
     }
 

src/Psalm/Progress/LongProgress.php

@@ -42,17 +42,18 @@ public function debug(string $message): void
     }
 
     #[Override]
-    public function startPhase(Phase $phase): void
+    public function startPhase(Phase $phase, int $threads = 1): void
     {
+        $threads = $threads === 1 ? '' : " ($threads threads)";
         $this->reportPhaseDuration($phase);
         $this->write(match ($phase) {
-            Phase::SCAN => "\nScanning files...\n\n",
-            Phase::ANALYSIS => "\nAnalyzing files...\n\n",
-            Phase::ALTERING => "\nUpdating files...\n",
-            Phase::TAINT_GRAPH_RESOLUTION => "\n\nResolving taint graph...\n\n",
-            Phase::JIT_COMPILATION => "JIT compilation in progress...\n\n",
-            Phase::PRELOADING => "Preloading in progress...\n\n",
-            Phase::MERGING_THREAD_RESULTS => "\nMerging thread results...\n\n",
+            Phase::SCAN => "\nScanning files$threads...\n\n",
+            Phase::ANALYSIS => "\nAnalyzing files$threads...\n\n",
+            Phase::ALTERING => "\nUpdating files$threads...\n",
+            Phase::TAINT_GRAPH_RESOLUTION => "\n\nResolving taint graph$threads...\n\n",
+            Phase::JIT_COMPILATION => "JIT compilation in progress$threads...\n\n",
+            Phase::PRELOADING => "Preloading in progress$threads...\n\n",
+            Phase::MERGING_THREAD_RESULTS => "\nMerging thread results$threads...\n\n",
         });
         $this->fixed_size = $phase === Phase::ANALYSIS
             || $phase === Phase::ALTERING

src/Psalm/Progress/Progress.php

@@ -25,7 +25,7 @@ public function setErrorReporting(): void
     abstract public function debug(string $message): void;
 
 
-    abstract public function startPhase(Phase $phase): void;
+    abstract public function startPhase(Phase $phase, int $threads = 1): void;
 
     abstract public function expand(int $number_of_tasks): void;
 

src/Psalm/Progress/VoidProgress.php

@@ -14,7 +14,7 @@ public function debug(string $message): void
     }
 
     #[Override]
-    public function startPhase(Phase $phase): void
+    public function startPhase(Phase $phase, int $threads = 1): void
     {
     }