Improvements

danog · Aug 31, 2023 · de40978 · de40978
1 parent 2e5d936
commit de40978
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php b/src/Psalm/Internal/Analyzer/ProjectAnalyzer.php
@@ -278,7 +278,7 @@ public function __construct(
         self::$instance = $this;
 
         if ($threads > 1) {
-            $this->pool = new Pool($threads);
+            $this->pool = new Pool($threads, $this);
         }
     }
 
@@ -401,7 +401,7 @@ public function serverMode(LanguageServer $server): void
 
         if ($usable_cpus > 1) {
             $this->threads = $usable_cpus;
-            $this->pool = new Pool($usable_cpus);
+            $this->pool = new Pool($usable_cpus, $this);
         }
 
         $server->logInfo("Initializing: Initialize Plugins...");

diff --git a/src/Psalm/Internal/Fork/InitStartupTask.php b/src/Psalm/Internal/Fork/InitStartupTask.php
@@ -27,15 +27,11 @@
 
 final class InitStartupTask implements Task
 {
-    private readonly ProjectAnalyzer $analyzer;
-    private readonly Config $config;
     private readonly string $memoryLimit;
     private readonly array $server;
     private readonly ?string $processTitle;
-    final public function __construct()
+    final public function __construct(private ProjectAnalyzer $analyzer)
     {
-        $this->analyzer = ProjectAnalyzer::getInstance();
-        $this->config = Config::getInstance();
         $this->memoryLimit = ini_get('memory_limit');
         $this->server = IssueBuffer::getServer();
         if (function_exists('cli_get_process_title')) {
@@ -62,7 +58,7 @@ final public function run(Channel $channel, Cancellation $cancellation): mixed
         // More initialization is needed but doing just this for now...
 
         ProjectAnalyzer::$instance = $this->analyzer;
-        Config::setInstance($this->config);
+        Config::setInstance($this->analyzer->getConfig());
 
         if (function_exists('cli_set_process_title') && $this->processTitle !== null) {
             @cli_set_process_title($this->processTitle);

diff --git a/src/Psalm/Internal/Fork/Pool.php b/src/Psalm/Internal/Fork/Pool.php
@@ -11,6 +11,7 @@
 use Amp\Parallel\Worker\WorkerPool;
 use AssertionError;
 use Closure;
+use Psalm\Internal\Analyzer\ProjectAnalyzer;
 
 use function Amp\Future\await;
 use function array_map;
@@ -36,7 +37,7 @@ final class Pool
     /**
      * @param int<2, max> $threads
      */
-    public function __construct(private readonly int $threads)
+    public function __construct(private readonly int $threads, ProjectAnalyzer $project_analyzer)
     {
         // TODO: disable xdebug
         $additional_options = [];
@@ -55,7 +56,7 @@ public function __construct(private readonly int $threads)
             ),
         );
 
-        $this->runAll(new InitStartupTask);
+        $this->runAll(new InitStartupTask($project_analyzer));
     }
     /**
      * @template TFinalResult