Merge a5433b211a into 9dc1656592

.phan/config.php

@@ -283,9 +283,14 @@ return [
     // your application should be included in this list.
     'directory_list' => [
         'src',
+        'vendor/amphp/amp/lib',
+        'vendor/amphp/file/lib',
+        'vendor/amphp/socket/src',
         'vendor/composer/xdebug-handler/src',
         'vendor/felixfbecker/advanced-json-rpc/lib',
         'vendor/felixfbecker/language-server-protocol/src/',
+        'vendor/league/event/src',
+        'vendor/league/uri-parser/src',
         'vendor/microsoft/tolerant-php-parser/src',
         'vendor/netresearch/jsonmapper/src',
         'vendor/phpdocumentor/reflection-common/src',
@@ -294,7 +299,6 @@ return [
         'vendor/phpunit/phpunit/src',
         'vendor/psr/log/Psr',
         'vendor/sabre/event/lib',
-        'vendor/sabre/uri/lib',
         'vendor/webmozart/glob/src',
         'vendor/webmozart/path-util/src',
     ],

.travis.yml

@@ -2,7 +2,9 @@ language: php
 
 php:
   - '7.0'
+  - '7.1'
   - '7.2'
+  - '7.3'
 
 git:
   depth: 10

bin/php-language-server.php

@@ -1,8 +1,12 @@
 <?php
 
-use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter, StderrLogger};
+use Amp\ByteStream\ResourceInputStream;
-use Sabre\Event\Loop;
+use Amp\ByteStream\ResourceOutputStream;
+use Amp\Loop;
+use Amp\Socket\ClientSocket;
+use Amp\Socket\ServerSocket;
 use Composer\XdebugHandler\XdebugHandler;
+use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter, StderrLogger};
 
 $options = getopt('', ['tcp::', 'tcp-server::', 'memory-limit::']);
 
@@ -42,69 +46,51 @@ unset($xdebugHandler);
 if (!empty($options['tcp'])) {
     // Connect to a TCP server
     $address = $options['tcp'];
-    $socket = stream_socket_client('tcp://' . $address, $errno, $errstr);
+    $server = function () use ($logger, $address) {
-    if ($socket === false) {
+        /** @var ClientSocket $socket */
-        $logger->critical("Could not connect to language client. Error $errno\n$errstr");
+        $socket = yield Amp\Socket\connect('tcp://' . $address);
-        exit(1);
-    }
-    stream_set_blocking($socket, false);
         $ls = new LanguageServer(
             new ProtocolStreamReader($socket),
             new ProtocolStreamWriter($socket)
         );
-    Loop\run();
+        yield $ls->getshutdownDeferred();
+    };
 } else if (!empty($options['tcp-server'])) {
     // Run a TCP Server
     $address = $options['tcp-server'];
-    $tcpServer = stream_socket_server('tcp://' . $address, $errno, $errstr);
+    $server = function () use ($logger, $address) {
-    if ($tcpServer === false) {
+
-        $logger->critical("Could not listen on $address. Error $errno\n$errstr");
+        $server = Amp\Socket\listen('tcp://' . $address);
-        exit(1);
+
-    }
         $logger->debug("Server listening on $address");
-    $pcntlAvailable = extension_loaded('pcntl');
+
-    if (!$pcntlAvailable) {
+        while ($socket = yield $server->accept()) {
-        $logger->notice('PCNTL is not available. Only a single connection will be accepted');
+            /** @var ServerSocket $socket */
-    }
+            list($ip, $port) = \explode(':', $socket->getRemoteAddress());
-    while ($socket = stream_socket_accept($tcpServer, -1)) {
+
-        $logger->debug('Connection accepted');
+            $logger->debug("Accepted connection from {$ip}:{$port}." . PHP_EOL);
-        stream_set_blocking($socket, false);
+
-        if ($pcntlAvailable) {
+            Loop::run(function () use ($socket) {
-            // If PCNTL is available, fork a child process for the connection
-            // An exit notification will only terminate the child process
-            $pid = pcntl_fork();
-            if ($pid === -1) {
-                $logger->critical('Could not fork');
-                exit(1);
-            } else if ($pid === 0) {
-                // Child process
-                $reader = new ProtocolStreamReader($socket);
-                $writer = new ProtocolStreamWriter($socket);
-                $reader->on('close', function () use ($logger) {
-                    $logger->debug('Connection closed');
-                });
-                $ls = new LanguageServer($reader, $writer);
-                Loop\run();
-                // Just for safety
-                exit(0);
-            }
-        } else {
-            // If PCNTL is not available, we only accept one connection.
-            // An exit notification will terminate the server
                 $ls = new LanguageServer(
                     new ProtocolStreamReader($socket),
                     new ProtocolStreamWriter($socket)
                 );
-            Loop\run();
+                yield $ls->getshutdownDeferred();
-        }
+            });
         }
+    };
 } else {
     // Use STDIO
     $logger->debug('Listening on STDIN');
-    stream_set_blocking(STDIN, false);
+    $inputStream = new ResourceInputStream(STDIN);
+    $outputStream = new ResourceOutputStream(STDOUT);
     $ls = new LanguageServer(
-        new ProtocolStreamReader(STDIN),
+        new ProtocolStreamReader($inputStream),
-        new ProtocolStreamWriter(STDOUT)
+        new ProtocolStreamWriter($outputStream)
     );
-    Loop\run();
+    $server = function () use ($ls) {
+        yield $ls->getshutdownDeferred();
+    };
 }
+
+Loop::run($server);

composer.json

@@ -22,16 +22,21 @@
     ],
     "require": {
         "php": "^7.0",
+        "amphp/byte-stream": "^1.5",
+        "amphp/cache": "^1.2",
+        "amphp/file": "^0.3.5",
+        "amphp/socket": "^0.10.11",
         "composer/xdebug-handler": "^1.0",
         "felixfbecker/advanced-json-rpc": "^3.0.0",
         "felixfbecker/language-server-protocol": "^1.0.1",
         "jetbrains/phpstorm-stubs": "dev-master",
+        "league/event": "^2.2",
+        "league/uri-parser": "^1.4",
         "microsoft/tolerant-php-parser": "0.0.*",
         "netresearch/jsonmapper": "^1.0",
+        "php-ds/php-ds": "^1.2",
         "phpdocumentor/reflection-docblock": "^4.0.0",
         "psr/log": "^1.0",
-        "sabre/event": "^5.0",
-        "sabre/uri": "^2.0",
         "webmozart/glob": "^4.1",
         "webmozart/path-util": "^2.3"
     },

src/Cache/Cache.php

@@ -1,10 +1,8 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Cache;
 
-use Sabre\Event\Promise;
-
 /**
  * A key/value store for caching purposes
  */
@@ -14,16 +12,16 @@ interface Cache
      * Gets a value from the cache
      *
      * @param string $key
-     * @return Promise <mixed>
+     * @return \Generator <mixed>
      */
-    public function get(string $key): Promise;
+    public function get(string $key): \Generator;
 
     /**
      * Sets a value in the cache
      *
      * @param string $key
      * @param mixed $value
-     * @return Promise
+     * @return \Generator
      */
-    public function set(string $key, $value): Promise;
+    public function set(string $key, $value): \Generator;
 }

src/Cache/ClientCache.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Cache;
 
@@ -30,11 +30,11 @@ class ClientCache implements Cache
      * @param string $key
      * @return Promise <mixed>
      */
-    public function get(string $key): Promise
+    public function get(string $key): \Generator
     {
-        return $this->client->xcache->get($key)->then('unserialize')->otherwise(function () {
+        $cached = yield from $this->client->xcache->get($key);
-            // Ignore
+        $obj = unserialize($cached);
-        });
+        return $obj;
     }
 
     /**
@@ -44,10 +44,8 @@ class ClientCache implements Cache
      * @param mixed $value
      * @return Promise
      */
-    public function set(string $key, $value): Promise
+    public function set(string $key, $value): \Generator
     {
-        return $this->client->xcache->set($key, serialize($value))->otherwise(function () {
+        return yield from $this->client->xcache->set($key, serialize($value));
-            // Ignore
-        });
     }
 }

src/Cache/FileSystemCache.php

@@ -1,10 +1,8 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Cache;
 
-use Sabre\Event\Promise;
-
 /**
  * Caches content on the file system
  */
@@ -30,18 +28,16 @@ class FileSystemCache implements Cache
      * Gets a value from the cache
      *
      * @param string $key
-     * @return Promise <mixed>
+     * @return \Generator <mixed>
      */
-    public function get(string $key): Promise
+    public function get(string $key): \Generator
     {
         try {
             $file = $this->cacheDir . urlencode($key);
-            if (!file_exists($file)) {
+            $content = yield \Amp\File\get($file);
-                return Promise\resolve(null);
+            return unserialize($content);
-            }
-            return Promise\resolve(unserialize(file_get_contents($file)));
         } catch (\Exception $e) {
-            return Promise\resolve(null);
+            return null;
         }
     }
 
@@ -50,18 +46,18 @@ class FileSystemCache implements Cache
      *
      * @param string $key
      * @param mixed $value
-     * @return Promise
+     * @return \Generator
      */
-    public function set(string $key, $value): Promise
+    public function set(string $key, $value): \Generator
     {
-        try {
         $file = $this->cacheDir . urlencode($key);
-            if (!file_exists($this->cacheDir)) {
+        $dir = dirname($file);
-                mkdir($this->cacheDir);
+        if (yield \Amp\File\isfile($dir)) {
+            yield \Amp\File\unlink($dir);
         }
-            file_put_contents($file, serialize($value));
+        if (!yield \Amp\File\exists($dir)) {
-        } finally {
+            yield \Amp\File\mkdir($dir, 0777, true);
-            return Promise\resolve(null);
         }
+        yield \Amp\File\put($file, serialize($value));
     }
 }

src/Client/TextDocument.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Client;
 
@@ -36,9 +36,9 @@ class TextDocument
      * @param Diagnostic[] $diagnostics
      * @return Promise <void>
      */
-    public function publishDiagnostics(string $uri, array $diagnostics): Promise
+    public function publishDiagnostics(string $uri, array $diagnostics): \Generator
     {
-        return $this->handler->notify('textDocument/publishDiagnostics', [
+        yield from $this->handler->notify('textDocument/publishDiagnostics', [
             'uri' => $uri,
             'diagnostics' => $diagnostics
         ]);
@@ -51,13 +51,12 @@ class TextDocument
      * @param TextDocumentIdentifier $textDocument The document to get the content for
      * @return Promise <TextDocumentItem> The document's current content
      */
-    public function xcontent(TextDocumentIdentifier $textDocument): Promise
+    public function xcontent(TextDocumentIdentifier $textDocument): \Generator
     {
-        return $this->handler->request(
+        $result = yield from  $this->handler->request(
             'textDocument/xcontent',
             ['textDocument' => $textDocument]
-        )->then(function ($result) {
+        );
         return $this->mapper->map($result, new TextDocumentItem);
-        });
     }
 }

src/Client/Window.php

@@ -41,8 +41,8 @@ class Window
      * @param string $message
      * @return Promise <void>
      */
-    public function logMessage(int $type, string $message): Promise
+    public function logMessage(int $type, string $message): \Generator
     {
-        return $this->handler->notify('window/logMessage', ['type' => $type, 'message' => $message]);
+        yield from $this->handler->notify('window/logMessage', ['type' => $type, 'message' => $message]);
     }
 }

src/Client/Workspace.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Client;
 
@@ -35,13 +35,12 @@ class Workspace
      * @param string $base The base directory (defaults to the workspace)
      * @return Promise <TextDocumentIdentifier[]> Array of documents
      */
-    public function xfiles(string $base = null): Promise
+    public function xfiles(string $base = null): \Generator
     {
-        return $this->handler->request(
+        $textDocuments = yield from $this->handler->request(
             'workspace/xfiles',
             ['base' => $base]
-        )->then(function (array $textDocuments) {
+        );
         return $this->mapper->mapArray($textDocuments, [], TextDocumentIdentifier::class);
-        });
     }
 }

src/Client/XCache.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Client;
 
@@ -25,9 +25,9 @@ class XCache
      * @param string $key
      * @return Promise <mixed>
      */
-    public function get(string $key): Promise
+    public function get(string $key): \Generator
     {
-        return $this->handler->request('xcache/get', ['key' => $key]);
+        return yield from $this->handler->request('xcache/get', ['key' => $key]);
     }
 
     /**
@@ -35,8 +35,8 @@ class XCache
      * @param mixed $value
      * @return Promise <mixed>
      */
-    public function set(string $key, $value): Promise
+    public function set(string $key, $value): \Generator
     {
-        return $this->handler->notify('xcache/set', ['key' => $key, 'value' => $value]);
+        return yield from $this->handler->notify('xcache/set', ['key' => $key, 'value' => $value]);
     }
 }

src/ClientHandler.php

@@ -1,10 +1,12 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
 use AdvancedJsonRpc;
