Start watch before showing done message

Author: dantleech

lib/LanguageServerIndexer/Handler/IndexerHandler.php

@@ -9,6 +9,7 @@
 use Generator;
 use Phpactor\AmpFsWatch\Exception\WatcherDied;
 use Phpactor\AmpFsWatch\Watcher;
+use Phpactor\AmpFsWatch\WatcherProcess;
 use Phpactor\Extension\LanguageServerIndexer\Event\IndexReset;
 use Phpactor\LanguageServer\Core\Handler\Handler;
 use Phpactor\LanguageServer\Core\Server\ClientApi;
@@ -125,13 +126,14 @@ public function indexer(CancellationToken $cancel): Promise
                 yield new Delayed(1);
             }
 
+            $process = yield $this->watcher->watch();
             $this->clientApi->window()->showMessage()->info(sprintf(
                 'Done indexing (%ss), watching with %s',
                 number_format(microtime(true) - $start, 2),
                 $this->watcher->describe()
             ));
 
-            return yield from $this->watch($cancel);
+            return yield from $this->watch($process, $cancel);
         });
     }
 
@@ -149,11 +151,9 @@ public function reindex(bool $soft = false): Promise
     /**
      * @return Generator<Promise>
      */
-    private function watch(CancellationToken $cancel): Generator
+    private function watch(WatcherProcess $process, CancellationToken $cancel): Generator
     {
         try {
-            $process = yield $this->watcher->watch();
-
             while (null !== $file = yield $process->wait()) {
                 try {
                     $cancel->throwIfRequested();

tests/LanguageServerIndexer/Unit/IndexerHandlerTest.php

@@ -34,7 +34,7 @@ public function testIndexer(): void
         );
 
         $this->tester->initialize();
-        wait(delay(10));
+        wait(delay(15));
 
         self::assertGreaterThanOrEqual(2, $this->tester->transmitter()->count());
         self::assertStringContainsString('Indexing', $this->tester->transmitter()->shift()->params['message']);