1
0
Fork 0

Renamed ProtocolBridge namespace to Factory

pull/661/head
dantleech 2018-07-29 15:56:36 +01:00 committed by Daniel Leech
parent 9989043797
commit 7caec17149
23 changed files with 29 additions and 28 deletions

View File

@ -5,7 +5,7 @@ namespace LanguageServer;
use AdvancedJsonRpc; use AdvancedJsonRpc;
use Sabre\Event\Promise; use Sabre\Event\Promise;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
class ClientHandler class ClientHandler
{ {
@ -42,12 +42,12 @@ class ClientHandler
{ {
$id = $this->idGenerator->generate(); $id = $this->idGenerator->generate();
return $this->protocolWriter->write( return $this->protocolWriter->write(
new ProtocolBridge\Message( new Factory\Message(
new AdvancedJsonRpc\Request($id, $method, (object)$params) new AdvancedJsonRpc\Request($id, $method, (object)$params)
) )
)->then(function () use ($id) { )->then(function () use ($id) {
$promise = new Promise; $promise = new Promise;
$listener = function (ProtocolBridge\Message $msg) use ($id, $promise, &$listener) { $listener = function (Factory\Message $msg) use ($id, $promise, &$listener) {
if (AdvancedJsonRpc\Response::isResponse($msg->body) && $msg->body->id === $id) { if (AdvancedJsonRpc\Response::isResponse($msg->body) && $msg->body->id === $id) {
// Received a response // Received a response
$this->protocolReader->removeListener('message', $listener); $this->protocolReader->removeListener('message', $listener);
@ -73,7 +73,7 @@ class ClientHandler
public function notify(string $method, $params): Promise public function notify(string $method, $params): Promise
{ {
return $this->protocolWriter->write( return $this->protocolWriter->write(
new ProtocolBridge\Message( new Factory\Message(
new AdvancedJsonRpc\Notification($method, (object)$params) new AdvancedJsonRpc\Notification($method, (object)$params)
) )
); );

View File

@ -4,7 +4,7 @@ declare(strict_types = 1);
namespace LanguageServer; namespace LanguageServer;
use LanguageServer\Index\ReadableIndex; use LanguageServer\Index\ReadableIndex;
use LanguageServer\ProtocolBridge\CompletionItemFactory; use LanguageServer\Factory\CompletionItemFactory;
use LanguageServer\Protocol\{ use LanguageServer\Protocol\{
TextEdit, TextEdit,
Range, Range,

View File

@ -4,7 +4,7 @@ declare(strict_types = 1);
namespace LanguageServer; namespace LanguageServer;
use LanguageServer\Index\ReadableIndex; use LanguageServer\Index\ReadableIndex;
use LanguageServer\ProtocolBridge\SymbolInformationFactory; use LanguageServer\Factory\SymbolInformationFactory;
use LanguageServer\Protocol\SymbolInformation; use LanguageServer\Protocol\SymbolInformation;
use Microsoft\PhpParser; use Microsoft\PhpParser;
use Microsoft\PhpParser\Node; use Microsoft\PhpParser\Node;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace LanguageServer\ProtocolBridge; namespace LanguageServer\Factory;
use LanguageServer\Definition; use LanguageServer\Definition;
use LanguageServer\Protocol\CompletionItem; use LanguageServer\Protocol\CompletionItem;

View File

@ -1,6 +1,6 @@
<?php <?php
namespace LanguageServer\ProtocolBridge; namespace LanguageServer\Factory;
use LanguageServer\Protocol\Location; use LanguageServer\Protocol\Location;
use LanguageServer\Protocol\Position; use LanguageServer\Protocol\Position;

View File

@ -1,10 +1,10 @@
<?php <?php
declare(strict_types = 1); declare(strict_types = 1);
namespace LanguageServer\ProtocolBridge; namespace LanguageServer\Factory;
use AdvancedJsonRpc\Message as MessageBody; use AdvancedJsonRpc\Message as MessageBody;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
class Message class Message
{ {

View File

@ -1,6 +1,6 @@
<?php <?php
namespace LanguageServer\ProtocolBridge; namespace LanguageServer\Factory;
use LanguageServer\Protocol\Position; use LanguageServer\Protocol\Position;
use LanguageServer\Protocol\Range; use LanguageServer\Protocol\Range;

View File

@ -1,12 +1,13 @@
<?php <?php
namespace LanguageServer\ProtocolBridge; namespace LanguageServer\Factory;
use LanguageServer\Protocol\Location; use LanguageServer\Protocol\Location;
use LanguageServer\Protocol\SymbolInformation; use LanguageServer\Protocol\SymbolInformation;
use LanguageServer\Protocol\SymbolKind; use LanguageServer\Protocol\SymbolKind;
use Microsoft\PhpParser\Node; use Microsoft\PhpParser\Node;
use Microsoft\PhpParser\ResolvedName; use Microsoft\PhpParser\ResolvedName;
use LanguageServer\Factory\LocationFactory;
class SymbolInformationFactory class SymbolInformationFactory
{ {

View File

@ -11,7 +11,7 @@ use LanguageServer\Protocol\{
CompletionOptions, CompletionOptions,
SignatureHelpOptions SignatureHelpOptions
}; };
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use LanguageServer\FilesFinder\{FilesFinder, ClientFilesFinder, FileSystemFilesFinder}; use LanguageServer\FilesFinder\{FilesFinder, ClientFilesFinder, FileSystemFilesFinder};
use LanguageServer\ContentRetriever\{ContentRetriever, ClientContentRetriever, FileSystemContentRetriever}; use LanguageServer\ContentRetriever\{ContentRetriever, ClientContentRetriever, FileSystemContentRetriever};
use LanguageServer\Index\{DependenciesIndex, GlobalIndex, Index, ProjectIndex, StubsIndex}; use LanguageServer\Index\{DependenciesIndex, GlobalIndex, Index, ProjectIndex, StubsIndex};

View File

@ -2,7 +2,7 @@
namespace LanguageServer\Protocol; namespace LanguageServer\Protocol;
use LanguageServer\ProtocolBridge\LocationFactory; use LanguageServer\Factory\LocationFactory;
use Microsoft\PhpParser; use Microsoft\PhpParser;
use Microsoft\PhpParser\Node; use Microsoft\PhpParser\Node;

View File

@ -3,7 +3,7 @@ declare(strict_types = 1);
namespace LanguageServer; namespace LanguageServer;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use AdvancedJsonRpc\Message as MessageBody; use AdvancedJsonRpc\Message as MessageBody;
use Sabre\Event\{Loop, Emitter}; use Sabre\Event\{Loop, Emitter};

View File

@ -3,7 +3,7 @@ declare(strict_types = 1);
namespace LanguageServer; namespace LanguageServer;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use Sabre\Event\{ use Sabre\Event\{
Loop, Loop,
Promise Promise

View File

@ -3,7 +3,7 @@ declare(strict_types = 1);
namespace LanguageServer; namespace LanguageServer;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use Sabre\Event\Promise; use Sabre\Event\Promise;
interface ProtocolWriter interface ProtocolWriter

View File

@ -7,8 +7,8 @@ use LanguageServer\{
CompletionProvider, SignatureHelpProvider, LanguageClient, PhpDocument, PhpDocumentLoader, DefinitionResolver CompletionProvider, SignatureHelpProvider, LanguageClient, PhpDocument, PhpDocumentLoader, DefinitionResolver
}; };
use LanguageServer\Index\ReadableIndex; use LanguageServer\Index\ReadableIndex;
use LanguageServer\ProtocolBridge\LocationFactory; use LanguageServer\Factory\LocationFactory;
use LanguageServer\ProtocolBridge\RangeFactory; use LanguageServer\Factory\RangeFactory;
use LanguageServer\Protocol\{ use LanguageServer\Protocol\{
FormattingOptions, FormattingOptions,
Hover, Hover,

View File

@ -5,7 +5,7 @@ namespace LanguageServer\Server;
use LanguageServer\{LanguageClient, PhpDocumentLoader}; use LanguageServer\{LanguageClient, PhpDocumentLoader};
use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index}; use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
use LanguageServer\ProtocolBridge\LocationFactory; use LanguageServer\Factory\LocationFactory;
use LanguageServer\Protocol\{ use LanguageServer\Protocol\{
FileChangeType, FileChangeType,
FileEvent, FileEvent,

View File

@ -3,7 +3,7 @@ declare(strict_types = 1);
namespace LanguageServer; namespace LanguageServer;
use LanguageServer\ProtocolBridge\RangeFactory; use LanguageServer\Factory\RangeFactory;
use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position}; use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position};
use phpDocumentor\Reflection\DocBlockFactory; use phpDocumentor\Reflection\DocBlockFactory;
use Microsoft\PhpParser; use Microsoft\PhpParser;

View File

@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use LanguageServer\ClientHandler; use LanguageServer\ClientHandler;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use AdvancedJsonRpc; use AdvancedJsonRpc;
use Sabre\Event\Loop; use Sabre\Event\Loop;

View File

@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use LanguageServer\LanguageServer; use LanguageServer\LanguageServer;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use LanguageServer\Protocol\{ use LanguageServer\Protocol\{
ClientCapabilities, ClientCapabilities,
TextDocumentSyncKind, TextDocumentSyncKind,

View File

@ -4,7 +4,7 @@ declare(strict_types = 1);
namespace LanguageServer\Tests; namespace LanguageServer\Tests;
use LanguageServer\{ProtocolReader, ProtocolWriter}; use LanguageServer\{ProtocolReader, ProtocolWriter};
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use Sabre\Event\{Loop, Emitter, Promise}; use Sabre\Event\{Loop, Emitter, Promise};
/** /**

View File

@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter}; use LanguageServer\{LanguageServer, ProtocolStreamReader, ProtocolStreamWriter};
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use AdvancedJsonRpc\{Request as RequestBody, Response as ResponseBody}; use AdvancedJsonRpc\{Request as RequestBody, Response as ResponseBody};
use Sabre\Event\Loop; use Sabre\Event\Loop;

View File

@ -5,7 +5,7 @@ namespace LanguageServer\Tests;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use LanguageServer\ProtocolStreamWriter; use LanguageServer\ProtocolStreamWriter;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use AdvancedJsonRpc\{Request as RequestBody}; use AdvancedJsonRpc\{Request as RequestBody};
use Sabre\Event\Loop; use Sabre\Event\Loop;

View File

@ -7,7 +7,7 @@ use LanguageServer\ContentRetriever\FileSystemContentRetriever;
use LanguageServer\{DefinitionResolver, LanguageClient, PhpDocumentLoader, Server}; use LanguageServer\{DefinitionResolver, LanguageClient, PhpDocumentLoader, Server};
use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex}; use LanguageServer\Index\{DependenciesIndex, Index, ProjectIndex};
use LanguageServer\Protocol\{FileChangeType, FileEvent}; use LanguageServer\Protocol\{FileChangeType, FileEvent};
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use LanguageServer\Tests\MockProtocolStream; use LanguageServer\Tests\MockProtocolStream;
use LanguageServer\Tests\Server\ServerTestCase; use LanguageServer\Tests\Server\ServerTestCase;
use LanguageServer\Server\Workspace; use LanguageServer\Server\Workspace;

View File

@ -13,7 +13,7 @@ use phpDocumentor\Reflection\DocBlock;
use phpDocumentor\Reflection\DocBlockFactory; use phpDocumentor\Reflection\DocBlockFactory;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use LanguageServer\ClientHandler; use LanguageServer\ClientHandler;
use LanguageServer\ProtocolBridge\Message; use LanguageServer\Factory\Message;
use AdvancedJsonRpc; use AdvancedJsonRpc;
use RecursiveDirectoryIterator; use RecursiveDirectoryIterator;
use RecursiveIteratorIterator; use RecursiveIteratorIterator;