-use Sabre\Event\Promise;
+use Amp\Deferred;
+use Amp\Loop;
+use LanguageServer\Event\MessageEvent;
 
 class ClientHandler
 {
@@ -35,31 +37,35 @@ class ClientHandler
      *
      * @param string $method The method to call
      * @param array|object $params The method parameters
-     * @return Promise <mixed> Resolved with the result of the request or rejected with an error
+     * @return \Generator <mixed> Resolved with the result of the request or rejected with an error
      */
-    public function request(string $method, $params): Promise
+    public function request(string $method, $params): \Generator
     {
         $id = $this->idGenerator->generate();
-        return $this->protocolWriter->write(
+        $deferred = new Deferred();
-            new Message(
+        $listener = function (MessageEvent $messageEvent) use ($id, $deferred, &$listener) {
-                new AdvancedJsonRpc\Request($id, $method, (object)$params)
+            $msg = $messageEvent->getMessage();
-            )
+            Loop::defer(function () use (&$listener, $deferred, $id, $msg) {
-        )->then(function () use ($id) {
-            $promise = new Promise;
-            $listener = function (Message $msg) use ($id, $promise, &$listener) {
                 if (AdvancedJsonRpc\Response::isResponse($msg->body) && $msg->body->id === $id) {
                     // Received a response
                     $this->protocolReader->removeListener('message', $listener);
                     if (AdvancedJsonRpc\SuccessResponse::isSuccessResponse($msg->body)) {
-                        $promise->fulfill($msg->body->result);
+                        $deferred->resolve($msg->body->result);
                     } else {
-                        $promise->reject($msg->body->error);
+                        $deferred->fail($msg->body->error);
                     }
                 }
-            };
-            $this->protocolReader->on('message', $listener);
-            return $promise;
             });
+        };
+        $this->protocolReader->addListener('message', $listener);
+
+        yield from $this->protocolWriter->write(
+            new Message(
+                new AdvancedJsonRpc\Request($id, $method, (object)$params)
+            )
+        );
+
+        return yield $deferred->promise();
     }
 
     /**
@@ -67,11 +73,11 @@ class ClientHandler
      *
      * @param string $method The method to call
      * @param array|object $params The method parameters
-     * @return Promise <null> Will be resolved as soon as the notification has been sent
+     * @return \Generator <null> Will be resolved as soon as the notification has been sent
      */
-    public function notify(string $method, $params): Promise
+    public function notify(string $method, $params): \Generator
     {
-        return $this->protocolWriter->write(
+        return yield from $this->protocolWriter->write(
             new Message(
                 new AdvancedJsonRpc\Notification($method, (object)$params)
             )

src/ComposerScripts.php

@@ -1,16 +1,16 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
-use LanguageServer\FilesFinder\FileSystemFilesFinder;
+use Amp\Loop;
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
+use LanguageServer\FilesFinder\FileSystemFilesFinder;
 use LanguageServer\Index\StubsIndex;
+use Microsoft\PhpParser;
 use phpDocumentor\Reflection\DocBlockFactory;
 use Webmozart\PathUtil\Path;
-use Sabre\Uri;
+use function League\Uri\parse;
-use function Sabre\Event\coroutine;
-use Microsoft\PhpParser;
 
 foreach ([__DIR__ . '/../../../autoload.php', __DIR__ . '/../autoload.php', __DIR__ . '/../vendor/autoload.php'] as $file) {
     if (file_exists($file)) {
@@ -23,8 +23,7 @@ class ComposerScripts
 {
     public static function parseStubs()
     {
-        coroutine(function () {
+        Loop::run(function () {
-
             $index = new StubsIndex;
 
             $finder = new FileSystemFilesFinder;
@@ -44,20 +43,19 @@ class ComposerScripts
                 throw new \Exception('jetbrains/phpstorm-stubs package not found');
             }
 
-            $uris = yield $finder->find("$stubsLocation/**/*.php");
+            $uris = yield from $finder->find("$stubsLocation/**/*.php");
 
             foreach ($uris as $uri) {
                 echo "Parsing $uri\n";
-                $content = yield $contentRetriever->retrieve($uri);
+                $content = yield from $contentRetriever->retrieve($uri);
 
                 // Change URI to phpstubs://
-                $parts = Uri\parse($uri);
+                $parts = parse($uri);
                 $parts['path'] = Path::makeRelative($parts['path'], $stubsLocation);
                 $parts['scheme'] = 'phpstubs';
-                $uri = Uri\build($parts);
 
                 // Create a new document and add it to $index
-                new PhpDocument($uri, $content, $index, $parser, $docBlockFactory, $definitionResolver);
+                new PhpDocument((string)$uri, $content, $index, $parser, $docBlockFactory, $definitionResolver);
             }
 
             $index->setComplete();
@@ -67,6 +65,6 @@ class ComposerScripts
             $index->save();
 
             echo "Finished\n";
-        })->wait();
+        });
     }
 }

src/ContentRetriever/ClientContentRetriever.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\ContentRetriever;
 
@@ -26,11 +26,10 @@ class ClientContentRetriever implements ContentRetriever
      * @param string $uri The URI of the document
      * @return Promise <string> Resolved with the content as a string
      */
-    public function retrieve(string $uri): Promise
+    public function retrieve(string $uri): \Generator
     {
-        return $this->client->textDocument->xcontent(new TextDocumentIdentifier($uri))
+        /** @var TextDocumentItem $textDocument */
-            ->then(function (TextDocumentItem $textDocument) {
+        $textDocument = yield from $this->client->textDocument->xcontent(new TextDocumentIdentifier($uri));
         return $textDocument->text;
-            });
     }
 }

src/ContentRetriever/ContentRetriever.php

@@ -16,5 +16,5 @@ interface ContentRetriever
      * @param string $uri The URI of the document
      * @return Promise <string> Resolved with the content as a string
      */
-    public function retrieve(string $uri): Promise;
+    public function retrieve(string $uri): \Generator;
 }

src/ContentRetriever/FileSystemContentRetriever.php

@@ -17,8 +17,8 @@ class FileSystemContentRetriever implements ContentRetriever
      * @param string $uri The URI of the document
      * @return Promise <string> Resolved with the content as a string
      */
-    public function retrieve(string $uri): Promise
+    public function retrieve(string $uri): \Generator
     {
-        return Promise\resolve(file_get_contents(uriToPath($uri)));
+        return yield \Amp\File\get(uriToPath($uri));
     }
 }

src/Event/MessageEvent.php

@@ -0,0 +1,32 @@
+<?php
+declare(strict_types=1);
+
+namespace LanguageServer\Event;
+
+use LanguageServer\Message;
+use League\Event\Event;
+
+class MessageEvent extends Event
+{
+    /**
+     * @var Message
+     */
+    private $message;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param string $name
+     * @param Message $message
+     */
+    public function __construct(string $name, Message $message)
+    {
+        parent::__construct($name);
+        $this->message = $message;
+    }
+
+    public function getMessage(): Message
+    {
+        return $this->message;
+    }
+}

src/FilesFinder/ClientFilesFinder.php

@@ -1,12 +1,11 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\FilesFinder;
 
 use LanguageServer\LanguageClient;
-use Sabre\Event\Promise;
-use Sabre\Uri;
 use Webmozart\Glob\Glob;
+use function League\Uri\parse;
 
 /**
  * Retrieves file content from the client through a textDocument/xcontent request
@@ -31,19 +30,18 @@ class ClientFilesFinder implements FilesFinder
      * If the client does not support workspace/files, it falls back to searching the file system directly.
      *
      * @param string $glob
-     * @return Promise <string[]> The URIs
+     * @return \Generator <string[]> The URIs
      */
-    public function find(string $glob): Promise
+    public function find(string $glob): \Generator
     {
-        return $this->client->workspace->xfiles()->then(function (array $textDocuments) use ($glob) {
+        $textDocuments = yield from $this->client->workspace->xfiles();
         $uris = [];
         foreach ($textDocuments as $textDocument) {
-                $path = Uri\parse($textDocument->uri)['path'];
+            $path = parse($textDocument->uri)['path'];
             if (Glob::match($path, $glob)) {
                 $uris[] = $textDocument->uri;
             }
         }
         return $uris;
-        });
     }
 }

src/FilesFinder/FileSystemFilesFinder.php

@@ -1,12 +1,11 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\FilesFinder;
 
-use Webmozart\Glob\Iterator\GlobIterator;
+use Webmozart\Glob\Glob;
-use Sabre\Event\Promise;
+use function Amp\File\isdir;
-use function Sabre\Event\coroutine;
+use function LanguageServer\{pathToUri};
-use function LanguageServer\{pathToUri, timeout};
 
 class FileSystemFilesFinder implements FilesFinder
 {
@@ -15,21 +14,24 @@ class FileSystemFilesFinder implements FilesFinder
      * If the client does not support workspace/xfiles, it falls back to searching the file system directly.
      *
      * @param string $glob
-     * @return Promise <string[]>
+     * @return \Amp\Promise <string[]>
      */
-    public function find(string $glob): Promise
+    public function find(string $glob): \Generator
     {
-        return coroutine(function () use ($glob) {
         $uris = [];
-            foreach (new GlobIterator($glob) as $path) {
+        $basePath = \Webmozart\Glob\Glob::getBasePath($glob);
-                // Exclude any directories that also match the glob pattern
+        $pathList = [$basePath];
-                if (!is_dir($path)) {
+        while ($pathList) {
+            $path = array_pop($pathList);
+            if (yield isdir($path)) {
+                $subFileList = yield \Amp\File\scandir($path);
+                foreach ($subFileList as $subFile) {
+                    $pathList[] = $path . DIRECTORY_SEPARATOR . $subFile;
+                }
+            } elseif (Glob::match($path, $glob)) {
                 $uris[] = pathToUri($path);
             }
-
-                yield timeout();
         }
         return $uris;
-        });
     }
 }

src/FilesFinder/FilesFinder.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\FilesFinder;
 
@@ -17,5 +17,5 @@ interface FilesFinder
      * @param string $glob
      * @return Promise <string[]>
      */
-    public function find(string $glob): Promise;
+    public function find(string $glob): \Generator;
 }

src/Index/AbstractAggregateIndex.php

@@ -4,12 +4,10 @@ declare(strict_types = 1);
 namespace LanguageServer\Index;
 
 use LanguageServer\Definition;
-use Sabre\Event\EmitterTrait;
+use League\Event\Emitter;
 
-abstract class AbstractAggregateIndex implements ReadableIndex
+abstract class AbstractAggregateIndex extends Emitter implements ReadableIndex
 {
-    use EmitterTrait;
-
     /**
      * Returns all indexes managed by the aggregate index
      *
@@ -29,17 +27,17 @@ abstract class AbstractAggregateIndex implements ReadableIndex
      */
     protected function registerIndex(ReadableIndex $index)
     {
-        $index->on('complete', function () {
+        $index->addListener('complete', function () {
             if ($this->isComplete()) {
                 $this->emit('complete');
             }
         });
-        $index->on('static-complete', function () {
+        $index->addListener('static-complete', function () {
             if ($this->isStaticComplete()) {
                 $this->emit('static-complete');
             }
         });
-        $index->on('definition-added', function () {
+        $index->addListener('definition-added', function () {
             $this->emit('definition-added');
         });
     }

src/Index/DependenciesIndex.php

@@ -3,6 +3,13 @@ declare(strict_types = 1);
 
 namespace LanguageServer\Index;
 
+use League\Event\EmitterInterface;
+use League\Event\EventInterface;
+use League\Event\GeneratorInterface;
+use League\Event\ListenerAcceptorInterface;
+use League\Event\ListenerInterface;
+use League\Event\ListenerProviderInterface;
+
 class DependenciesIndex extends AbstractAggregateIndex
 {
     /**

src/Index/Index.php

@@ -1,18 +1,18 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Index;
 
+use Ds\Set;
 use LanguageServer\Definition;
-use Sabre\Event\EmitterTrait;
+use League\Event\Emitter;
 
 /**
  * Represents the index of a project or dependency
  * Serializable for caching
  */
-class Index implements ReadableIndex, \Serializable
+class Index extends Emitter implements ReadableIndex, \Serializable
 {
-    use EmitterTrait;
 
     /**
      * An associative array that maps splitted fully qualified symbol names
@@ -36,7 +36,7 @@ class Index implements ReadableIndex, \Serializable
      * An associative array that maps fully qualified symbol names
      * to arrays of document URIs that reference the symbol
      *
-     * @var string[][]
+     * @var Set[]
      */
     private $references = [];
 
@@ -61,7 +61,6 @@ class Index implements ReadableIndex, \Serializable
             $this->setStaticComplete();
         }
         $this->complete = true;
-        $this->emit('complete');
     }
 
     /**
@@ -72,7 +71,6 @@ class Index implements ReadableIndex, \Serializable
     public function setStaticComplete()
     {
         $this->staticComplete = true;
-        $this->emit('static-complete');
     }
 
     /**
@@ -131,9 +129,9 @@ class Index implements ReadableIndex, \Serializable
                 continue;
             }
             if ($item instanceof Definition) {
-                yield $fqn.$name => $item;
+                yield $fqn . $name => $item;
             } elseif (is_array($item) && isset($item[''])) {
-                yield $fqn.$name => $item[''];
+                yield $fqn . $name => $item[''];
             }
         }
     }
@@ -173,8 +171,6 @@ class Index implements ReadableIndex, \Serializable
     {
         $parts = $this->splitFqn($fqn);
         $this->indexDefinition(0, $parts, $this->definitions, $definition);
-
-        $this->emit('definition-added');
     }
 
     /**
@@ -200,16 +196,18 @@ class Index implements ReadableIndex, \Serializable
      */
     public function getReferenceUris(string $fqn): \Generator
     {
-        foreach ($this->references[$fqn] ?? [] as $uri) {
+        if (isset($this->references[$fqn])) {
+            foreach ($this->references[$fqn] as $uri) {
                 yield $uri;
             }
         }
+    }
 
     /**
      * For test use.
      * Returns all references, keyed by fqn.
      *
-     * @return string[][]
+     * @return Set[]
      */
     public function getReferences(): array
     {
@@ -225,12 +223,9 @@ class Index implements ReadableIndex, \Serializable
     public function addReferenceUri(string $fqn, string $uri)
     {
         if (!isset($this->references[$fqn])) {
-            $this->references[$fqn] = [];
+            $this->references[$fqn] = new Set();
-        }
-        // TODO: use DS\Set instead of searching array
-        if (array_search($uri, $this->references[$fqn], true) === false) {
-            $this->references[$fqn][] = $uri;
         }
+        $this->references[$fqn]->add($uri);
     }
 
     /**
@@ -245,11 +240,7 @@ class Index implements ReadableIndex, \Serializable
         if (!isset($this->references[$fqn])) {
             return;
         }
-        $index = array_search($fqn, $this->references[$fqn], true);
+        $this->references[$fqn]->remove($uri);
-        if ($index === false) {
-            return;
-        }
-        array_splice($this->references[$fqn], $index, 1);
     }
 
     /**
@@ -299,9 +290,9 @@ class Index implements ReadableIndex, \Serializable
     {
         foreach ($storage as $key => $value) {
             if (!is_array($value)) {
-                yield $prefix.$key => $value;
+                yield $prefix . $key => $value;
             } else {
-                yield from $this->yieldDefinitionsRecursively($value, $prefix.$key);
+                yield from $this->yieldDefinitionsRecursively($value, $prefix . $key);
             }
         }
     }
@@ -429,7 +420,7 @@ class Index implements ReadableIndex, \Serializable
             if (isset($storage[$part])) {
                 unset($storage[$part]);
 
-                if (0 === count($storage)) {
+                if (0 === count($storage) && $level != 0) {
                     // parse again the definition tree to remove the parent
                     // when it has no more children
                     $this->removeIndexedDefinition(0, array_slice($parts, 0, $level), $rootStorage, $rootStorage);

src/Index/ReadableIndex.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Index;
 
 use LanguageServer\Definition;
-use Sabre\Event\EmitterInterface;
+use League\Event\EmitterInterface;
 
 /**
  * The ReadableIndex interface provides methods to lookup definitions and references

src/Indexer.php

@@ -1,15 +1,15 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
+use Amp\Delayed;
 use LanguageServer\Cache\Cache;
 use LanguageServer\FilesFinder\FilesFinder;
 use LanguageServer\Index\{DependenciesIndex, Index};
 use LanguageServerProtocol\MessageType;
 use Webmozart\PathUtil\Path;
 use Sabre\Event\Promise;
-use function Sabre\Event\coroutine;
 
 class Indexer
 {
@@ -100,16 +100,14 @@ class Indexer
      *
      * @return Promise <void>
      */
-    public function index(): Promise
+    public function index(): \Generator
     {
-        return coroutine(function () {
-
         $pattern = Path::makeAbsolute('**/*.php', $this->rootPath);
-            $uris = yield $this->filesFinder->find($pattern);
+        $uris = yield from $this->filesFinder->find($pattern);
 
         $count = count($uris);
         $startTime = microtime(true);
-            $this->client->window->logMessage(MessageType::INFO, "$count files total");
+        yield from $this->client->window->logMessage(MessageType::INFO, "$count files total");
 
         /** @var string[] */
         $source = [];
@@ -132,16 +130,16 @@ class Indexer
 
         // Index source
         // Definitions and static references
-            $this->client->window->logMessage(MessageType::INFO, 'Indexing project for definitions and static references');
+        yield from $this->client->window->logMessage(MessageType::INFO, 'Indexing project for definitions and static references');
-            yield $this->indexFiles($source);
+        yield from $this->indexFiles($source);
         $this->sourceIndex->setStaticComplete();
         // Dynamic references
-            $this->client->window->logMessage(MessageType::INFO, 'Indexing project for dynamic references');
+        yield from $this->client->window->logMessage(MessageType::INFO, 'Indexing project for dynamic references');
-            yield $this->indexFiles($source);
+        yield from $this->indexFiles($source);
         $this->sourceIndex->setComplete();
 
         // Index dependencies
-            $this->client->window->logMessage(MessageType::INFO, count($deps) . ' Packages');
+        yield from $this->client->window->logMessage(MessageType::INFO, count($deps) . ' Packages');
         foreach ($deps as $packageName => $files) {
             // Find version of package and check cache
             $packageKey = null;
@@ -155,54 +153,54 @@ class Indexer
                     $packageKey = $packageName . ':' . $packageVersion;
                     $cacheKey = self::CACHE_VERSION . ':' . $packageKey;
                     // Check cache
-                        $index = yield $this->cache->get($cacheKey);
+                    $index = yield from $this->cache->get($cacheKey);
                     break;
                 }
             }
+            $index = null;
             if ($index !== null) {
                 // Cache hit
                 $this->dependenciesIndex->setDependencyIndex($packageName, $index);
-                    $this->client->window->logMessage(MessageType::INFO, "Restored $packageKey from cache");
+                yield from $this->client->window->logMessage(MessageType::INFO, "Restored $packageKey from cache");
             } else {
                 // Cache miss
                 $index = $this->dependenciesIndex->getDependencyIndex($packageName);
 
                 // Index definitions and static references
-                    $this->client->window->logMessage(MessageType::INFO, 'Indexing ' . ($packageKey ?? $packageName) . ' for definitions and static references');
+                yield from $this->client->window->logMessage(MessageType::INFO, 'Indexing ' . ($packageKey ?? $packageName) . ' for definitions and static references');
-                    yield $this->indexFiles($files);
+                yield from $this->indexFiles($files);
                 $index->setStaticComplete();
 
                 // Index dynamic references
-                    $this->client->window->logMessage(MessageType::INFO, 'Indexing ' . ($packageKey ?? $packageName) . ' for dynamic references');
+                yield from $this->client->window->logMessage(MessageType::INFO, 'Indexing ' . ($packageKey ?? $packageName) . ' for dynamic references');
-                    yield $this->indexFiles($files);
+                yield from $this->indexFiles($files);
                 $index->setComplete();
 
                 // If we know the version (cache key), save index for the dependency in the cache
                 if ($cacheKey !== null) {
-                        $this->client->window->logMessage(MessageType::INFO, "Storing $packageKey in cache");
+                    yield from $this->client->window->logMessage(MessageType::INFO, "Storing $packageKey in cache");
-                        $this->cache->set($cacheKey, $index);
+                    yield from $this->cache->set($cacheKey, $index);
                 } else {
-                        $this->client->window->logMessage(MessageType::WARNING, "Could not compute cache key for $packageName");
+                    yield from $this->client->window->logMessage(MessageType::WARNING, "Could not compute cache key for $packageName");
                 }
+                echo PHP_EOL;
             }
         }
 
         $duration = (int)(microtime(true) - $startTime);
         $mem = (int)(memory_get_usage(true) / (1024 * 1024));
-            $this->client->window->logMessage(
+        yield from $this->client->window->logMessage(
             MessageType::INFO,
             "All $count PHP files parsed in $duration seconds. $mem MiB allocated."
         );
-        });
     }
 
     /**
      * @param array $files
      * @return Promise
      */
-    private function indexFiles(array $files): Promise
+    private function indexFiles(array $files): \Generator
     {
-        return coroutine(function () use ($files) {
         foreach ($files as $i => $uri) {
             // Skip open documents
             if ($this->documentLoader->isOpen($uri)) {
@@ -210,22 +208,21 @@ class Indexer
             }
 
             // Give LS to the chance to handle requests while indexing
-                yield timeout();
+            yield new Delayed(0);
-                $this->client->window->logMessage(MessageType::LOG, "Parsing $uri");
+            yield from $this->client->window->logMessage(MessageType::LOG, "Parsing $uri");
             try {
-                    $document = yield $this->documentLoader->load($uri);
+                $document = yield from $this->documentLoader->load($uri);
                 if (!isVendored($document, $this->composerJson)) {
-                        $this->client->textDocument->publishDiagnostics($uri, $document->getDiagnostics());
+                    yield from $this->client->textDocument->publishDiagnostics($uri, $document->getDiagnostics());
                 }
             } catch (ContentTooLargeException $e) {
-                    $this->client->window->logMessage(
+                yield from $this->client->window->logMessage(
                     MessageType::INFO,
                     "Ignoring file {$uri} because it exceeds size limit of {$e->limit} bytes ({$e->size})"
                 );
             } catch (\Exception $e) {
-                    $this->client->window->logMessage(MessageType::ERROR, "Error parsing $uri: " . (string)$e);
+                yield from $this->client->window->logMessage(MessageType::ERROR, "Error parsing $uri: " . (string)$e);
             }
         }
-        });
     }
 }

src/LanguageServer.php

@@ -1,24 +1,24 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
-use LanguageServerProtocol\{
-    ServerCapabilities,
-    ClientCapabilities,
-    TextDocumentSyncKind,
-    InitializeResult,
-    CompletionOptions,
-    SignatureHelpOptions
-};
-use LanguageServer\Message;
-use LanguageServer\FilesFinder\{FilesFinder, ClientFilesFinder, FileSystemFilesFinder};
-use LanguageServer\ContentRetriever\{ContentRetriever, ClientContentRetriever, FileSystemContentRetriever};
-use LanguageServer\Index\{DependenciesIndex, GlobalIndex, Index, ProjectIndex, StubsIndex};
-use LanguageServer\Cache\{FileSystemCache, ClientCache};
 use AdvancedJsonRpc;
-use Sabre\Event\Promise;
+use Amp\Deferred;
-use function Sabre\Event\coroutine;
+use Amp\Delayed;
+use Amp\Loop;
+use Amp\Promise;
+use LanguageServer\Cache\{ClientCache, FileSystemCache};
+use LanguageServer\ContentRetriever\{ClientContentRetriever, ContentRetriever, FileSystemContentRetriever};
+use LanguageServer\Event\MessageEvent;
+use LanguageServer\FilesFinder\{ClientFilesFinder, FilesFinder, FileSystemFilesFinder};
+use LanguageServer\Index\{DependenciesIndex, GlobalIndex, Index, ProjectIndex, StubsIndex};
+use LanguageServerProtocol\{ClientCapabilities,
+    CompletionOptions,
+    InitializeResult,
+    ServerCapabilities,
+    SignatureHelpOptions,
+    TextDocumentSyncKind};
 use Throwable;
 use Webmozart\PathUtil\Path;
 
@@ -38,11 +38,6 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
      */
     public $workspace;
 
-    /**
-     * @var Server\Window
-     */
-    public $window;
-
     public $telemetry;
     public $completionItem;
     public $codeLens;
@@ -106,6 +101,11 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
      */
     protected $definitionResolver;
 
+    /**
+     * @var Deferred
+     */
+    private $shutdownDeferred;
+
     /**
      * @param ProtocolReader $reader
      * @param ProtocolWriter $writer
@@ -113,13 +113,18 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
     public function __construct(ProtocolReader $reader, ProtocolWriter $writer)
     {
         parent::__construct($this, '/');
+
+        $this->shutdownDeferred = new Deferred();
+
         $this->protocolReader = $reader;
-        $this->protocolReader->on('close', function () {
+        $this->protocolReader->addListener('close', function () {
             $this->shutdown();
-            $this->exit();
         });
-        $this->protocolReader->on('message', function (Message $msg) {
+        $this->protocolWriter = $writer;
-            coroutine(function () use ($msg) {
+        $this->client = new LanguageClient($reader, $writer);
+        $this->protocolReader->addListener('message', function (MessageEvent $messageEvent) use ($reader, $writer) {
+            $msg = $messageEvent->getMessage();
+            Loop::defer(function () use ($msg) {
                 // Ignore responses, this is the handler for requests and notifications
                 if (AdvancedJsonRpc\Response::isResponse($msg->body)) {
                     return;
@@ -149,12 +154,15 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
                     } else {
                         $responseBody = new AdvancedJsonRpc\SuccessResponse($msg->body->id, $result);
                     }
-                    $this->protocolWriter->write(new Message($responseBody));
+                    yield from $this->protocolWriter->write(new Message($responseBody));
                 }
-            })->otherwise('\\LanguageServer\\crash');
             });
-        $this->protocolWriter = $writer;
+        });
-        $this->client = new LanguageClient($reader, $writer);
+    }
+
+    public function getshutdownDeferred(): Promise
+    {
+        return $this->shutdownDeferred->promise();
     }
 
     /**
@@ -163,15 +171,13 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
      * @param ClientCapabilities $capabilities The capabilities provided by the client (editor)
      * @param string|null $rootPath The rootPath of the workspace. Is null if no folder is open.
      * @param int|null $processId The process Id of the parent process that started the server. Is null if the process has not been started by another process. If the parent process is not alive then the server should exit (see exit notification) its process.
+     * @param string|null $rootUri
      * @return Promise <InitializeResult>
      */
     public function initialize(ClientCapabilities $capabilities, string $rootPath = null, int $processId = null, string $rootUri = null): Promise
     {
-        if ($rootPath === null && $rootUri !== null) {
+        $deferred = new Deferred();
-            $rootPath = uriToPath($rootUri);
+        Loop::defer(function () use ($deferred, $capabilities, $rootPath, $processId, $rootUri) {
-        }
-        return coroutine(function () use ($capabilities, $rootPath, $processId) {
-
             if ($capabilities->xfilesProvider) {
                 $this->filesFinder = new ClientFilesFinder($this->client);
             } else {
@@ -200,25 +206,25 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
             );
 
             if ($rootPath !== null) {
-                yield $this->beforeIndex($rootPath);
+                yield from $this->beforeIndex($rootPath);
 
                 // Find composer.json
                 if ($this->composerJson === null) {
-                    $composerJsonFiles = yield $this->filesFinder->find(Path::makeAbsolute('**/composer.json', $rootPath));
+                    $composerJsonFiles = yield from $this->filesFinder->find(Path::makeAbsolute('**/composer.json', $rootPath));
                     sortUrisLevelOrder($composerJsonFiles);
 
                     if (!empty($composerJsonFiles)) {
-                        $this->composerJson = json_decode(yield $this->contentRetriever->retrieve($composerJsonFiles[0]));
+                        $this->composerJson = json_decode(yield from $this->contentRetriever->retrieve($composerJsonFiles[0]));
                     }
                 }
 
                 // Find composer.lock
                 if ($this->composerLock === null) {
-                    $composerLockFiles = yield $this->filesFinder->find(Path::makeAbsolute('**/composer.lock', $rootPath));
+                    $composerLockFiles = yield from $this->filesFinder->find(Path::makeAbsolute('**/composer.lock', $rootPath));
                     sortUrisLevelOrder($composerLockFiles);
 
                     if (!empty($composerLockFiles)) {
-                        $this->composerLock = json_decode(yield $this->contentRetriever->retrieve($composerLockFiles[0]));
+                        $this->composerLock = json_decode(yield from $this->contentRetriever->retrieve($composerLockFiles[0]));
                     }
                 }
 
@@ -236,7 +242,9 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
                     $this->composerLock,
                     $this->composerJson
                 );
-                $indexer->index()->otherwise('\\LanguageServer\\crash');
+                Loop::defer(function () use ($indexer) {
+                    yield from $indexer->index();
+                });
             }
 
 
@@ -288,8 +296,9 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
             $serverCapabilities->xdefinitionProvider = true;
             $serverCapabilities->xdependenciesProvider = true;
 
-            return new InitializeResult($serverCapabilities);
+            $deferred->resolve(new InitializeResult($serverCapabilities));
         });
+        return $deferred->promise();
     }
 
     /**
@@ -297,29 +306,23 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
      * (otherwise the response might not be delivered correctly to the client). There is a separate exit notification that
      * asks the server to exit.
      *
-     * @return void
+     * @return \Generator
      */
     public function shutdown()
     {
         unset($this->project);
-    }
+        $this->shutdownDeferred->resolve();
-
+        yield new Delayed(0);
-    /**
-     * A notification to ask the server to exit its process.
-     *
-     * @return void
-     */
-    public function exit()
-    {
-        exit(0);
     }
 
     /**
      * Called before indexing, can return a Promise
      *
      * @param string $rootPath
+     * @return \Generator
      */
     protected function beforeIndex(string $rootPath)
     {
+        yield new Delayed(0, null);
     }
 }

src/Message.php

@@ -1,10 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
 use AdvancedJsonRpc\Message as MessageBody;
-use LanguageServer\Message;
 
 class Message
 {
@@ -27,7 +26,7 @@ class Message
     public static function parse(string $msg): Message
     {
         $obj = new self;
-        $parts = explode("\r\n", $msg);
+        $parts = explode("\r\n\r\n", $msg, 2);
         $obj->body = MessageBody::parse(array_pop($parts));
         foreach ($parts as $line) {
             if ($line) {
@@ -55,11 +54,11 @@ class Message
     {
         $body = (string)$this->body;
         $contentLength = strlen($body);
-        $this->headers['Content-Length'] = $contentLength;
+        $this->headers['Content-Length'] = $contentLength + 6;
         $headers = '';
         foreach ($this->headers as $name => $value) {
             $headers .= "$name: $value\r\n";
         }
-        return $headers . "\r\n" . $body;
+        return $headers . "\r\n" . $body . "\r\n\r\n\r\n";
     }
 }

src/PhpDocument.php

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 

src/PhpDocumentLoader.php

@@ -1,14 +1,13 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
 use LanguageServer\ContentRetriever\ContentRetriever;
 use LanguageServer\Index\ProjectIndex;
-use phpDocumentor\Reflection\DocBlockFactory;
-use Sabre\Event\Promise;
-use function Sabre\Event\coroutine;
 use Microsoft\PhpParser;
+use Microsoft\PhpParser\Parser;
+use phpDocumentor\Reflection\DocBlockFactory;
 
 /**
  * Takes care of loading documents and managing "open" documents
@@ -18,7 +17,7 @@ class PhpDocumentLoader
     /**
      * A map from URI => PhpDocument of open documents that should be kept in memory
      *
-     * @var PhpDocument
+     * @var PhpDocument[]
      */
     private $documents = [];
 
@@ -37,11 +36,6 @@ class PhpDocumentLoader
      */
     private $parser;
 
-    /**
-     * @var PhpParser\Parser
-     */
-    private $tolerantParser;
-
     /**
      * @var DocBlockFactory
      */
@@ -87,11 +81,16 @@ class PhpDocumentLoader
      * If the document is not open, loads it.
      *
      * @param string $uri
-     * @return Promise <PhpDocument>
+     * @return \Generator <PhpDocument>
+     * @throws ContentTooLargeException
      */
-    public function getOrLoad(string $uri): Promise
+    public function getOrLoad(string $uri): \Generator
     {
-        return isset($this->documents[$uri]) ? Promise\resolve($this->documents[$uri]) : $this->load($uri);
+        if (isset($this->documents[$uri])) {
+            return $this->documents[$uri];
+        } else {
+            return yield from $this->load($uri);
+        }
     }
 
     /**
@@ -100,14 +99,13 @@ class PhpDocumentLoader
      * The document is NOT added to the list of open documents, but definitions are registered.
      *
      * @param string $uri
-     * @return Promise <PhpDocument>
+     * @return \Generator <PhpDocument>
+     * @throws ContentTooLargeException
      */
-    public function load(string $uri): Promise
+    public function load(string $uri): \Generator
     {
-        return coroutine(function () use ($uri) {
-
         $limit = 150000;
-            $content = yield $this->contentRetriever->retrieve($uri);
+        $content = yield from $this->contentRetriever->retrieve($uri);
         $size = strlen($content);
         if ($size > $limit) {
             throw new ContentTooLargeException($uri, $size, $limit);
@@ -120,7 +118,6 @@ class PhpDocumentLoader
             $document = $this->create($uri, $content);
         }
         return $document;
-        });
     }
 
     /**
@@ -147,7 +144,7 @@ class PhpDocumentLoader
      *
      * @param string $uri
      * @param string $content
-     * @return void
+     * @return PhpDocument
      */
     public function open(string $uri, string $content)
     {

src/ProtocolReader.php

@@ -1,9 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
-use Sabre\Event\EmitterInterface;
+use League\Event\EmitterInterface;
 
 /**
  * Must emit a "message" event with a Protocol\Message object as parameter

src/ProtocolStreamReader.php

@@ -1,65 +1,54 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
-use LanguageServer\Message;
 use AdvancedJsonRpc\Message as MessageBody;
-use Sabre\Event\{Loop, Emitter};
+use Amp\ByteStream\InputStream;
+use Amp\Loop;
+use LanguageServer\Event\MessageEvent;
+use League\Event\Emitter;
 
 class ProtocolStreamReader extends Emitter implements ProtocolReader
 {
-    const PARSE_HEADERS = 1;
-    const PARSE_BODY = 2;
-
     private $input;
-    private $parsingMode = self::PARSE_HEADERS;
-    private $buffer = '';
-    private $headers = [];
-    private $contentLength;
 
-    /**
+    public function __construct(InputStream $input)
-     * @param resource $input
-     */
-    public function __construct($input)
     {
         $this->input = $input;
-
+        Loop::defer(function () use (&$input) {
-        $this->on('close', function () {
+            $buffer = '';
-            Loop\removeReadStream($this->input);
+            while (true) {
-        });
+                $headers = [];
-
+                while (true) {
-        Loop\addReadStream($this->input, function () {
+                    while (($pos = strpos($buffer, "\r\n")) === false) {
-            if (feof($this->input)) {
+                        $read = yield $input->read();
-                // If stream_select reported a status change for this stream,
+                        if ($read === null) {
-                // but the stream is EOF, it means it was closed.
-                $this->emit('close');
                             return;
                         }
-            while (($c = fgetc($this->input)) !== false && $c !== '') {
+                        $buffer .= $read;
-                $this->buffer .= $c;
-                switch ($this->parsingMode) {
-                    case self::PARSE_HEADERS:
-                        if ($this->buffer === "\r\n") {
-                            $this->parsingMode = self::PARSE_BODY;
-                            $this->contentLength = (int)$this->headers['Content-Length'];
-                            $this->buffer = '';
-                        } else if (substr($this->buffer, -2) === "\r\n") {
-                            $parts = explode(':', $this->buffer);
-                            $this->headers[$parts[0]] = trim($parts[1]);
-                            $this->buffer = '';
-                        }
-                        break;
-                    case self::PARSE_BODY:
-                        if (strlen($this->buffer) === $this->contentLength) {
-                            $msg = new Message(MessageBody::parse($this->buffer), $this->headers);
-                            $this->emit('message', [$msg]);
-                            $this->parsingMode = self::PARSE_HEADERS;
-                            $this->headers = [];
-                            $this->buffer = '';
                     }
+
+                    $headerLine = substr($buffer, 0, $pos);
+                    $buffer = substr($buffer, (int)$pos + 2);
+                    if (!$headerLine) {
                         break;
                     }
+                    $headerPairs = \explode(': ', $headerLine);
+                    $headers[$headerPairs[0]] = $headerPairs[1];
+                }
+                $contentLength = (int)$headers['Content-Length'];
+                while (strlen($buffer) < $contentLength) {
+                    $read = yield $this->input->read();
+                    if ($read === null) {
+                        return;
+                    }
+                    $buffer .= $read;
+                }
+                $body = substr($buffer, 0, $contentLength);
+                $buffer = substr($buffer, $contentLength);
+                $msg = new Message(MessageBody::parse($body), $headers);
+                $this->emit(new MessageEvent('message', $msg));
             }
         });
     }

src/ProtocolStreamWriter.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
+use Amp\ByteStream\OutputStream;
 use LanguageServer\Message;
 use Sabre\Event\{
     Loop,
@@ -12,7 +13,7 @@ use Sabre\Event\{
 class ProtocolStreamWriter implements ProtocolWriter
 {
     /**
-     * @var resource $output
+     * @var OutputStream $output
      */
     private $output;
 
@@ -22,9 +23,9 @@ class ProtocolStreamWriter implements ProtocolWriter
     private $messages = [];
 
     /**
-     * @param resource $output
+     * @param OutputStream $output
      */
-    public function __construct($output)
+    public function __construct(OutputStream $output)
     {
         $this->output = $output;
     }
@@ -32,21 +33,9 @@ class ProtocolStreamWriter implements ProtocolWriter
     /**
      * {@inheritdoc}
      */
-    public function write(Message $msg): Promise
+    public function write(Message $msg): \Generator
     {
-        // if the message queue is currently empty, register a write handler.
+        yield $this->output->write((string)$msg);
-        if (empty($this->messages)) {
-            Loop\addWriteStream($this->output, function () {
-                $this->flush();
-            });
-        }
-
-        $promise = new Promise();
-        $this->messages[] = [
-            'message' => (string)$msg,
-            'promise' => $promise
-        ];
-        return $promise;
     }
 
     /**

src/ProtocolWriter.php

@@ -14,5 +14,5 @@ interface ProtocolWriter
      * @param Message $msg
      * @return Promise Resolved when the message has been fully written out to the output stream
      */
-    public function write(Message $msg): Promise;
+    public function write(Message $msg): \Generator;
 }

src/Server/TextDocument.php

@@ -1,37 +1,35 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Server;
 
-use LanguageServer\{
+use Amp\Coroutine;
-    CompletionProvider, SignatureHelpProvider, LanguageClient, PhpDocument, PhpDocumentLoader, DefinitionResolver
+use Amp\Deferred;
-};
+use Amp\Loop;
-use LanguageServer\Index\ReadableIndex;
+use Amp\Promise;
+use LanguageServer\{CompletionProvider,
+    DefinitionResolver,
+    LanguageClient,
+    PhpDocument,
+    PhpDocumentLoader,
+    SignatureHelpProvider};
 use LanguageServer\Factory\LocationFactory;
 use LanguageServer\Factory\RangeFactory;
-use LanguageServerProtocol\{
+use LanguageServer\Index\ReadableIndex;
-    FormattingOptions,
+use LanguageServerProtocol\{CompletionContext,
     Hover,
-    Location,
     MarkedString,
+    PackageDescriptor,
     Position,
-    Range,
     ReferenceContext,
     SymbolDescriptor,
-    PackageDescriptor,
     SymbolLocationInformation,
     TextDocumentIdentifier,
     TextDocumentItem,
-    VersionedTextDocumentIdentifier,
+    VersionedTextDocumentIdentifier};
-    CompletionContext
-};
 use Microsoft\PhpParser\Node;
-use Sabre\Event\Promise;
+use function LanguageServer\{getPackageName, isVendored};
-use Sabre\Uri;
+use function League\Uri\parse;
-use function LanguageServer\{
-    isVendored, waitForEvent, getPackageName
-};
-use function Sabre\Event\coroutine;
 
 /**
  * Provides method handlers for all textDocument/* methods
@@ -115,13 +113,18 @@ class TextDocument
      */
     public function documentSymbol(TextDocumentIdentifier $textDocument): Promise
     {
-        return $this->documentLoader->getOrLoad($textDocument->uri)->then(function (PhpDocument $document) {
+        $deferred = new Deferred();
+        Loop::defer(function () use ($textDocument, $deferred) {
+            /** @var PhpDocument $document */
+            $document = yield from $this->documentLoader->getOrLoad($textDocument->uri);
+
             $symbols = [];
             foreach ($document->getDefinitions() as $fqn => $definition) {
                 $symbols[] = $definition->symbolInformation;
             }
-            return $symbols;
+            $deferred->resolve($symbols);
         });
+        return $deferred->promise();
     }
 
     /**
@@ -134,10 +137,12 @@ class TextDocument
      */
     public function didOpen(TextDocumentItem $textDocument)
     {
+        Loop::defer(function () use ($textDocument) {
             $document = $this->documentLoader->open($textDocument->uri, $textDocument->text);
             if (!isVendored($document, $this->composerJson)) {
-            $this->client->textDocument->publishDiagnostics($textDocument->uri, $document->getDiagnostics());
+                yield from $this->client->textDocument->publishDiagnostics($textDocument->uri, $document->getDiagnostics());
             }
+        });
     }
 
     /**
@@ -145,13 +150,18 @@ class TextDocument
      *
      * @param \LanguageServerProtocol\VersionedTextDocumentIdentifier $textDocument
      * @param \LanguageServerProtocol\TextDocumentContentChangeEvent[] $contentChanges
-     * @return void
+     * @return Promise
      */
     public function didChange(VersionedTextDocumentIdentifier $textDocument, array $contentChanges)
     {
+        $deferred = new Deferred();
+        Loop::defer(function () use ($deferred, $textDocument, $contentChanges) {
             $document = $this->documentLoader->get($textDocument->uri);
             $document->updateContent($contentChanges[0]->text);
-        $this->client->textDocument->publishDiagnostics($textDocument->uri, $document->getDiagnostics());
+            yield from $this->client->textDocument->publishDiagnostics($textDocument->uri, $document->getDiagnostics());
+            $deferred->resolve();
+        });
+        return $deferred->promise();
     }
 
     /**
@@ -179,8 +189,9 @@ class TextDocument
         TextDocumentIdentifier $textDocument,
         Position $position
     ): Promise {
-        return coroutine(function () use ($textDocument, $position) {
+        $deferred = new Deferred();
-            $document = yield $this->documentLoader->getOrLoad($textDocument->uri);
+        Loop::defer(function () use ($deferred, $textDocument, $position) {
+            $document = yield from $this->documentLoader->getOrLoad($textDocument->uri);
             $node = $document->getNodeAtPosition($position);
             if ($node === null) {
                 return [];
@@ -189,7 +200,6 @@ class TextDocument
             // Variables always stay in the boundary of the file and need to be searched inside their function scope
             // by traversing the AST
             if (
-
                 ($node instanceof Node\Expression\Variable && !($node->getParent()->getParent() instanceof Node\PropertyDeclaration))
                 || $node instanceof Node\Parameter
                 || $node instanceof Node\UseVariableName
@@ -217,21 +227,18 @@ class TextDocument
                 // Definition with a global FQN
                 $fqn = DefinitionResolver::getDefinedFqn($node);
 
-                // Wait until indexing finished
-                if (!$this->index->isComplete()) {
-                    yield waitForEvent($this->index, 'complete');
-                }
                 if ($fqn === null) {
                     $fqn = $this->definitionResolver->resolveReferenceNodeToFqn($node);
                     if ($fqn === null) {
-                        return [];
+                        $deferred->resolve([]);
+                        return;
                     }
                 }
                 $refDocumentPromises = [];
                 foreach ($this->index->getReferenceUris($fqn) as $uri) {
-                    $refDocumentPromises[] = $this->documentLoader->getOrLoad($uri);
+                    $refDocumentPromises[] = new Coroutine($this->documentLoader->getOrLoad($uri));
                 }
-                $refDocuments = yield Promise\all($refDocumentPromises);
+                $refDocuments = yield \Amp\Promise\all($refDocumentPromises);
                 foreach ($refDocuments as $document) {
                     $refs = $document->getReferenceNodesByFqn($fqn);
                     if ($refs !== null) {
@@ -241,8 +248,9 @@ class TextDocument
                     }
                 }
             }
-            return $locations;
+            $deferred->resolve($locations);
         });
+        return $deferred->promise();
     }
 
     /**
@@ -256,10 +264,14 @@ class TextDocument
      */
     public function signatureHelp(TextDocumentIdentifier $textDocument, Position $position): Promise
     {
-        return coroutine(function () use ($textDocument, $position) {
+        $deferred = new Deferred();
-            $document = yield $this->documentLoader->getOrLoad($textDocument->uri);
+        Loop::defer(function () use ($deferred, $textDocument, $position) {
-            return $this->signatureHelpProvider->getSignatureHelp($document, $position);
+            $document = yield from $this->documentLoader->getOrLoad($textDocument->uri);
+            $deferred->resolve(
+                yield from $this->signatureHelpProvider->getSignatureHelp($document, $position)
+            );
         });
+        return $deferred->promise();
     }
 
     /**
@@ -269,11 +281,13 @@ class TextDocument
      * @param TextDocumentIdentifier $textDocument The text document
      * @param Position $position The position inside the text document
      * @return Promise <Location|Location[]>
+     * @throws \LanguageServer\ContentTooLargeException
      */
     public function definition(TextDocumentIdentifier $textDocument, Position $position): Promise
     {
-        return coroutine(function () use ($textDocument, $position) {
+        $deferred = new Deferred();
-            $document = yield $this->documentLoader->getOrLoad($textDocument->uri);
+        Loop::defer(function () use ($deferred, $textDocument, $position) {
+            $document = yield from $this->documentLoader->getOrLoad($textDocument->uri);
             $node = $document->getNodeAtPosition($position);
             if ($node === null) {
                 return [];
@@ -291,17 +305,18 @@ class TextDocument
                 if ($def !== null || $this->index->isComplete()) {
                     break;
                 }
-                yield waitForEvent($this->index, 'definition-added');
             }
             if (
                 $def === null
                 || $def->symbolInformation === null
-                || Uri\parse($def->symbolInformation->location->uri)['scheme'] === 'phpstubs'
+                || parse($def->symbolInformation->location->uri)['scheme'] === 'phpstubs'
             ) {
-                return [];
+                $deferred->resolve([]);
+            } else {
+                $deferred->resolve($def->symbolInformation->location);
             }
-            return $def->symbolInformation->location;
         });
+        return $deferred->promise();
     }
 
     /**
@@ -313,8 +328,9 @@ class TextDocument
      */
     public function hover(TextDocumentIdentifier $textDocument, Position $position): Promise
     {
-        return coroutine(function () use ($textDocument, $position) {
+        $deferred = new Deferred();
-            $document = yield $this->documentLoader->getOrLoad($textDocument->uri);
+        Loop::defer(function () use ($deferred, $textDocument, $position) {
+            $document = yield from $this->documentLoader->getOrLoad($textDocument->uri);
             // Find the node under the cursor
             $node = $document->getNodeAtPosition($position);
             if ($node === null) {
@@ -333,7 +349,6 @@ class TextDocument
                 if ($def !== null || $this->index->isComplete()) {
                     break;
                 }
-                yield waitForEvent($this->index, 'definition-added');
             }
             $range = RangeFactory::fromNode($node);
             if ($def === null) {
@@ -346,8 +361,9 @@ class TextDocument
             if ($def->documentation) {
                 $contents[] = $def->documentation;
             }
-            return new Hover($contents, $range);
+            $deferred->resolve(new Hover($contents, $range));
         });
+        return $deferred->promise();
     }
 
     /**
@@ -360,17 +376,20 @@ class TextDocument
      * interface then a 'completionItem/resolve' request is sent with the selected completion item as a param. The
      * returned completion item should have the documentation property filled in.
      *
-     * @param TextDocumentIdentifier The text document
+     * @param TextDocumentIdentifier $textDocument
      * @param Position $position The position
      * @param CompletionContext|null $context The completion context
      * @return Promise <CompletionItem[]|CompletionList>
      */
     public function completion(TextDocumentIdentifier $textDocument, Position $position, CompletionContext $context = null): Promise
     {
-        return coroutine(function () use ($textDocument, $position, $context) {
+        $deferred = new Deferred();
-            $document = yield $this->documentLoader->getOrLoad($textDocument->uri);
+        Loop::defer(function () use ($deferred, $context, $position, $textDocument) {
-            return $this->completionProvider->provideCompletion($document, $position, $context);
+            /** @var PhpDocument $document */
+            $document = yield from $this->documentLoader->getOrLoad($textDocument->uri);
+            $deferred->resolve($this->completionProvider->provideCompletion($document, $position, $context));
         });
+        return $deferred->promise();
     }
 
     /**
@@ -387,7 +406,8 @@ class TextDocument
      */
     public function xdefinition(TextDocumentIdentifier $textDocument, Position $position): Promise
     {
-        return coroutine(function () use ($textDocument, $position) {
+        $deferred = new Deferred();
+        Loop::defer(function () use ($deferred, $textDocument, $position) {
             $document = yield $this->documentLoader->getOrLoad($textDocument->uri);
             $node = $document->getNodeAtPosition($position);
             if ($node === null) {
@@ -406,12 +426,11 @@ class TextDocument
                 if ($def !== null || $this->index->isComplete()) {
                     break;
                 }
-                yield waitForEvent($this->index, 'definition-added');
             }
             if (
                 $def === null
                 || $def->symbolInformation === null
-                || Uri\parse($def->symbolInformation->location->uri)['scheme'] === 'phpstubs'
+                || parse($def->symbolInformation->location->uri)['scheme'] === 'phpstubs'
             ) {
                 return [];
             }
@@ -422,7 +441,8 @@ class TextDocument
                 $packageName = $this->composerJson->name;
             }
             $descriptor = new SymbolDescriptor($def->fqn, new PackageDescriptor($packageName));
-            return [new SymbolLocationInformation($descriptor, $def->symbolInformation->location)];
+            $deferred->resolve([new SymbolLocationInformation($descriptor, $def->symbolInformation->location)]);
         });
+        return $deferred->promise();
     }
 }

src/Server/Workspace.php

@@ -1,23 +1,17 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Server;
 
+use Amp\Deferred;
+use Amp\Delayed;
+use Amp\Loop;
+use Amp\Promise;
+use Amp\Success;
 use LanguageServer\{LanguageClient, PhpDocumentLoader};
-use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\Factory\LocationFactory;
-use LanguageServerProtocol\{
+use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex};
-    FileChangeType,
+use LanguageServerProtocol\{DependencyReference, FileChangeType, FileEvent, ReferenceInformation, SymbolDescriptor};
-    FileEvent,
-    SymbolInformation,
-    SymbolDescriptor,
-    ReferenceInformation,
-    DependencyReference,
-    Location
-};
-use Sabre\Event\Promise;
-use function Sabre\Event\coroutine;
-use function LanguageServer\waitForEvent;
 
 /**
  * Provides method handlers for all workspace/* methods
@@ -83,19 +77,13 @@ class Workspace
      */
     public function symbol(string $query): Promise
     {
-        return coroutine(function () use ($query) {
-            // Wait until indexing for definitions finished
-            if (!$this->sourceIndex->isStaticComplete()) {
-                yield waitForEvent($this->sourceIndex, 'static-complete');
-            }
         $symbols = [];
         foreach ($this->sourceIndex->getDefinitions() as $fqn => $definition) {
             if ($query === '' || stripos($fqn, $query) !== false) {
                 $symbols[] = $definition->symbolInformation;
             }
         }
-            return $symbols;
+        return new Success($symbols);
-        });
     }
 
     /**
@@ -106,11 +94,13 @@ class Workspace
      */
     public function didChangeWatchedFiles(array $changes)
     {
+        Loop::defer(function () use ($changes) {
             foreach ($changes as $change) {
                 if ($change->type === FileChangeType::DELETED) {
-                $this->client->textDocument->publishDiagnostics($change->uri, []);
+                    yield from $this->client->textDocument->publishDiagnostics($change->uri, []);
                 }
             }
+        });
     }
 
     /**
@@ -118,23 +108,21 @@ class Workspace
      *
      * @param SymbolDescriptor $query Partial metadata about the symbol that is being searched for.
      * @param string[] $files An optional list of files to restrict the search to.
-     * @return ReferenceInformation[]
+     * @return \Generator
+     * @throws \LanguageServer\ContentTooLargeException
      */
-    public function xreferences($query, array $files = null): Promise
+    public function xreferences($query, array $files = null): \Generator
     {
+        $deferred = new Deferred();
+        Loop::defer(function () use ($deferred, $query, $files) {
             // TODO: $files is unused in the coroutine
-        return coroutine(function () use ($query, $files) {
             if ($this->composerLock === null) {
                 return [];
             }
-            // Wait until indexing finished
-            if (!$this->projectIndex->isComplete()) {
-                yield waitForEvent($this->projectIndex, 'complete');
-            }
             /** Map from URI to array of referenced FQNs in dependencies */
             $refs = [];
             // Get all references TO dependencies
-            $fqns = isset($query->fqsen) ? [$query->fqsen] : array_values($this->dependenciesIndex->getDefinitions());
+            $fqns = isset($query->fqsen) ? [$query->fqsen] : array_values(yield from $this->dependenciesIndex->getDefinitions());
             foreach ($fqns as $fqn) {
                 foreach ($this->sourceIndex->getReferenceUris($fqn) as $uri) {
                     if (!isset($refs[$uri])) {
@@ -148,7 +136,7 @@ class Workspace
             $refInfos = [];
             foreach ($refs as $uri => $fqns) {
                 foreach ($fqns as $fqn) {
-                    $doc = yield $this->documentLoader->getOrLoad($uri);
+                    $doc = yield from $this->documentLoader->getOrLoad($uri);
                     foreach ($doc->getReferenceNodesByFqn($fqn) as $node) {
                         $refInfo = new ReferenceInformation;
                         $refInfo->reference = LocationFactory::fromNode($node);
@@ -157,8 +145,9 @@ class Workspace
                     }
                 }
             }
-            return $refInfos;
+            $deferred->resolve($refInfos);
         });
+        return $deferred->promise();
     }
 
     /**

src/SignatureHelpProvider.php

@@ -1,16 +1,13 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
+use Amp\Delayed;
 use LanguageServer\Index\ReadableIndex;
-use LanguageServerProtocol\{
+use LanguageServerProtocol\{Position, SignatureHelp};
-    Position,
-    SignatureHelp
-};
 use Microsoft\PhpParser\Node;
 use Sabre\Event\Promise;
-use function Sabre\Event\coroutine;
 
 class SignatureHelpProvider
 {
@@ -45,14 +42,13 @@ class SignatureHelpProvider
      *
      * @return Promise <SignatureHelp>
      */
-    public function getSignatureHelp(PhpDocument $doc, Position $position): Promise
+    public function getSignatureHelp(PhpDocument $doc, Position $position): \Generator
     {
-        return coroutine(function () use ($doc, $position) {
         // Find the node under the cursor
         $node = $doc->getNodeAtPosition($position);
 
         // Find the definition of the item being called
-            list($def, $argumentExpressionList) = yield $this->getCallingInfo($node);
+        list($def, $argumentExpressionList) = yield from $this->getCallingInfo($node);
 
         if (!$def || !$def->signatureInformation) {
             return new SignatureHelp();
@@ -64,7 +60,6 @@ class SignatureHelpProvider
             : 0;
 
         return new SignatureHelp([$def->signatureInformation], 0, $activeParam);
-        });
     }
 
     /**
@@ -73,11 +68,10 @@ class SignatureHelpProvider
      *
      * @param Node $node The node to find calling information from
      *
-     * @return Promise <array|null>
+     * @return \Generator <array|null>
      */
-    private function getCallingInfo(Node $node)
+    private function getCallingInfo(Node $node): \Generator
     {
-        return coroutine(function () use ($node) {
         $fqn = null;
         $callingNode = null;
         if ($node instanceof Node\DelimitedList\ArgumentExpressionList) {
@@ -133,15 +127,14 @@ class SignatureHelpProvider
             if ($def !== null || $this->index->isComplete()) {
                 break;
             }
-                yield waitForEvent($this->index, 'definition-added');
         }
 
         if (!$def) {
             return null;
         }
 
+        yield new Delayed(0);
         return [$def, $argumentExpressionList];
-        });
     }
 
     /**

src/utils.php

@@ -1,12 +1,12 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer;
 
-use Throwable;
+use Amp\Loop;
 use InvalidArgumentException;
-use Sabre\Event\{Loop, Promise, EmitterInterface};
+use Throwable;
-use Sabre\Uri;
+use function League\Uri\parse;
 
 /**
  * Transforms an absolute file path into a URI as used by the language server protocol.
@@ -60,39 +60,11 @@ function uriToPath(string $uri)
  */
 function crash(Throwable $err)
 {
-    Loop\nextTick(function () use ($err) {
+    Loop::run(function () use ($err) {
         throw $err;
     });
 }
 
-/**
- * Returns a promise that is resolved after x seconds.
- * Useful for giving back control to the event loop inside a coroutine.
- *
- * @param int $seconds
- * @return Promise <void>
- */
-function timeout($seconds = 0): Promise
-{
-    $promise = new Promise;
-    Loop\setTimeout([$promise, 'fulfill'], $seconds);
-    return $promise;
-}
-
-/**
- * Returns a promise that is fulfilled once the passed event was triggered on the passed EventEmitter
- *
- * @param EmitterInterface $emitter
- * @param string           $event
- * @return Promise
- */
-function waitForEvent(EmitterInterface $emitter, string $event): Promise
-{
-    $p = new Promise;
-    $emitter->once($event, [$p, 'fulfill']);
-    return $p;
-}
-
 /**
  * Returns the part of $b that is not overlapped by $a
  * Example:
@@ -125,7 +97,7 @@ function stripStringOverlap(string $a, string $b): string
 function sortUrisLevelOrder(&$uriList)
 {
     usort($uriList, function ($a, $b) {
-        return substr_count(Uri\parse($a)['path'], '/') - substr_count(Uri\parse($b)['path'], '/');
+        return substr_count(parse($a)['path'], '/') - substr_count(parse($b)['path'], '/');
     });
 }
 
@@ -139,7 +111,7 @@ function sortUrisLevelOrder(&$uriList)
  */
 function isVendored(PhpDocument $document, \stdClass $composerJson = null): bool
 {
-    $path = Uri\parse($document->getUri())['path'];
+    $path = parse($document->getUri())['path'];
     $vendorDir = getVendorDir($composerJson);
     return strpos($path, "/$vendorDir/") !== false;
 }

tests/ClientHandlerTest.php

@@ -1,43 +1,48 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests;
 
-use PHPUnit\Framework\TestCase;
-use LanguageServer\ClientHandler;
-use LanguageServer\Message;
 use AdvancedJsonRpc;
-use Sabre\Event\Loop;
+use Amp\Loop;
+use LanguageServer\ClientHandler;
+use LanguageServer\Event\MessageEvent;
+use LanguageServer\Message;
+use PHPUnit\Framework\TestCase;
 
 class ClientHandlerTest extends TestCase
 {
     public function testRequest()
     {
+        Loop::run(function () {
             $reader = new MockProtocolStream;
             $writer = new MockProtocolStream;
             $handler = new ClientHandler($reader, $writer);
-        $writer->once('message', function (Message $msg) use ($reader) {
+            $writer->addOneTimeListener('message', function (MessageEvent $messageEvent) use ($reader) {
+                $msg = $messageEvent->getMessage();
                 // Respond to request
-            Loop\setTimeout(function () use ($reader, $msg) {
+                Loop::defer(function () use ($reader, $msg) {
-                $reader->write(new Message(new AdvancedJsonRpc\SuccessResponse($msg->body->id, 'pong')));
+                    yield from $reader->write(new Message(new AdvancedJsonRpc\SuccessResponse($msg->body->id, 'pong')));
-            }, 0);
                 });
-        $handler->request('testMethod', ['ping'])->then(function ($result) {
+            });
+            $result = yield from $handler->request('testMethod', ['ping']);
             $this->assertEquals('pong', $result);
-        })->wait();
             // No event listeners
-        $this->assertEquals([], $reader->listeners('message'));
+            $this->assertEquals([], $reader->getListeners('message'));
-        $this->assertEquals([], $writer->listeners('message'));
+            $this->assertEquals([], $writer->getListeners('message'));
+        });
     }
 
     public function testNotify()
     {
+        Loop::run(function () {
             $reader = new MockProtocolStream;
             $writer = new MockProtocolStream;
             $handler = new ClientHandler($reader, $writer);
-        $handler->notify('testMethod', ['ping'])->wait();
+            yield from $handler->notify('testMethod', ['ping']);
             // No event listeners
-        $this->assertEquals([], $reader->listeners('message'));
+            $this->assertEquals([], $reader->getListeners('message'));
-        $this->assertEquals([], $writer->listeners('message'));
+            $this->assertEquals([], $writer->getListeners('message'));
+        });
     }
 }

tests/LanguageServerTest.php

@@ -1,35 +1,36 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests;
 
-use PHPUnit\Framework\TestCase;
+use AdvancedJsonRpc;
+use Amp\Deferred;
+use Amp\Loop;
+use Exception;
+use LanguageServer\Event\MessageEvent;
 use LanguageServer\LanguageServer;
 use LanguageServer\Message;
-use LanguageServerProtocol\{
+use LanguageServerProtocol\{ClientCapabilities,
-    ClientCapabilities,
-    TextDocumentSyncKind,
-    MessageType,
-    TextDocumentItem,
-    TextDocumentIdentifier,
-    InitializeResult,
-    ServerCapabilities,
     CompletionOptions,
-    SignatureHelpOptions
+    InitializeResult,
-};
+    MessageType,
-use AdvancedJsonRpc;
+    ServerCapabilities,
+    SignatureHelpOptions,
+    TextDocumentIdentifier,
+    TextDocumentItem,
+    TextDocumentSyncKind};
+use PHPUnit\Framework\TestCase;
 use Webmozart\Glob\Glob;
 use Webmozart\PathUtil\Path;
-use Sabre\Event\Promise;
-use Exception;
 use function LanguageServer\pathToUri;
 
 class LanguageServerTest extends TestCase
 {
     public function testInitialize()
     {
+        Loop::run(function () {
             $server = new LanguageServer(new MockProtocolStream, new MockProtocolStream);
-        $result = $server->initialize(new ClientCapabilities, __DIR__, getmypid())->wait();
+            $result = yield $server->initialize(new ClientCapabilities, __DIR__, getmypid());
 
             $serverCapabilities = new ServerCapabilities();
             $serverCapabilities->textDocumentSync = TextDocumentSyncKind::FULL;
@@ -48,38 +49,47 @@ class LanguageServerTest extends TestCase
             $serverCapabilities->xdependenciesProvider = true;
 
             $this->assertEquals(new InitializeResult($serverCapabilities), $result);
+        });
     }
 
     public function testIndexingWithDirectFileAccess()
     {
-        $promise = new Promise;
+        Loop::run(function () {
+            $deferred = new Deferred();
             $input = new MockProtocolStream;
             $output = new MockProtocolStream;
-        $output->on('message', function (Message $msg) use ($promise) {
+            $output->addListener('message', function (MessageEvent $messageEvent) use ($deferred) {
-            if ($msg->body->method === 'window/logMessage' && $promise->state === Promise::PENDING) {
+                $msg = $messageEvent->getMessage();
+                Loop::defer(function () use ($deferred, $msg) {
+                    if ($msg->body->method === 'window/logMessage') {
                         if ($msg->body->params->type === MessageType::ERROR) {
-                    $promise->reject(new Exception($msg->body->params->message));
+                            $deferred->fail(new Exception($msg->body->params->message));
                         } else if (preg_match('/All \d+ PHP files parsed/', $msg->body->params->message)) {
-                    $promise->fulfill();
+                            $deferred->resolve(true);
                         }
                     }
                 });
+            });
             $server = new LanguageServer($input, $output);
             $capabilities = new ClientCapabilities;
-        $server->initialize($capabilities, realpath(__DIR__ . '/../fixtures'), getmypid());
+            yield $server->initialize($capabilities, realpath(__DIR__ . '/../fixtures'), getmypid());
-        $promise->wait();
+            $this->assertTrue(yield $deferred->promise());
+        });
     }
 
     public function testIndexingWithFilesAndContentRequests()
     {
-        $promise = new Promise;
+        Loop::run(function () {
+            $deferred = new Deferred();
             $filesCalled = false;
             $contentCalled = false;
             $rootPath = realpath(__DIR__ . '/../fixtures');
             $input = new MockProtocolStream;
             $output = new MockProtocolStream;
             $run = 1;
-        $output->on('message', function (Message $msg) use ($promise, $input, $rootPath, &$filesCalled, &$contentCalled, &$run) {
+            $output->addListener('message', function (MessageEvent $messageEvent) use ($deferred, $input, $rootPath, &$filesCalled, &$contentCalled, &$run) {
+                $msg = $messageEvent->getMessage();
+                Loop::defer(function () use ($msg, $deferred, $input, $rootPath, &$filesCalled, &$contentCalled, &$run) {
                     if ($msg->body->method === 'textDocument/xcontent') {
                         // Document content requested
                         $contentCalled = true;
@@ -88,7 +98,7 @@ class LanguageServerTest extends TestCase
                         $textDocumentItem->version = 1;
                         $textDocumentItem->languageId = 'php';
                         $textDocumentItem->text = file_get_contents($msg->body->params->textDocument->uri);
-                $input->write(new Message(new AdvancedJsonRpc\SuccessResponse($msg->body->id, $textDocumentItem)));
+                        yield from $input->write(new Message(new AdvancedJsonRpc\SuccessResponse($msg->body->id, $textDocumentItem)));
                     } else if ($msg->body->method === 'workspace/xfiles') {
                         // Files requested
                         $filesCalled = true;
@@ -97,26 +107,26 @@ class LanguageServerTest extends TestCase
                         foreach (Glob::glob($pattern) as $path) {
                             $files[] = new TextDocumentIdentifier(pathToUri($path));
                         }
-                $input->write(new Message(new AdvancedJsonRpc\SuccessResponse($msg->body->id, $files)));
+                        yield from $input->write(new Message(new AdvancedJsonRpc\SuccessResponse($msg->body->id, $files)));
                     } else if ($msg->body->method === 'window/logMessage') {
                         // Message logged
                         if ($msg->body->params->type === MessageType::ERROR) {
                             // Error happened during indexing, fail test
-                    if ($promise->state === Promise::PENDING) {
+                            $deferred->fail(new Exception($msg->body->params->message));
-                        $promise->reject(new Exception($msg->body->params->message));
-                    }
                         } else if (preg_match('/All \d+ PHP files parsed/', $msg->body->params->message)) {
-                    $promise->fulfill();
+                            $deferred->resolve(true);
                         }
                     }
                 });
+            });
             $server = new LanguageServer($input, $output);
             $capabilities = new ClientCapabilities;
             $capabilities->xfilesProvider = true;
             $capabilities->xcontentProvider = true;
-        $server->initialize($capabilities, $rootPath, getmypid());
+            yield $server->initialize($capabilities, $rootPath, getmypid());
-        $promise->wait();
+            yield $deferred->promise();
             $this->assertTrue($filesCalled);
             $this->assertTrue($contentCalled);
+        });
     }
 }

tests/MockProtocolStream.php

@@ -1,11 +1,15 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests;
 
-use LanguageServer\{ProtocolReader, ProtocolWriter};
+use Amp\Deferred;
+use Amp\Delayed;
+use Amp\Loop;
+use LanguageServer\{Event\MessageEvent, ProtocolReader, ProtocolWriter};
 use LanguageServer\Message;
-use Sabre\Event\{Loop, Emitter, Promise};
+use League\Event\Emitter;
+use League\Event\Event;
 
 /**
  * A fake duplex protocol stream
@@ -18,11 +22,11 @@ class MockProtocolStream extends Emitter implements ProtocolReader, ProtocolWrit
      * @param Message $msg
      * @return void
      */
-    public function write(Message $msg): Promise
+    public function write(Message $msg): \Generator
     {
-        Loop\nextTick(function () use ($msg) {
+        Loop::defer(function () use ($msg) {
-            $this->emit('message', [Message::parse((string)$msg)]);
+            $this->emit(new MessageEvent('message', Message::parse((string)$msg)));
         });
-        return Promise\resolve(null);
+        yield new Delayed(0);
     }
 }

tests/PhpDocumentLoaderTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server;
 
+use Amp\Loop;
 use LanguageServer\{
     PhpDocument, PhpDocumentLoader, Project, DefinitionResolver
 };
@@ -32,10 +33,12 @@ class PhpDocumentLoaderTest extends TestCase
 
     public function testGetOrLoadLoadsDocument()
     {
-        $document = $this->loader->getOrLoad(pathToUri(__FILE__))->wait();
+        Loop::run(function () {
+            $document = yield from $this->loader->getOrLoad(pathToUri(__FILE__));
 
             $this->assertNotNull($document);
             $this->assertInstanceOf(PhpDocument::class, $document);
+        });
     }
 
     public function testGetReturnsOpenedInstance()

tests/ProtocolStreamReaderTest.php

@@ -1,32 +1,49 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests;
 
-use PHPUnit\Framework\TestCase;
+use AdvancedJsonRpc\{Request as RequestBody};
-use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
+use Amp\ByteStream\ResourceInputStream;
+use Amp\ByteStream\ResourceOutputStream;
+use Amp\Deferred;
+use Amp\Loop;
+use LanguageServer\{Event\MessageEvent, ProtocolStreamReader};
 use LanguageServer\Message;
-use AdvancedJsonRpc\{Request as RequestBody, Response as ResponseBody};
+use PHPUnit\Framework\TestCase;
-use Sabre\Event\Loop;
 
 class ProtocolStreamReaderTest extends TestCase
 {
+    public function getStreamPair()
+    {
+        $domain = \stripos(PHP_OS, "win") === 0 ? STREAM_PF_INET : STREAM_PF_UNIX;
+        list($left, $right) = @\stream_socket_pair($domain, \STREAM_SOCK_STREAM, \STREAM_IPPROTO_IP);
+        $a = new ResourceOutputStream($left);
+        $b = new ResourceInputStream($right);
+        return [$a, $b];
+    }
+
     public function testParsingWorksAndListenerIsCalled()
     {
-        $tmpfile = tempnam('', '');
+        Loop::run(function () {
-        $writeHandle = fopen($tmpfile, 'w');
+            /** @var ResourceOutputStream $outputStream */
-        $reader = new ProtocolStreamReader(fopen($tmpfile, 'r'));
+            /** @var ResourceInputStream $inputStream */
-        $msg = null;
+            list($outputStream, $inputStream) = $this->getStreamPair();
-        $reader->on('message', function (Message $message) use (&$msg) {
+
-            $msg = $message;
+            $reader = new ProtocolStreamReader($inputStream);
+            $deferred = new Deferred();
+            $reader->addListener('message', function (MessageEvent $messageEvent) use (&$deferred) {
+                $deferred->resolve($messageEvent->getMessage());
             });
-        $ret = fwrite($writeHandle, (string)new Message(new RequestBody(1, 'aMethod', ['arg' => 'Hello World'])));
+
-        Loop\tick();
+            yield $outputStream->write((string)new Message(new RequestBody(1, 'aMethod', ['arg' => 'Hello World'])));
+            $msg = yield $deferred->promise();
             $this->assertNotNull($msg);
             $this->assertInstanceOf(Message::class, $msg);
             $this->assertInstanceOf(RequestBody::class, $msg->body);
             $this->assertEquals(1, $msg->body->id);
             $this->assertEquals('aMethod', $msg->body->method);
             $this->assertEquals((object)['arg' => 'Hello World'], $msg->body->params);
+        });
     }
 }

tests/ProtocolStreamWriterTest.php

@@ -1,35 +0,0 @@
-<?php
-declare(strict_types = 1);
-
-namespace LanguageServer\Tests;
-
-use PHPUnit\Framework\TestCase;
-use LanguageServer\ProtocolStreamWriter;
-use LanguageServer\Message;
-use AdvancedJsonRpc\{Request as RequestBody};
-use Sabre\Event\Loop;
-
-class ProtocolStreamWriterTest extends TestCase
-{
-    public function testLargeMessageIsSent()
-    {
-        $tmpfile = tempnam('', '');
-        $writeHandle = fopen($tmpfile, 'w');
-
-        stream_set_blocking($writeHandle, false);
-
-        $writer = new ProtocolStreamWriter($writeHandle);
-        $msg = new Message(new RequestBody(1, 'aMethod', ['arg' => str_repeat('X', 100000)]));
-        $msgString = (string)$msg;
-
-        $promise = $writer->write($msg);
-
-        Loop\tick();
-
-        $promise->wait();
-
-        fclose($writeHandle);
-
-        $this->assertEquals(strlen($msgString), filesize($tmpfile));
-    }
-}

tests/Server/ServerTestCase.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server;
 
+use Amp\Loop;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
@@ -46,6 +47,7 @@ abstract class ServerTestCase extends TestCase
 
     public function setUp()
     {
+        Loop::run(function () {
             $sourceIndex = new Index;
             $dependenciesIndex = new DependenciesIndex;
             $projectIndex = new ProjectIndex($sourceIndex, $dependenciesIndex);
@@ -63,18 +65,18 @@ abstract class ServerTestCase extends TestCase
             $referencesUri = pathToUri(realpath(__DIR__ . '/../../fixtures/references.php'));
             $useUri = pathToUri(realpath(__DIR__ . '/../../fixtures/use.php'));
 
-        $this->documentLoader->load($symbolsUri)->wait();
+            yield from $this->documentLoader->load($symbolsUri);
-        $this->documentLoader->load($referencesUri)->wait();
+            yield from $this->documentLoader->load($referencesUri);
-        $this->documentLoader->load($globalSymbolsUri)->wait();
+            yield from $this->documentLoader->load($globalSymbolsUri);
-        $this->documentLoader->load($globalReferencesUri)->wait();
+            yield from $this->documentLoader->load($globalReferencesUri);
-        $this->documentLoader->load($useUri)->wait();
+            yield from $this->documentLoader->load($useUri);
 
             // @codingStandardsIgnoreStart
             $this->definitionLocations = [
 
                 // Global
                 'TEST_DEFINE_CONSTANT' => new Location($globalSymbolsUri, new Range(new Position(104, 0), new Position(104, 37))),
-            'TEST_CONST'                             => new Location($globalSymbolsUri,    new Range(new Position( 9,  6), new Position( 9,  22))),
+                'TEST_CONST' => new Location($globalSymbolsUri, new Range(new Position(9, 6), new Position(9, 22))),
                 'TestClass' => new Location($globalSymbolsUri, new Range(new Position(20, 0), new Position(61, 1))),
                 'ChildClass' => new Location($globalSymbolsUri, new Range(new Position(99, 0), new Position(99, 37))),
                 'TestTrait' => new Location($globalSymbolsUri, new Range(new Position(63, 0), new Position(66, 1))),
@@ -86,14 +88,14 @@ abstract class ServerTestCase extends TestCase
                 'TestClass::testMethod()' => new Location($globalSymbolsUri, new Range(new Position(57, 4), new Position(60, 5))),
                 'test_function()' => new Location($globalSymbolsUri, new Range(new Position(78, 0), new Position(81, 1))),
                 'UnusedClass' => new Location($globalSymbolsUri, new Range(new Position(111, 0), new Position(118, 1))),
-            'UnusedClass::unusedProperty'            => new Location($globalSymbolsUri,    new Range(new Position(113,11), new Position(113, 26))),
+                'UnusedClass::unusedProperty' => new Location($globalSymbolsUri, new Range(new Position(113, 11), new Position(113, 26))),
                 'UnusedClass::unusedMethod' => new Location($globalSymbolsUri, new Range(new Position(115, 4), new Position(117, 5))),
                 'whatever()' => new Location($globalReferencesUri, new Range(new Position(21, 0), new Position(23, 1))),
 
                 // Namespaced
-            'TestNamespace'                                => new Location($symbolsUri,    new Range(new Position( 2, 0), new Position( 2, 24))),
+                'TestNamespace' => new Location($symbolsUri, new Range(new Position(2, 0), new Position(2, 24))),
-            'SecondTestNamespace'                          => new Location($useUri,        new Range(new Position( 2, 0), new Position( 2, 30))),
+                'SecondTestNamespace' => new Location($useUri, new Range(new Position(2, 0), new Position(2, 30))),
-            'TestNamespace\\TEST_CONST'                    => new Location($symbolsUri,    new Range(new Position( 9,  6), new Position( 9, 22))),
+                'TestNamespace\\TEST_CONST' => new Location($symbolsUri, new Range(new Position(9, 6), new Position(9, 22))),
                 'TestNamespace\\TestClass' => new Location($symbolsUri, new Range(new Position(20, 0), new Position(61, 1))),
                 'TestNamespace\\ChildClass' => new Location($symbolsUri, new Range(new Position(99, 0), new Position(99, 37))),
                 'TestNamespace\\TestTrait' => new Location($symbolsUri, new Range(new Position(63, 0), new Position(66, 1))),
@@ -117,23 +119,23 @@ abstract class ServerTestCase extends TestCase
                 // Namespaced
                 'TestNamespace' => [
                     0 => new Location($referencesUri, new Range(new Position(31, 13), new Position(31, 40))), // use function TestNamespace\test_function;
-                1 => new Location($useUri,        new Range(new Position( 4,  4), new Position( 4, 27))), // use TestNamespace\TestClass;
+                    1 => new Location($useUri, new Range(new Position(4, 4), new Position(4, 27))), // use TestNamespace\TestClass;
-                2 => new Location($useUri,        new Range(new Position( 5,  4), new Position( 5, 18)))  // use TestNamespace\{TestTrait, TestInterface};
+                    2 => new Location($useUri, new Range(new Position(5, 4), new Position(5, 18)))  // use TestNamespace\{TestTrait, TestInterface};
                 ],
                 'TestNamespace\\TEST_CONST' => [
                     0 => new Location($referencesUri, new Range(new Position(29, 5), new Position(29, 15)))
                 ],
                 'TestNamespace\\TestClass' => [
                     0 => new Location($symbolsUri, new Range(new Position(48, 13), new Position(48, 17))), // echo self::TEST_CLASS_CONST;
-                1 => new Location($symbolsUri   , new Range(new Position(99, 25), new Position(99, 34))), // class ChildClass extends TestClass {}
+                    1 => new Location($symbolsUri, new Range(new Position(99, 25), new Position(99, 34))), // class ChildClass extends TestClass {}
-                2 => new Location($referencesUri, new Range(new Position( 4, 11), new Position( 4, 20))), // $obj = new TestClass();
+                    2 => new Location($referencesUri, new Range(new Position(4, 11), new Position(4, 20))), // $obj = new TestClass();
-                3 => new Location($referencesUri, new Range(new Position( 7,  0), new Position( 7,  9))), // TestClass::staticTestMethod();
+                    3 => new Location($referencesUri, new Range(new Position(7, 0), new Position(7, 9))), // TestClass::staticTestMethod();
-                4 => new Location($referencesUri, new Range(new Position( 8,  5), new Position( 8, 14))), // echo TestClass::$staticTestProperty;
+                    4 => new Location($referencesUri, new Range(new Position(8, 5), new Position(8, 14))), // echo TestClass::$staticTestProperty;
-                5 => new Location($referencesUri, new Range(new Position( 9,  5), new Position( 9, 14))), // TestClass::TEST_CLASS_CONST;
+                    5 => new Location($referencesUri, new Range(new Position(9, 5), new Position(9, 14))), // TestClass::TEST_CLASS_CONST;
                     6 => new Location($referencesUri, new Range(new Position(21, 18), new Position(21, 27))), // function whatever(TestClass $param)
                     7 => new Location($referencesUri, new Range(new Position(21, 37), new Position(21, 46))), // function whatever(TestClass $param): TestClass
                     8 => new Location($referencesUri, new Range(new Position(39, 0), new Position(39, 9))), // TestClass::$staticTestProperty[123]->testProperty;
-                9 => new Location($useUri,        new Range(new Position( 4,  4), new Position( 4, 27))), // use TestNamespace\TestClass;
+                    9 => new Location($useUri, new Range(new Position(4, 4), new Position(4, 27))), // use TestNamespace\TestClass;
                 ],
                 'TestNamespace\\TestChild' => [
                     0 => new Location($referencesUri, new Range(new Position(42, 5), new Position(42, 25))), // echo $child->testProperty;
@@ -145,23 +147,23 @@ abstract class ServerTestCase extends TestCase
                 ],
                 'TestNamespace\\TestClass::TEST_CLASS_CONST' => [
                     0 => new Location($symbolsUri, new Range(new Position(48, 13), new Position(48, 35))), // echo self::TEST_CLASS_CONSTANT
-                1 => new Location($referencesUri, new Range(new Position( 9,  5), new Position( 9, 32)))
+                    1 => new Location($referencesUri, new Range(new Position(9, 5), new Position(9, 32)))
                 ],
                 'TestNamespace\\TestClass::testProperty' => [
                     0 => new Location($symbolsUri, new Range(new Position(59, 8), new Position(59, 27))), // $this->testProperty = $testParameter;
-                1 => new Location($referencesUri, new Range(new Position( 6,  5), new Position( 6, 23))), // echo $obj->testProperty;
+                    1 => new Location($referencesUri, new Range(new Position(6, 5), new Position(6, 23))), // echo $obj->testProperty;
                     2 => new Location($referencesUri, new Range(new Position(38, 0), new Position(38, 18))), // $obj->testProperty->testMethod();
                     3 => new Location($referencesUri, new Range(new Position(39, 0), new Position(39, 49)))  // TestClass::$staticTestProperty[123]->testProperty;
                 ],
                 'TestNamespace\\TestClass::staticTestProperty' => [
-                0 => new Location($referencesUri, new Range(new Position( 8,  16), new Position( 8, 35))), // echo TestClass::$staticTestProperty;
+                    0 => new Location($referencesUri, new Range(new Position(8, 16), new Position(8, 35))), // echo TestClass::$staticTestProperty;
                     1 => new Location($referencesUri, new Range(new Position(39, 11), new Position(39, 30)))  // TestClass::$staticTestProperty[123]->testProperty;
                 ],
                 'TestNamespace\\TestClass::staticTestMethod()' => [
-                0 => new Location($referencesUri, new Range(new Position( 7,  0), new Position( 7, 27)))
+                    0 => new Location($referencesUri, new Range(new Position(7, 0), new Position(7, 27)))
                 ],
                 'TestNamespace\\TestClass::testMethod()' => [
-                0 => new Location($referencesUri, new Range(new Position( 5,  0), new Position( 5, 16))), // $obj->testMethod();
+                    0 => new Location($referencesUri, new Range(new Position(5, 0), new Position(5, 16))), // $obj->testMethod();
                     1 => new Location($referencesUri, new Range(new Position(38, 0), new Position(38, 30))), // $obj->testProperty->testMethod();
                     2 => new Location($referencesUri, new Range(new Position(42, 5), new Position(42, 23)))  // $child->testMethod();
                 ],
@@ -181,10 +183,10 @@ abstract class ServerTestCase extends TestCase
                 'TestClass' => [
                     0 => new Location($globalSymbolsUri, new Range(new Position(48, 13), new Position(48, 17))), // echo self::TEST_CLASS_CONST;
                     1 => new Location($globalSymbolsUri, new Range(new Position(99, 25), new Position(99, 34))), // class ChildClass extends TestClass {}
-                2 => new Location($globalReferencesUri, new Range(new Position( 4, 11), new Position( 4, 20))), // $obj = new TestClass();
+                    2 => new Location($globalReferencesUri, new Range(new Position(4, 11), new Position(4, 20))), // $obj = new TestClass();
-                3 => new Location($globalReferencesUri, new Range(new Position( 7,  0), new Position( 7,  9))), // TestClass::staticTestMethod();
+                    3 => new Location($globalReferencesUri, new Range(new Position(7, 0), new Position(7, 9))), // TestClass::staticTestMethod();
-                4 => new Location($globalReferencesUri, new Range(new Position( 8,  5), new Position( 8, 14))), // echo TestClass::$staticTestProperty;
+                    4 => new Location($globalReferencesUri, new Range(new Position(8, 5), new Position(8, 14))), // echo TestClass::$staticTestProperty;
-                5 => new Location($globalReferencesUri, new Range(new Position( 9,  5), new Position( 9, 14))), // TestClass::TEST_CLASS_CONST;
+                    5 => new Location($globalReferencesUri, new Range(new Position(9, 5), new Position(9, 14))), // TestClass::TEST_CLASS_CONST;
                     6 => new Location($globalReferencesUri, new Range(new Position(21, 18), new Position(21, 27))), // function whatever(TestClass $param)
                     7 => new Location($globalReferencesUri, new Range(new Position(21, 37), new Position(21, 46))), // function whatever(TestClass $param): TestClass
                     8 => new Location($globalReferencesUri, new Range(new Position(39, 0), new Position(39, 9))), // TestClass::$staticTestProperty[123]->testProperty;
@@ -199,23 +201,23 @@ abstract class ServerTestCase extends TestCase
                 ],
                 'TestClass::TEST_CLASS_CONST' => [
                     0 => new Location($globalSymbolsUri, new Range(new Position(48, 13), new Position(48, 35))), // echo self::TEST_CLASS_CONSTANT
-                1 => new Location($globalReferencesUri, new Range(new Position( 9,  5), new Position( 9, 32)))
+                    1 => new Location($globalReferencesUri, new Range(new Position(9, 5), new Position(9, 32)))
                 ],
                 'TestClass::testProperty' => [
                     0 => new Location($globalSymbolsUri, new Range(new Position(59, 8), new Position(59, 27))), // $this->testProperty = $testParameter;
-                1 => new Location($globalReferencesUri, new Range(new Position( 6,  5), new Position( 6, 23))), // echo $obj->testProperty;
+                    1 => new Location($globalReferencesUri, new Range(new Position(6, 5), new Position(6, 23))), // echo $obj->testProperty;
                     2 => new Location($globalReferencesUri, new Range(new Position(38, 0), new Position(38, 18))), // $obj->testProperty->testMethod();
                     3 => new Location($globalReferencesUri, new Range(new Position(39, 0), new Position(39, 49)))  // TestClass::$staticTestProperty[123]->testProperty;
                 ],
                 'TestClass::staticTestProperty' => [
-                0 => new Location($globalReferencesUri, new Range(new Position( 8,  16), new Position( 8, 35))), // echo TestClass::$staticTestProperty;
+                    0 => new Location($globalReferencesUri, new Range(new Position(8, 16), new Position(8, 35))), // echo TestClass::$staticTestProperty;
                     1 => new Location($globalReferencesUri, new Range(new Position(39, 11), new Position(39, 30)))  // TestClass::$staticTestProperty[123]->testProperty;
                 ],
                 'TestClass::staticTestMethod()' => [
-                0 => new Location($globalReferencesUri, new Range(new Position( 7,  0), new Position( 7, 27)))
+                    0 => new Location($globalReferencesUri, new Range(new Position(7, 0), new Position(7, 27)))
                 ],
                 'TestClass::testMethod()' => [
-                0 => new Location($globalReferencesUri, new Range(new Position( 5,  0), new Position( 5, 16))), // $obj->testMethod();
+                    0 => new Location($globalReferencesUri, new Range(new Position(5, 0), new Position(5, 16))), // $obj->testMethod();
                     1 => new Location($globalReferencesUri, new Range(new Position(38, 0), new Position(38, 30))), // $obj->testProperty->testMethod();
                     2 => new Location($globalReferencesUri, new Range(new Position(42, 5), new Position(42, 23)))  // $child->testMethod();
                 ],
@@ -225,6 +227,7 @@ abstract class ServerTestCase extends TestCase
                 ]
             ];
             // @codingStandardsIgnoreEnd
+        });
     }
 
     protected function getDefinitionLocation(string $fqn): Location

tests/Server/TextDocument/CompletionTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument;
 
+use Amp\Loop;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
@@ -37,14 +38,16 @@ class CompletionTest extends TestCase
 
     public function setUp()
     {
+        Loop::run(function () {
             $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
             $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
             $definitionResolver = new DefinitionResolver($projectIndex);
             $contentRetriever = new FileSystemContentRetriever;
             $this->loader = new PhpDocumentLoader($contentRetriever, $projectIndex, $definitionResolver);
-        $this->loader->load(pathToUri(__DIR__ . '/../../../fixtures/global_symbols.php'))->wait();
+            yield from $this->loader->load(pathToUri(__DIR__ . '/../../../fixtures/global_symbols.php'));
-        $this->loader->load(pathToUri(__DIR__ . '/../../../fixtures/symbols.php'))->wait();
+            yield from $this->loader->load(pathToUri(__DIR__ . '/../../../fixtures/symbols.php'));
             $this->textDocument = new Server\TextDocument($this->loader, $definitionResolver, $client, $projectIndex);
+        });
     }
 
     /**
@@ -52,12 +55,13 @@ class CompletionTest extends TestCase
      */
     public function testPropertyAndMethodWithPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/property_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(3, 7)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'testProperty',
@@ -72,6 +76,7 @@ class CompletionTest extends TestCase
                     'Non culpa nostrud mollit esse sunt laboris in irure ullamco cupidatat amet.'
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -79,12 +84,13 @@ class CompletionTest extends TestCase
      */
     public function testGlobalFunctionInsideNamespaceAndClass()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/inside_namespace_and_method.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(8, 11)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'test_function',
@@ -96,6 +102,7 @@ class CompletionTest extends TestCase
                     '\test_function'
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -103,12 +110,13 @@ class CompletionTest extends TestCase
      */
     public function testPropertyAndMethodWithoutPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/property.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(3, 6)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'testProperty',
@@ -123,6 +131,7 @@ class CompletionTest extends TestCase
                     'Non culpa nostrud mollit esse sunt laboris in irure ullamco cupidatat amet.'
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -130,12 +139,13 @@ class CompletionTest extends TestCase
      */
     public function testVariable()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/variable.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(8, 5)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     '$var',
@@ -158,6 +168,7 @@ class CompletionTest extends TestCase
                     new TextEdit(new Range(new Position(8, 5), new Position(8, 5)), 'param')
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -165,12 +176,13 @@ class CompletionTest extends TestCase
      */
     public function testVariableWithPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/variable_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(8, 6)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     '$param',
@@ -183,6 +195,7 @@ class CompletionTest extends TestCase
                     new TextEdit(new Range(new Position(8, 6), new Position(8, 6)), 'aram')
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -190,12 +203,13 @@ class CompletionTest extends TestCase
      */
     public function testNewInNamespace()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/used_new.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(6, 10)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 // Global TestClass definition (inserted as \TestClass)
                 new CompletionItem(
@@ -237,6 +251,7 @@ class CompletionTest extends TestCase
                     'TestClass'
                 ),
             ], true), $items);
+        });
     }
 
     /**
@@ -244,12 +259,13 @@ class CompletionTest extends TestCase
      */
     public function testUsedClass()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/used_class.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(6, 5)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'TestClass',
@@ -269,6 +285,7 @@ class CompletionTest extends TestCase
 
             $this->assertCompletionsListDoesNotContainLabel('OtherClass', $items);
             $this->assertCompletionsListDoesNotContainLabel('TestInterface', $items);
+        });
     }
 
     /**
@@ -276,12 +293,13 @@ class CompletionTest extends TestCase
      */
     public function testUsedNamespaceWithPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/used_namespace.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(8, 16)
-        )->wait();
+            );
             $this->assertEquals(
                 new CompletionList([
                     new CompletionItem(
@@ -296,6 +314,7 @@ class CompletionTest extends TestCase
                 ], true),
                 $items
             );
+        });
     }
 
     /**
@@ -303,12 +322,13 @@ class CompletionTest extends TestCase
      */
     public function testUsedNamespaceWithoutPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/used_namespace.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(9, 15)
-        )->wait();
+            );
             $this->assertEquals(
                 new CompletionList([
                     new CompletionItem(
@@ -323,6 +343,7 @@ class CompletionTest extends TestCase
                 ], true),
                 $items
             );
+        });
     }
 
     /**
@@ -330,12 +351,13 @@ class CompletionTest extends TestCase
      */
     public function testStaticPropertyWithPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/static_property_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(2, 14)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'staticTestProperty',
@@ -347,6 +369,7 @@ class CompletionTest extends TestCase
                     '$staticTestProperty'
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -354,12 +377,13 @@ class CompletionTest extends TestCase
      */
     public function testStaticWithoutPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/static.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(2, 11)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'TEST_CLASS_CONST',
@@ -383,6 +407,7 @@ class CompletionTest extends TestCase
                     'Do magna consequat veniam minim proident eiusmod incididunt aute proident.'
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -390,12 +415,13 @@ class CompletionTest extends TestCase
      */
     public function testStaticMethodWithPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/static_method_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(2, 13)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'staticTestMethod',
@@ -404,6 +430,7 @@ class CompletionTest extends TestCase
                     'Do magna consequat veniam minim proident eiusmod incididunt aute proident.'
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -411,12 +438,13 @@ class CompletionTest extends TestCase
      */
     public function testClassConstWithPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/class_const_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(2, 13)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'TEST_CLASS_CONST',
@@ -425,6 +453,7 @@ class CompletionTest extends TestCase
                     'Anim labore veniam consectetur laboris minim quis aute aute esse nulla ad.'
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -432,12 +461,13 @@ class CompletionTest extends TestCase
      */
     public function testFullyQualifiedClass()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/fully_qualified_class.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(6, 6)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'TestClass',
@@ -455,6 +485,7 @@ class CompletionTest extends TestCase
             foreach ($items->items as $item) {
                 $this->assertSame($item->detail, null);
             }
+        });
     }
 
     /**
@@ -462,16 +493,18 @@ class CompletionTest extends TestCase
      */
     public function testKeywords()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/keywords.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(2, 1)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem('class', CompletionItemKind::KEYWORD, null, null, null, null, 'class'),
                 new CompletionItem('clone', CompletionItemKind::KEYWORD, null, null, null, null, 'clone')
             ], true), $items);
+        });
     }
 
     /**
@@ -479,12 +512,13 @@ class CompletionTest extends TestCase
      */
     public function testHtmlWithoutPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/html.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(0, 0)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     '<?php',
@@ -497,6 +531,7 @@ class CompletionTest extends TestCase
                     new TextEdit(new Range(new Position(0, 0), new Position(0, 0)), '<?php')
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -504,14 +539,16 @@ class CompletionTest extends TestCase
      */
     public function testHtmlWontBeProposedWithoutCompletionContext()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/html_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(0, 1)
-        )->wait();
+            );
 
             $this->assertEquals(new CompletionList([], true), $items);
+        });
     }
 
     /**
@@ -519,13 +556,14 @@ class CompletionTest extends TestCase
      */
     public function testHtmlWontBeProposedWithPrefixWithCompletionContext()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/html_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(0, 1),
                 new CompletionContext(CompletionTriggerKind::TRIGGER_CHARACTER, '<')
-        )->wait();
+            );
 
             $this->assertEquals(new CompletionList([
                 new CompletionItem(
@@ -539,6 +577,7 @@ class CompletionTest extends TestCase
                     new TextEdit(new Range(new Position(0, 1), new Position(0, 1)), '?php')
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -546,14 +585,16 @@ class CompletionTest extends TestCase
      */
     public function testHtmlPrefixShouldNotTriggerCompletion()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/html_no_completion.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(0, 1),
                 new CompletionContext(CompletionTriggerKind::TRIGGER_CHARACTER, '>')
-        )->wait();
+            );
             $this->assertEquals(new CompletionList([], true), $items);
+        });
     }
 
     /**
@@ -561,13 +602,14 @@ class CompletionTest extends TestCase
      */
     public function testHtmlPrefixShouldTriggerCompletionIfManuallyInvoked()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/html_no_completion.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(0, 1),
                 new CompletionContext(CompletionTriggerKind::INVOKED)
-        )->wait();
+            );
             $this->assertEquals(new CompletionList([
                 new CompletionItem(
                     '<?php',
@@ -580,6 +622,7 @@ class CompletionTest extends TestCase
                     new TextEdit(new Range(new Position(0, 1), new Position(0, 1)), '?php')
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -587,18 +630,20 @@ class CompletionTest extends TestCase
      */
     public function testNamespace()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/namespace.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(4, 6)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'SomeNamespace',
                     CompletionItemKind::MODULE
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -606,12 +651,13 @@ class CompletionTest extends TestCase
      */
     public function testBarePhpVariable()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/bare_php.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(4, 8)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     '$abc2',
@@ -634,6 +680,7 @@ class CompletionTest extends TestCase
                     new TextEdit(new Range(new Position(4, 8), new Position(4, 8)), 'c')
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -641,13 +688,15 @@ class CompletionTest extends TestCase
      */
     public function testForeach(Position $position, array $expectedItems)
     {
+        Loop::run(function () use ($expectedItems, $position) {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/foreach.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 $position
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList($expectedItems, true), $items);
+        });
     }
 
     public function foreachProvider(): array
@@ -793,12 +842,13 @@ class CompletionTest extends TestCase
 
     public function testMethodReturnType()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/method_return_type.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(10, 6)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'foo',
@@ -811,16 +861,18 @@ class CompletionTest extends TestCase
                     null
                 )
             ], true), $items);
+        });
     }
 
     public function testStaticMethodReturnType()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/static_method_return_type.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(11, 6)
-        )->wait();
+            );
             $this->assertCompletionsListSubset(new CompletionList([
                 new CompletionItem(
                     'bar',
@@ -833,6 +885,7 @@ class CompletionTest extends TestCase
                     null
                 )
             ], true), $items);
+        });
     }
 
     private function assertCompletionsListSubset(CompletionList $subsetList, CompletionList $list)
@@ -856,12 +909,13 @@ class CompletionTest extends TestCase
      */
     public function testThisWithoutPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/this.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(12, 15)
-        )->wait();
+            );
             $this->assertEquals(new CompletionList([
                 new CompletionItem(
                     'foo',
@@ -888,6 +942,7 @@ class CompletionTest extends TestCase
                     null
                 )
             ], true), $items);
+        });
     }
 
     /**
@@ -895,12 +950,13 @@ class CompletionTest extends TestCase
      */
     public function testThisWithPrefix()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/this_with_prefix.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(12, 16)
-        )->wait();
+            );
             $this->assertEquals(new CompletionList([
                 new CompletionItem(
                     'foo',
@@ -939,6 +995,7 @@ class CompletionTest extends TestCase
                     'Non culpa nostrud mollit esse sunt laboris in irure ullamco cupidatat amet.'
                 ),
             ], true), $items);
