Skip to content
This repository was archived by the owner on Mar 6, 2022. It is now read-only.

Failing test for progress notifier begin() #24

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"phpactor/console-extension": "^0.1.6",
"phpactor/container": "^2.0.0",
"phpactor/file-path-resolver-extension": "^0.3.4",
"phpactor/language-server": "^1.1.0",
"phpactor/language-server": "^1.1.1",
"phpactor/logging-extension": "^0.3.4",
"phpactor/text-document": "^1.2.3"
},
Expand All @@ -26,7 +26,8 @@
"phpactor/test-utils": "^1.1.3",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/phpstan": "~0.12.0",
"phpunit/phpunit": "^9.0"
"phpunit/phpunit": "^9.0",
"symfony/var-dumper": "^5.3"
},
"extra": {
"branch-alias": {
Expand Down
29 changes: 23 additions & 6 deletions tests/LanguageServer/Example/TestExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,15 @@
use Phpactor\LanguageServerProtocol\Range;
use Phpactor\LanguageServerProtocol\TextDocumentItem;
use Phpactor\LanguageServer\Core\CodeAction\CodeActionProvider;
use Phpactor\LanguageServer\Core\Command\ClosureCommand;
use Phpactor\LanguageServer\Core\Command\Command as CoreCommand;
use Phpactor\LanguageServer\Core\Handler\ClosureHandler;
use Phpactor\LanguageServer\Core\Handler\Handler;
use Phpactor\LanguageServer\Core\Rpc\NotificationMessage;
use Phpactor\LanguageServer\Core\Server\ClientApi;
use Phpactor\LanguageServer\Core\Service\ServiceProvider;
use Phpactor\LanguageServer\WorkDoneProgress\ProgressNotifier;
use Phpactor\LanguageServer\WorkDoneProgress\WorkDoneToken;
use Phpactor\MapResolver\Resolver;

class TestExtension implements Extension
Expand Down Expand Up @@ -70,18 +74,31 @@ public function test()
}, [ LanguageServerExtension::TAG_SERVICE_PROVIDER => []]);

$container->register('test.command', function (Container $container) {
return new class implements CoreCommand {
public function __invoke(string $text): Promise
{
return new Success($text);
}
};
return new ClosureCommand(function (string $text): Promise {
return new Success($text);
});
}, [
LanguageServerExtension::TAG_COMMAND => [
'name' => 'echo',
],
]);

$container->register('test.progress_notifier_handler', function (Container $container) {

return new ClosureHandler('test/progress_notifier', function () use ($container){
$notifier = $container->get(ProgressNotifier::class);
assert($notifier instanceof ProgressNotifier);
$token = WorkDoneToken::generate();
$notifier->begin($token, 'Test');
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@camilledejoye this fails with the message notifier because $message is optional, fixing in language-serveer package

$notifier->report($token);
$notifier->end($token, 'Done');

return new Success(true);
});
}, [
LanguageServerExtension::TAG_METHOD_HANDLER => [],
]);

$container->register('test.code_action_provider', function (Container $container) {
return new class implements CodeActionProvider {
public function provideActionsFor(TextDocumentItem $textDocument, Range $range): Promise
Expand Down
11 changes: 11 additions & 0 deletions tests/LanguageServer/Unit/LanguageServerExtensionTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Phpactor\LanguageServer\Core\Rpc\RequestMessage;
use Phpactor\LanguageServer\Core\Server\Exception\ExitSession;
use Phpactor\LanguageServer\Listener\WorkspaceListener;
use Phpactor\LanguageServer\WorkDoneProgress\ProgressNotifier;
use RuntimeException;
use function Amp\Promise\wait;
use function Amp\delay;
Expand Down Expand Up @@ -161,4 +162,14 @@ public function testEnableFileEvents(): void
assert($message instanceof RequestMessage);
self::assertEquals('client/registerCapability', $message->method);
}

public function testProgressNotifier(): void
{
$serverTester = $this->createTester(null, [
LanguageServerExtension::PARAM_FILE_EVENTS => true
]);
$serverTester->initialize();
$response = wait($serverTester->notify('test/progress_notifier', []));
dump($response);
}
}