danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Conversion of AdvancedJsonRpc\*

Browse Source
This commit is contained in:
ralila 2021-12-13 18:24:02 +01:00 committed by rarila
parent c0adde8f45
commit 34857c2eee
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Psalm/Internal/LanguageServer/ClientHandler.php
View File

@ -2,7 +2,10 @@
declare(strict_types = 1);
namespace Psalm\Internal\LanguageServer;
use AdvancedJsonRpc;
use AdvancedJsonRpc\Notification;
use AdvancedJsonRpc\Request;
use AdvancedJsonRpc\Response;
use AdvancedJsonRpc\SuccessResponse;
use Amp\Deferred;
use Amp\Promise;
use Generator;
@ -56,7 +59,7 @@ class ClientHandler
function () use ($id, $method, $params): Generator {
yield $this->protocolWriter->write(
new Message(
new AdvancedJsonRpc\Request($id, $method, (object) $params)
new Request($id, $method, (object) $params)
)
);
@ -70,12 +73,12 @@ class ClientHandler
* @psalm-suppress MixedArgument
*/
if ($msg->body
&& AdvancedJsonRpc\Response::isResponse($msg->body)
&& Response::isResponse($msg->body)
&& $msg->body->id === $id
) {
// Received a response
$this->protocolReader->removeListener('message', $listener);
if (AdvancedJsonRpc\SuccessResponse::isSuccessResponse($msg->body)) {
if (SuccessResponse::isSuccessResponse($msg->body)) {
$deferred->resolve($msg->body->result);
} else {
$deferred->fail($msg->body->error);
@ -99,7 +102,7 @@ class ClientHandler
{
$this->protocolWriter->write(
new Message(
new AdvancedJsonRpc\Notification($method, (object)$params)
new Notification($method, (object)$params)
)
);
}

24
src/Psalm/Internal/LanguageServer/LanguageServer.php
View File

@ -2,7 +2,13 @@
declare(strict_types = 1);
namespace Psalm\Internal\LanguageServer;
use AdvancedJsonRpc;
use AdvancedJsonRpc\Dispatcher;
use AdvancedJsonRpc\Error;
use AdvancedJsonRpc\ErrorCode;
use AdvancedJsonRpc\ErrorResponse;
use AdvancedJsonRpc\Request;
use AdvancedJsonRpc\Response;
use AdvancedJsonRpc\SuccessResponse;
use Amp\Promise;
use Amp\Success;
use Generator;
@ -49,7 +55,7 @@ use function urldecode;
/**
* @internal
*/
class LanguageServer extends AdvancedJsonRpc\Dispatcher
class LanguageServer extends Dispatcher
{
/**
* Handles textDocument/* method calls
@ -125,7 +131,7 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
}
// Ignore responses, this is the handler for requests and notifications
if (AdvancedJsonRpc\Response::isResponse($msg->body)) {
if (Response::isResponse($msg->body)) {
return;
}
@ -144,14 +150,14 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
$dispatched = $this->dispatch($msg->body);
/** @psalm-suppress MixedAssignment */
$result = yield $dispatched;
} catch (AdvancedJsonRpc\Error $e) {
} catch (Error $e) {
// If a ResponseError is thrown, send it back in the Response
$error = $e;
} catch (Throwable $e) {
// If an unexpected error occurred, send back an INTERNAL_ERROR error response
$error = new AdvancedJsonRpc\Error(
$error = new Error(
(string) $e,
AdvancedJsonRpc\ErrorCode::INTERNAL_ERROR,
ErrorCode::INTERNAL_ERROR,
null,
$e
);
@ -162,11 +168,11 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
* @psalm-suppress UndefinedPropertyFetch
* @psalm-suppress MixedArgument
*/
if (AdvancedJsonRpc\Request::isRequest($msg->body)) {
if (Request::isRequest($msg->body)) {
if ($error !== null) {
$responseBody = new AdvancedJsonRpc\ErrorResponse($msg->body->id, $error);
$responseBody = new ErrorResponse($msg->body->id, $error);
} else {
$responseBody = new AdvancedJsonRpc\SuccessResponse($msg->body->id, $result);
$responseBody = new SuccessResponse($msg->body->id, $result);
}
yield $this->protocolWriter->write(new Message($responseBody));
}