+        });
     }
 
     /**
@@ -946,12 +1003,13 @@ class CompletionTest extends TestCase
      */
     public function testThisReturnValue()
     {
+        Loop::run(function () {
             $completionUri = pathToUri(__DIR__ . '/../../../fixtures/completion/this_return_value.php');
             $this->loader->open($completionUri, file_get_contents($completionUri));
-        $items = $this->textDocument->completion(
+            $items = yield $this->textDocument->completion(
                 new TextDocumentIdentifier($completionUri),
                 new Position(17, 23)
-        )->wait();
+            );
             $this->assertEquals(new CompletionList([
                 new CompletionItem(
                     'bar',
@@ -969,5 +1027,6 @@ class CompletionTest extends TestCase
                     '$this' // Return type of the method
                 ),
             ], true), $items);
+        });
     }
 }

tests/Server/TextDocument/Definition/GlobalFallbackTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument\Definition;
 
+use Amp\Loop;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{
@@ -29,34 +30,40 @@ class GlobalFallbackTest extends ServerTestCase
 
     public function testClassDoesNotFallback()
     {
+        Loop::run(function () {
             // $obj = new TestClass();
             // Get definition for TestClass should not fall back to global
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier('global_fallback'),
                 new Position(9, 16)
-        )->wait();
+            );
             $this->assertEquals([], $result);
+        });
     }
 
     public function testFallsBackForConstants()
     {
+        Loop::run(function () {
             // echo TEST_CONST;
             // Get definition for TEST_CONST
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier('global_fallback'),
                 new Position(6, 10)
-        )->wait();
+            );
             $this->assertEquals(new Location('global_symbols', new Range(new Position(9, 6), new Position(9, 22))), $result);
+        });
     }
 
     public function testFallsBackForFunctions()
     {
+        Loop::run(function () {
             // test_function();
             // Get definition for test_function
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier('global_fallback'),
                 new Position(5, 6)
-        )->wait();
+            );
             $this->assertEquals(new Location('global_symbols', new Range(new Position(78, 0), new Position(81, 1))), $result);
+        });
     }
 }

tests/Server/TextDocument/Definition/GlobalTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument\Definition;
 
+use Amp\Loop;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServerProtocol\{TextDocumentIdentifier, Position, Location, Range};
 use function LanguageServer\pathToUri;
@@ -11,333 +12,389 @@ class GlobalTest extends ServerTestCase
 {
     public function testDefinitionFileBeginning()
     {
+        Loop::run(function () {
             // |<?php
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier(pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'))),
                 new Position(0, 0)
-        )->wait();
+            );
             $this->assertEquals([], $result);
+        });
     }
 
     public function testDefinitionEmptyResult()
     {
+        Loop::run(function () {
             // namespace keyword
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier(pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'))),
                 new Position(1, 0)
-        )->wait();
+            );
             $this->assertEquals([], $result);
+        });
     }
 
     public function testDefinitionForSelfKeyword()
     {
+        Loop::run(function () {
             // echo self::TEST_CLASS_CONST;
             // Get definition for self
             $reference = $this->getReferenceLocations('TestClass')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForClassLike()
     {
+        Loop::run(function () {
             // $obj = new TestClass();
             // Get definition for TestClass
             $reference = $this->getReferenceLocations('TestClass')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForClassOnStaticMethodCall()
     {
+        Loop::run(function () {
             // TestClass::staticTestMethod();
             // Get definition for TestClass
             $reference = $this->getReferenceLocations('TestClass')[2];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForClassOnStaticPropertyFetch()
     {
+        Loop::run(function () {
             // echo TestClass::$staticTestProperty;
             // Get definition for TestClass
             $reference = $this->getReferenceLocations('TestClass')[3];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForClassOnConstFetch()
     {
+        Loop::run(function () {
             // TestClass::TEST_CLASS_CONST;
             // Get definition for TestClass
             $reference = $this->getReferenceLocations('TestClass')[4];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForImplements()
     {
+        Loop::run(function () {
             // class TestClass implements TestInterface
             // Get definition for TestInterface
             $reference = $this->getReferenceLocations('TestInterface')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestInterface'), $result);
+        });
     }
 
     public function testDefinitionForClassConstants()
     {
+        Loop::run(function () {
             // echo TestClass::TEST_CLASS_CONST;
             // Get definition for TEST_CLASS_CONST
             $reference = $this->getReferenceLocations('TestClass::TEST_CLASS_CONST')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::TEST_CLASS_CONST'), $result);
+        });
     }
 
     public function testDefinitionForClassConstantsOnSelf()
     {
+        Loop::run(function () {
             // echo self::TEST_CLASS_CONST;
             // Get definition for TEST_CLASS_CONST
             $reference = $this->getReferenceLocations('TestClass::TEST_CLASS_CONST')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::TEST_CLASS_CONST'), $result);
+        });
     }
 
     public function testDefinitionForConstants()
     {
+        Loop::run(function () {
             // echo TEST_CONST;
             // Get definition for TEST_CONST
             $reference = $this->getReferenceLocations('TEST_CONST')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TEST_CONST'), $result);
+        });
     }
 
     public function testDefinitionForStaticMethods()
     {
+        Loop::run(function () {
             // TestClass::staticTestMethod();
             // Get definition for staticTestMethod
             $reference = $this->getReferenceLocations('TestClass::staticTestMethod()')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::staticTestMethod()'), $result);
+        });
     }
 
     public function testDefinitionForStaticProperties()
     {
+        Loop::run(function () {
             // echo TestClass::$staticTestProperty;
             // Get definition for staticTestProperty
             $reference = $this->getReferenceLocations('TestClass::staticTestProperty')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::staticTestProperty'), $result);
+        });
     }
 
     public function testDefinitionForMethods()
     {
+        Loop::run(function () {
             // $obj->testMethod();
             // Get definition for testMethod
             $reference = $this->getReferenceLocations('TestClass::testMethod()')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::testMethod()'), $result);
+        });
     }
 
     public function testDefinitionForMethodOnChildClass()
     {
+        Loop::run(function () {
             // $child->testMethod();
             // Get definition for testMethod
             $reference = $this->getReferenceLocations('TestClass::testMethod()')[2];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::testMethod()'), $result);
+        });
     }
 
     public function testDefinitionForProperties()
     {
+        Loop::run(function () {
             // echo $obj->testProperty;
             // Get definition for testProperty
             $reference = $this->getReferenceLocations('TestClass::testProperty')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::testProperty'), $result);
+        });
     }
 
     public function testDefinitionForPropertiesOnThis()
     {
+        Loop::run(function () {
             // $this->testProperty = $testParameter;
             // Get definition for testProperty
             $reference = $this->getReferenceLocations('TestClass::testProperty')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::testProperty'), $result);
+        });
     }
 
     public function testDefinitionForVariables()
     {
+        Loop::run(function () {
             // echo $var;
             // Get definition for $var
             $uri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'));
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($uri),
                 new Position(13, 7)
-        )->wait();
+            );
             $this->assertEquals(new Location($uri, new Range(new Position(12, 0), new Position(12, 10))), $result);
+        });
     }
 
     public function testDefinitionForParamTypeHints()
     {
+        Loop::run(function () {
             // function whatever(TestClass $param) {
             // Get definition for TestClass
             $reference = $this->getReferenceLocations('TestClass')[5];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForReturnTypeHints()
     {
+        Loop::run(function () {
             // function whatever(TestClass $param): TestClass {
             // Get definition for TestClass
             $reference = $this->getReferenceLocations('TestClass')[6];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForMethodReturnTypeHints()
     {
+        Loop::run(function () {
             // public function testMethod($testParameter): TestInterface
             // Get definition for TestInterface
             $reference = $this->getReferenceLocations('TestInterface')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestInterface'), $result);
+        });
     }
 
     public function testDefinitionForParams()
     {
+        Loop::run(function () {
             // echo $param;
             // Get definition for $param
             $uri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'));
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($uri),
                 new Position(22, 13)
-        )->wait();
+            );
             $this->assertEquals(new Location($uri, new Range(new Position(21, 18), new Position(21, 34))), $result);
+        });
     }
 
     public function testDefinitionForUsedVariables()
     {
+        Loop::run(function () {
             // echo $var;
             // Get definition for $var
             $uri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'));
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($uri),
                 new Position(26, 11)
-        )->wait();
+            );
             $this->assertEquals(new Location($uri, new Range(new Position(25, 22), new Position(25, 26))), $result);
+        });
     }
 
     public function testDefinitionForFunctions()
     {
+        Loop::run(function () {
             // test_function();
             // Get definition for test_function
             $reference = $this->getReferenceLocations('test_function()')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('test_function()'), $result);
+        });
     }
 
     public function testDefinitionForUseFunctions()
     {
+        Loop::run(function () {
             // use function test_function;
             // Get definition for test_function
             $reference = $this->getReferenceLocations('test_function()')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('test_function()'), $result);
+        });
     }
 
     public function testDefinitionForInstanceOf()
     {
+        Loop::run(function () {
             // if ($abc instanceof TestInterface) {
             // Get definition for TestInterface
             $reference = $this->getReferenceLocations('TestInterface')[2];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestInterface'), $result);
+        });
     }
 
     public function testDefinitionForNestedMethodCall()
     {
+        Loop::run(function () {
             // $obj->testProperty->testMethod();
             // Get definition for testMethod
             $reference = $this->getReferenceLocations('TestClass::testMethod()')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::testMethod()'), $result);
+        });
     }
 
     public function testDefinitionForPropertyFetchOnArrayDimFetch()
     {
+        Loop::run(function () {
             // TestClass::$staticTestProperty[123]->testProperty;
             // Get definition for testProperty
             $reference = $this->getReferenceLocations('TestClass::testProperty')[3];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass::testProperty'), $result);
+        });
     }
 }

tests/Server/TextDocument/Definition/NamespacedTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument\Definition;
 
+use Amp\Loop;
 use LanguageServerProtocol\{TextDocumentIdentifier, Location};
 use function LanguageServer\pathToUri;
 
@@ -20,37 +21,43 @@ class NamespacedTest extends GlobalTest
 
     public function testDefinitionForConstants()
     {
+        Loop::run(function () {
             // echo TEST_CONST;
             // Get definition for TEST_CONST
             $reference = $this->getReferenceLocations('TEST_CONST')[0];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TEST_CONST'), $result);
+        });
     }
 
     public function testDefinitionForClassLikeUseStatement()
     {
+        Loop::run(function () {
             // use TestNamespace\TestClass;
             // Get definition for TestClass
             $reference = $this->getReferenceLocations('TestClass')[7];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 
     public function testDefinitionForClassLikeGroupUseStatement()
     {
+        Loop::run(function () {
             // use TestNamespace\{TestTrait, TestInterface};
             // Get definition for TestInterface
             $reference = $this->getReferenceLocations('TestClass')[1];
-        $result = $this->textDocument->definition(
+            $result = yield $this->textDocument->definition(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getDefinitionLocation('TestClass'), $result);
+        });
     }
 }

tests/Server/TextDocument/DidChangeTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument;
 
+use Amp\Loop;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
@@ -21,6 +22,7 @@ class DidChangeTest extends TestCase
 {
     public function test()
     {
+        Loop::run(function () {
             $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
             $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
             $definitionResolver = new DefinitionResolver($projectIndex);
@@ -34,8 +36,9 @@ class DidChangeTest extends TestCase
             $changeEvent->rangeLength = 9999;
             $changeEvent->text = "<?php\necho 'Goodbye, World'\n";
 
-        $textDocument->didChange($identifier, [$changeEvent]);
+            yield $textDocument->didChange($identifier, [$changeEvent]);
 
             $this->assertEquals("<?php\necho 'Goodbye, World'\n", $phpDocument->getContent());
+        });
     }
 }

tests/Server/TextDocument/DidCloseTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument;
 
+use Amp\Loop;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
@@ -16,6 +17,7 @@ class DidCloseTest extends TestCase
 {
     public function test()
     {
+        Loop::run(function () {
             $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
             $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
             $definitionResolver = new DefinitionResolver($projectIndex);
@@ -33,5 +35,6 @@ class DidCloseTest extends TestCase
             $textDocument->didClose(new TextDocumentIdentifier($textDocumentItem->uri));
 
             $this->assertFalse($loader->isOpen($textDocumentItem->uri));
+        });
     }
 }

tests/Server/TextDocument/DocumentSymbolTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument;
 
+use Amp\Loop;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{Server, LanguageClient, Project};
@@ -13,9 +14,10 @@ class DocumentSymbolTest extends ServerTestCase
 {
     public function test()
     {
+        Loop::run(function () {
             // Request symbols
             $uri = pathToUri(realpath(__DIR__ . '/../../../fixtures/symbols.php'));
-        $result = $this->textDocument->documentSymbol(new TextDocumentIdentifier($uri))->wait();
+            $result = yield $this->textDocument->documentSymbol(new TextDocumentIdentifier($uri));
             // @codingStandardsIgnoreStart
             $this->assertEquals([
                 new SymbolInformation('TestNamespace', SymbolKind::NAMESPACE, $this->getDefinitionLocation('TestNamespace'), ''),
@@ -37,5 +39,6 @@ class DocumentSymbolTest extends ServerTestCase
                 new SymbolInformation('InnerClass', SymbolKind::CLASS_, $this->getDefinitionLocation('TestNamespace\\InnerNamespace\\InnerClass'), 'TestNamespace\\InnerNamespace'),
             ], $result);
             // @codingStandardsIgnoreEnd
+        });
     }
 }

tests/Server/TextDocument/HoverTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument;
 
+use Amp\Loop;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{Server, LanguageClient, Project};
@@ -13,13 +14,14 @@ class HoverTest extends ServerTestCase
 {
     public function testHoverForClassLike()
     {
+        Loop::run(function () {
             // $obj = new TestClass();
             // Get hover for TestClass
             $reference = $this->getReferenceLocations('TestClass')[1];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\nclass TestClass implements TestInterface"),
                 'Pariatur ut laborum tempor voluptate consequat ea deserunt.' . "\n\n" .
@@ -29,17 +31,19 @@ class HoverTest extends ServerTestCase
                 'consequat sunt culpa exercitation pariatur id reprehenderit nisi incididunt Lorem' . "\n" .
                 'sint. Officia culpa pariatur laborum nostrud cupidatat consequat mollit.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForClassLikeDefinition()
     {
+        Loop::run(function () {
             // class TestClass implements TestInterface
             // Get hover for TestClass
             $definition = $this->getDefinitionLocation('TestClass');
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\nclass TestClass implements TestInterface"),
                 'Pariatur ut laborum tempor voluptate consequat ea deserunt.' . "\n\n" .
@@ -49,147 +53,173 @@ class HoverTest extends ServerTestCase
                 'consequat sunt culpa exercitation pariatur id reprehenderit nisi incididunt Lorem' . "\n" .
                 'sint. Officia culpa pariatur laborum nostrud cupidatat consequat mollit.'
             ], $definition->range), $result);
+        });
     }
 
     public function testHoverForMethod()
     {
+        Loop::run(function () {
             // $obj->testMethod();
             // Get hover for testMethod
             $reference = $this->getReferenceLocations('TestClass::testMethod()')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\npublic function testMethod(\$testParameter): TestInterface"),
                 'Non culpa nostrud mollit esse sunt laboris in irure ullamco cupidatat amet.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForProperty()
     {
+        Loop::run(function () {
             // echo $obj->testProperty;
             // Get hover for testProperty
             $reference = $this->getReferenceLocations('TestClass::testProperty')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\npublic \$testProperty;"),
                 'Reprehenderit magna velit mollit ipsum do.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForStaticMethod()
     {
+        Loop::run(function () {
             // TestClass::staticTestMethod();
             // Get hover for staticTestMethod
             $reference = $this->getReferenceLocations('TestClass::staticTestMethod()')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\npublic static function staticTestMethod()"),
                 'Do magna consequat veniam minim proident eiusmod incididunt aute proident.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForStaticProperty()
     {
+        Loop::run(function () {
             // echo TestClass::staticTestProperty;
             // Get hover for staticTestProperty
             $reference = $this->getReferenceLocations('TestClass::staticTestProperty')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\npublic static \$staticTestProperty;"),
                 'Lorem excepteur officia sit anim velit veniam enim.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForClassConstant()
     {
+        Loop::run(function () {
             // echo TestClass::TEST_CLASS_CONST;
             // Get hover for TEST_CLASS_CONST
             $reference = $this->getReferenceLocations('TestClass::TEST_CLASS_CONST')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\nconst TEST_CLASS_CONST = 123;"),
                 'Anim labore veniam consectetur laboris minim quis aute aute esse nulla ad.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForFunction()
     {
+        Loop::run(function () {
             // test_function();
             // Get hover for test_function
             $reference = $this->getReferenceLocations('test_function()')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\nfunction test_function()"),
                 'Officia aliquip adipisicing et nulla et laboris dolore labore.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForConstant()
     {
+        Loop::run(function () {
             // echo TEST_CONST;
             // Get hover for TEST_CONST
             $reference = $this->getReferenceLocations('TEST_CONST')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\nconst TEST_CONST = 123;"),
                 'Esse commodo excepteur pariatur Lorem est aute incididunt reprehenderit.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForGlobalConstant()
     {
+        Loop::run(function () {
             // print TEST_DEFINE_CONSTANT ? 'true' : 'false';
             // Get hover for TEST_DEFINE_CONSTANT
             $reference = $this->getReferenceLocations('TEST_DEFINE_CONSTANT')[0];
-        $result = $this->textDocument->hover(
+            $result = yield $this->textDocument->hover(
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->end
-        )->wait();
+            );
             // TODO - should pretty print with fqns, like \define, \false. Not yet supported by tolerant-php-parser
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\ndefine('TEST_DEFINE_CONSTANT', false)"),
                 'Lorem ipsum dolor sit amet, consectetur.'
             ], $reference->range), $result);
+        });
     }
 
     public function testHoverForVariable()
     {
+        Loop::run(function () {
             // echo $var;
             // Get hover for $var
             $uri = pathToUri(realpath(__DIR__ . '/../../../fixtures/references.php'));
-        $result = $this->textDocument->hover(new TextDocumentIdentifier($uri), new Position(13, 7))->wait();
+            $result = yield $this->textDocument->hover(
+                new TextDocumentIdentifier($uri),
+                new Position(13, 7)
+            );
             $this->assertEquals(new Hover(
                 [new MarkedString('php', "<?php\n\$var = 123")],
                 new Range(new Position(13, 5), new Position(13, 9))
             ), $result);
+        });
     }
 
     public function testHoverForParam()
     {
+        Loop::run(function () {
             // echo $param;
             // Get hover for $param
             $uri = pathToUri(realpath(__DIR__ . '/../../../fixtures/references.php'));
-        $result = $this->textDocument->hover(new TextDocumentIdentifier($uri), new Position(22, 11))->wait();
+            $result = yield $this->textDocument->hover(
+                new TextDocumentIdentifier($uri),
+                new Position(22, 11)
+            );
             $this->assertEquals(new Hover(
                 [
                     new MarkedString('php', "<?php\nTestClass \$param"),
@@ -197,14 +227,19 @@ class HoverTest extends ServerTestCase
                 ],
                 new Range(new Position(22, 9), new Position(22, 15))
             ), $result);
+        });
     }
 
     public function testHoverForThis()
     {
+        Loop::run(function () {
             // $this;
             // Get hover for $this
             $uri = pathToUri(realpath(__DIR__ . '/../../../fixtures/global_symbols.php'));
-        $result = $this->textDocument->hover(new TextDocumentIdentifier($uri), new Position(59, 11))->wait();
+            $result = yield $this->textDocument->hover(
+                new TextDocumentIdentifier($uri),
+                new Position(59, 11)
+            );
             $this->assertEquals(new Hover([
                 new MarkedString('php', "<?php\nclass TestClass implements TestInterface"),
                 'Pariatur ut laborum tempor voluptate consequat ea deserunt.' . "\n\n" .
@@ -214,5 +249,6 @@ class HoverTest extends ServerTestCase
                 'consequat sunt culpa exercitation pariatur id reprehenderit nisi incididunt Lorem' . "\n" .
                 'sint. Officia culpa pariatur laborum nostrud cupidatat consequat mollit.'
             ], new Range(new Position(59, 8), new Position(59, 13))), $result);
+        });
     }
 }

tests/Server/TextDocument/ParseErrorsTest.php

@@ -1,18 +1,18 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument;
 
-use PHPUnit\Framework\TestCase;
+use Amp\Deferred;
-use LanguageServer\Tests\MockProtocolStream;
+use Amp\Delayed;
-use LanguageServer\{
+use Amp\Loop;
-    Server, Client, LanguageClient, ClientHandler, PhpDocumentLoader, DefinitionResolver
-};
-use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
-use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServerProtocol\{TextDocumentItem, DiagnosticSeverity};
-use Sabre\Event\Promise;
 use JsonMapper;
+use LanguageServer\{Client, ClientHandler, DefinitionResolver, LanguageClient, PhpDocumentLoader, Server};
+use LanguageServer\ContentRetriever\FileSystemContentRetriever;
+use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex};
+use LanguageServer\Tests\MockProtocolStream;
+use LanguageServerProtocol\{DiagnosticSeverity, TextDocumentItem};
+use PHPUnit\Framework\TestCase;
 
 class ParseErrorsTest extends TestCase
 {
@@ -21,22 +21,31 @@ class ParseErrorsTest extends TestCase
      */
     private $textDocument;
 
+    /**
+     * @var Deferred
+     */
     private $args;
 
     public function setUp()
     {
         $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
-        $client->textDocument = new class($this->args) extends Client\TextDocument {
+        $this->args = new Deferred();
+        $client->textDocument = new class($this->args) extends Client\TextDocument
+        {
+            /** @var Deferred */
             private $args;
-            public function __construct(&$args)
+
+            public function __construct($args)
             {
                 parent::__construct(new ClientHandler(new MockProtocolStream, new MockProtocolStream), new JsonMapper);
-                $this->args = &$args;
+                $this->args = $args;
             }
-            public function publishDiagnostics(string $uri, array $diagnostics): Promise
+
+            public function publishDiagnostics(string $uri, array $diagnostics): \Generator
             {
-                $this->args = func_get_args();
+                $this->args->resolve(func_get_args());
-                return Promise\resolve(null);
+                yield new Delayed(0);
+                return null;
             }
         };
         $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
@@ -57,6 +66,7 @@ class ParseErrorsTest extends TestCase
 
     public function testParseErrorsArePublishedAsDiagnostics()
     {
+        Loop::run(function () {
             $this->openFile(__DIR__ . '/../../../fixtures/invalid_file.php');
             $this->assertEquals([
                 'whatever',
@@ -124,13 +134,15 @@ class ParseErrorsTest extends TestCase
                         'source' => 'php',
                         'message' => "'Name' expected."
                     ]]
-        ], json_decode(json_encode($this->args), true));
+            ], json_decode(json_encode(yield $this->args->promise()), true));
+        });
     }
 
     public function testParseErrorsWithOnlyStartLine()
     {
+        Loop::run(function () {
             $this->markTestIncomplete('This diagnostic not yet implemented in tolerant-php-parser');
-        $this->openFile(__DIR__ . '/../../../fixtures/namespace_not_first.php');
+            yield $this->openFile(__DIR__ . '/../../../fixtures/namespace_not_first.php');
             $this->assertEquals([
                 'whatever',
                 [[
@@ -149,6 +161,7 @@ class ParseErrorsTest extends TestCase
                     'source' => 'php',
                     'message' => "Namespace declaration statement has to be the very first statement in the script"
                 ]]
-        ], json_decode(json_encode($this->args), true));
+            ], json_decode(json_encode(yield $this->args->promise()), true));
+        });
     }
 }

tests/Server/TextDocument/References/GlobalFallbackTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
+use Amp\Loop;
 use LanguageServer\{
     LanguageClient, PhpDocumentLoader, Server, DefinitionResolver
 };
@@ -32,37 +33,43 @@ class GlobalFallbackTest extends ServerTestCase
 
     public function testClassDoesNotFallback()
     {
+        Loop::run(function () {
             // class TestClass implements TestInterface
             // Get references for TestClass
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier('global_symbols'),
                 new Position(6, 9)
-        )->wait();
+            );
             $this->assertEquals([], $result);
+        });
     }
 
     public function testFallsBackForConstants()
     {
+        Loop::run(function () {
             // const TEST_CONST = 123;
             // Get references for TEST_CONST
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier('global_symbols'),
                 new Position(9, 13)
-        )->wait();
+            );
             $this->assertEquals([new Location('global_fallback', new Range(new Position(6, 5), new Position(6, 15)))], $result);
+        });
     }
 
     public function testFallsBackForFunctions()
     {
+        Loop::run(function () {
             // function test_function()
             // Get references for test_function
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier('global_symbols'),
                 new Position(78, 16)
-        )->wait();
+            );
             $this->assertEquals([new Location('global_fallback', new Range(new Position(5, 0), new Position(5, 13)))], $result);
+        });
     }
 }

tests/Server/TextDocument/References/GlobalTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
+use Amp\Loop;
 use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
 use LanguageServer\Tests\Server\ServerTestCase;
 use function LanguageServer\pathToUri;
@@ -11,191 +12,219 @@ class GlobalTest extends ServerTestCase
 {
     public function testReferencesForClassLike()
     {
+        Loop::run(function () {
             // class TestClass implements TestInterface
             // Get references for TestClass
             $definition = $this->getDefinitionLocation('TestClass');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TestClass'), $result);
+        });
     }
 
     public function testReferencesForClassConstants()
     {
+        Loop::run(function () {
             // const TEST_CLASS_CONST = 123;
             // Get references for TEST_CLASS_CONST
             $definition = $this->getDefinitionLocation('TestClass::TEST_CLASS_CONST');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TestClass::TEST_CLASS_CONST'), $result);
+        });
     }
 
     public function testReferencesForConstants()
     {
+        Loop::run(function () {
             // const TEST_CONST = 123;
             // Get references for TEST_CONST
             $definition = $this->getDefinitionLocation('TEST_CONST');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TEST_CONST'), $result);
+        });
     }
 
     public function testReferencesForStaticMethods()
     {
+        Loop::run(function () {
             // public static function staticTestMethod()
             // Get references for staticTestMethod
             $definition = $this->getDefinitionLocation('TestClass::staticTestMethod()');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TestClass::staticTestMethod()'), $result);
+        });
     }
 
     public function testReferencesForStaticProperties()
     {
+        Loop::run(function () {
             // public static $staticTestProperty;
             // Get references for $staticTestProperty
             $definition = $this->getDefinitionLocation('TestClass::staticTestProperty');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TestClass::staticTestProperty'), $result);
+        });
     }
 
     public function testReferencesForMethods()
     {
+        Loop::run(function () {
             // public function testMethod($testParameter)
             // Get references for testMethod
             $definition = $this->getDefinitionLocation('TestClass::testMethod()');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TestClass::testMethod()'), $result);
+        });
     }
 
     public function testReferencesForProperties()
     {
+        Loop::run(function () {
             // public $testProperty;
             // Get references for testProperty
             $definition = $this->getDefinitionLocation('TestClass::testProperty');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TestClass::testProperty'), $result);
+        });
     }
 
     public function testReferencesForVariables()
     {
+        Loop::run(function () {
             // $var = 123;
             // Get definition for $var
             $uri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'));
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($uri),
                 new Position(12, 3)
-        )->wait();
+            );
             $this->assertEquals([
                 new Location($uri, new Range(new Position(12, 0), new Position(12, 4))),
                 new Location($uri, new Range(new Position(13, 5), new Position(13, 9))),
                 new Location($uri, new Range(new Position(26, 9), new Position(26, 13)))
             ], $result);
+        });
     }
 
     public function testReferencesForFunctionParams()
     {
+        Loop::run(function () {
             // function whatever(TestClass $param): TestClass
             // Get references for $param
             $uri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'));
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($uri),
                 new Position(21, 32)
-        )->wait();
+            );
             $this->assertEquals([new Location($uri, new Range(new Position(22, 9), new Position(22, 15)))], $result);
+        });
     }
 
     public function testReferencesForFunctions()
     {
+        Loop::run(function () {
             // function test_function()
             // Get references for test_function
             $referencesUri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/references.php'));
             $symbolsUri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/symbols.php'));
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($symbolsUri),
                 new Position(78, 16)
-        )->wait();
+            );
             $this->assertEquals([
                 new Location($referencesUri, new Range(new Position(10, 0), new Position(10, 13))),
                 new Location($referencesUri, new Range(new Position(31, 13), new Position(31, 40)))
             ], $result);
+        });
     }
 
     public function testReferencesForReference()
     {
+        Loop::run(function () {
             // $obj = new TestClass();
             // Get references for TestClass
             $reference = $this->getReferenceLocations('TestClass')[1];
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($reference->uri),
                 $reference->range->start
-        )->wait();
+            );
             $this->assertEquals($this->getReferenceLocations('TestClass'), $result);
+        });
     }
 
     public function testReferencesForUnusedClass()
     {
+        Loop::run(function () {
             // class UnusedClass
             // Get references for UnusedClass
             $symbolsUri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/global_symbols.php'));
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($symbolsUri),
                 new Position(111, 10)
-        )->wait();
+            );
             $this->assertEquals([], $result);
+        });
     }
 
     public function testReferencesForUnusedProperty()
     {
+        Loop::run(function () {
             // public $unusedProperty
             // Get references for unusedProperty
             $symbolsUri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/global_symbols.php'));
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($symbolsUri),
                 new Position(113, 18)
-        )->wait();
+            );
             $this->assertEquals([], $result);
+        });
     }
 
     public function testReferencesForUnusedMethod()
     {
+        Loop::run(function () {
             // public function unusedMethod()
             // Get references for unusedMethod
             $symbolsUri = pathToUri(realpath(__DIR__ . '/../../../../fixtures/global_symbols.php'));
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($symbolsUri),
                 new Position(115, 26)
-        )->wait();
+            );
             $this->assertEquals([], $result);
+        });
     }
 }

tests/Server/TextDocument/References/NamespacedTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
+use Amp\Loop;
 use LanguageServerProtocol\{TextDocumentIdentifier, Position, ReferenceContext, Location, Range};
 use function LanguageServer\pathToUri;
 
@@ -20,14 +21,16 @@ class NamespacedTest extends GlobalTest
 
     public function testReferencesForNamespaces()
     {
+        Loop::run(function () {
             // namespace TestNamespace;
             // Get references for TestNamespace
             $definition = parent::getDefinitionLocation('TestNamespace');
-        $result = $this->textDocument->references(
+            $result = yield $this->textDocument->references(
                 new ReferenceContext,
                 new TextDocumentIdentifier($definition->uri),
                 $definition->range->end
-        )->wait();
+            );
             $this->assertEquals(parent::getReferenceLocations('TestNamespace'), $result);
+        });
     }
 }

tests/Server/TextDocument/SignatureHelpTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\TextDocument;
 
+use Amp\Loop;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
@@ -50,13 +51,15 @@ class SignatureHelpTest extends TestCase
      */
     public function testSignatureHelp(Position $position, SignatureHelp $expectedSignature)
     {
+        Loop::run(function () use ($position, $expectedSignature) {
             $callsUri = pathToUri(__DIR__ . '/../../../fixtures/signature_help/calls.php');
             $this->loader->open($callsUri, file_get_contents($callsUri));
-        $signatureHelp = $this->textDocument->signatureHelp(
+            $signatureHelp = yield $this->textDocument->signatureHelp(
                 new TextDocumentIdentifier($callsUri),
                 $position
-        )->wait();
+            );
             $this->assertEquals($expectedSignature, $signatureHelp);
+        });
     }
 
     public function signatureHelpProvider(): array

tests/Server/Workspace/DidChangeWatchedFilesTest.php

@@ -1,22 +1,24 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\Workspace;
 
+use Amp\Deferred;
+use Amp\Loop;
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
-use LanguageServer\{DefinitionResolver, LanguageClient, PhpDocumentLoader, Server};
+use LanguageServer\{DefinitionResolver, Event\MessageEvent, LanguageClient, PhpDocumentLoader, Server};
 use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex};
 use LanguageServerProtocol\{FileChangeType, FileEvent};
 use LanguageServer\Message;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\Server\Workspace;
-use Sabre\Event\Loop;
 
 class DidChangeWatchedFilesTest extends ServerTestCase
 {
     public function testDeletingFileClearsAllDiagnostics()
     {
+        Loop::run(function () {
             $client = new LanguageClient(new MockProtocolStream(), $writer = new MockProtocolStream());
             $projectIndex = new ProjectIndex($sourceIndex = new Index(), $dependenciesIndex = new DependenciesIndex());
             $definitionResolver = new DefinitionResolver($projectIndex);
@@ -26,17 +28,19 @@ class DidChangeWatchedFilesTest extends ServerTestCase
             $fileEvent = new FileEvent('my uri', FileChangeType::DELETED);
 
             $isDiagnosticsCleared = false;
-        $writer->on('message', function (Message $message) use ($fileEvent, &$isDiagnosticsCleared) {
+            $deferred = new Deferred();
+            $writer->addListener('message', function (MessageEvent $messageEvent) use ($deferred, $fileEvent, &$isDiagnosticsCleared) {
+                $message = $messageEvent->getMessage();
                 if ($message->body->method === "textDocument/publishDiagnostics") {
                     $this->assertEquals($message->body->params->uri, $fileEvent->uri);
                     $this->assertEquals($message->body->params->diagnostics, []);
-                $isDiagnosticsCleared = true;
+                    $deferred->resolve(true);
                 }
             });
 
             $workspace->didChangeWatchedFiles([$fileEvent]);
-        Loop\tick(true);
 
-        $this->assertTrue($isDiagnosticsCleared, "Deleting file should clear all diagnostics.");
+            $this->assertTrue(yield $deferred->promise(), "Deleting file should clear all diagnostics.");
+        });
     }
 }

tests/Server/Workspace/SymbolTest.php

@@ -1,8 +1,9 @@
 <?php
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace LanguageServer\Tests\Server\Workspace;
 
+use Amp\Loop;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{Server, Client, LanguageClient, Project, PhpDocument};
@@ -24,8 +25,9 @@ class SymbolTest extends ServerTestCase
 {
     public function testEmptyQueryReturnsAllSymbols()
     {
+        Loop::run(function () {
             // Request symbols
-        $result = $this->workspace->symbol('')->wait();
+            $result = yield $this->workspace->symbol('');
             $referencesUri = pathToUri(realpath(__DIR__ . '/../../../fixtures/references.php'));
 
             // @codingStandardsIgnoreStart
@@ -70,12 +72,14 @@ class SymbolTest extends ServerTestCase
                 new SymbolInformation('SecondTestNamespace', SymbolKind::NAMESPACE, $this->getDefinitionLocation('SecondTestNamespace'), ''),
             ], $result);
             // @codingStandardsIgnoreEnd
+        });
     }
 
     public function testQueryFiltersResults()
     {
+        Loop::run(function () {
             // Request symbols
-        $result = $this->workspace->symbol('testmethod')->wait();
+            $result = yield $this->workspace->symbol('testmethod');
             // @codingStandardsIgnoreStart
             $this->assertEquals([
                 new SymbolInformation('staticTestMethod', SymbolKind::METHOD, $this->getDefinitionLocation('TestNamespace\\TestClass::staticTestMethod()'), 'TestNamespace\\TestClass'),
@@ -84,5 +88,6 @@ class SymbolTest extends ServerTestCase
                 new SymbolInformation('testMethod', SymbolKind::METHOD, $this->getDefinitionLocation('TestClass::testMethod()'), 'TestClass')
             ], $result);
             // @codingStandardsIgnoreEnd
+        });
     }
 }

tests/Validation/cases/functionUse2.php

@@ -1,4 +1,4 @@
 <?php
 
 
-use function LanguageServer\{pathToUri, timeout};
+use function LanguageServer\{pathToUri};

tests/Validation/cases/functionUse2.php.expected.json

@@ -5,9 +5,6 @@
         ],
         "LanguageServer\\pathToUri()": [
             "./functionUse2.php"
-        ],
-        "LanguageServer\\timeout()": [
-            "./functionUse2.php"
         ]
     },
     "definitions": []