Move $clientCapabilities to AbstractHandler

Author: przepompownia

lib/AbstractHandler.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Phpactor\Extension;
+
+use Phpactor\LanguageServerProtocol\ClientCapabilities;
+
+abstract class AbstractHandler
+{
+    /**
+     * @var ClientCapabilities
+     */
+    protected $clientCapabilities;
+
+    public function __construct(ClientCapabilities $clientCapabilities)
+    {
+        $this->clientCapabilities = $clientCapabilities;
+    }
+}

lib/LanguageServerCompletion/Handler/CompletionHandler.php

@@ -6,6 +6,7 @@
 use Amp\CancelledException;
 use Amp\Delayed;
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\Extension\LanguageServerCodeTransform\Model\NameImport\NameImporter;
 use Phpactor\Extension\LanguageServerCodeTransform\Model\NameImport\NameImporterResult;
@@ -29,7 +30,7 @@
 use Phpactor\LanguageServer\Core\Workspace\Workspace;
 use Phpactor\TextDocument\TextDocumentBuilder;
 
-class CompletionHandler implements Handler, CanRegisterCapabilities
+class CompletionHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var TypedCompletorRegistry
@@ -56,11 +57,6 @@ class CompletionHandler implements Handler, CanRegisterCapabilities
      */
     private $nameImporter;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(
         Workspace $workspace,
         TypedCompletorRegistry $registry,
@@ -74,7 +70,7 @@ public function __construct(
         $this->workspace = $workspace;
         $this->suggestionNameFormatter = $suggestionNameFormatter;
         $this->nameImporter = $nameImporter;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     public function methods(): array

lib/LanguageServerCompletion/Handler/SignatureHelpHandler.php

@@ -3,6 +3,7 @@
 namespace Phpactor\Extension\LanguageServerCompletion\Handler;
 
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\Position;
@@ -18,7 +19,7 @@
 use Phpactor\LanguageServer\Core\Workspace\Workspace;
 use Phpactor\TextDocument\TextDocumentBuilder;
 
-class SignatureHelpHandler implements Handler, CanRegisterCapabilities
+class SignatureHelpHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var Workspace
@@ -30,16 +31,11 @@ class SignatureHelpHandler implements Handler, CanRegisterCapabilities
      */
     private $helper;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(Workspace $workspace, SignatureHelper $helper, ClientCapabilities $clientCapabilities)
     {
         $this->workspace = $workspace;
         $this->helper = $helper;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     /**

lib/LanguageServerHover/Handler/HoverHandler.php

@@ -3,6 +3,7 @@
 namespace Phpactor\Extension\LanguageServerHover\Handler;
 
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\Hover;
@@ -27,7 +28,7 @@
 use Phpactor\WorseReflection\Core\Type;
 use Phpactor\WorseReflection\Reflector;
 
-class HoverHandler implements Handler, CanRegisterCapabilities
+class HoverHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var Reflector
@@ -44,11 +45,6 @@ class HoverHandler implements Handler, CanRegisterCapabilities
      */
     private $workspace;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(
         Workspace $workspace,
         Reflector $reflector,
@@ -58,7 +54,7 @@ public function __construct(
         $this->reflector = $reflector;
         $this->renderer = $renderer;
         $this->workspace = $workspace;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     public function methods(): array

lib/LanguageServerIndexer/Handler/WorkspaceSymbolHandler.php

@@ -3,6 +3,7 @@
 namespace Phpactor\Extension\LanguageServerIndexer\Handler;
 
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerIndexer\Model\WorkspaceSymbolProvider;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\ServerCapabilities;
@@ -11,22 +12,17 @@
 use Phpactor\LanguageServer\Core\Handler\CanRegisterCapabilities;
 use Phpactor\LanguageServer\Core\Handler\Handler;
 
-class WorkspaceSymbolHandler implements Handler, CanRegisterCapabilities
+class WorkspaceSymbolHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var WorkspaceSymbolProvider
      */
     private $provider;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(WorkspaceSymbolProvider $provider, ClientCapabilities $clientCapabilities)
     {
         $this->provider = $provider;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     public function methods(): array

lib/LanguageServerReferenceFinder/Handler/GotoDefinitionHandler.php

@@ -3,6 +3,7 @@
 namespace Phpactor\Extension\LanguageServerReferenceFinder\Handler;
 
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\DefinitionParams;
@@ -15,7 +16,7 @@
 use Phpactor\ReferenceFinder\Exception\CouldNotLocateDefinition;
 use Phpactor\TextDocument\TextDocumentBuilder;
 
-class GotoDefinitionHandler implements Handler, CanRegisterCapabilities
+class GotoDefinitionHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var DefinitionLocator
@@ -32,11 +33,6 @@ class GotoDefinitionHandler implements Handler, CanRegisterCapabilities
      */
     private $locationConverter;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(
         Workspace $workspace,
         DefinitionLocator $definitionLocator,
@@ -46,7 +42,7 @@ public function __construct(
         $this->definitionLocator = $definitionLocator;
         $this->workspace = $workspace;
         $this->locationConverter = $locationConverter;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     public function methods(): array

lib/LanguageServerReferenceFinder/Handler/GotoImplementationHandler.php

@@ -3,6 +3,7 @@
 namespace Phpactor\Extension\LanguageServerReferenceFinder\Handler;
 
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\ImplementationParams;
@@ -14,7 +15,7 @@
 use Phpactor\ReferenceFinder\ClassImplementationFinder;
 use Phpactor\TextDocument\TextDocumentBuilder;
 
-class GotoImplementationHandler implements Handler, CanRegisterCapabilities
+class GotoImplementationHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var Workspace
@@ -31,11 +32,6 @@ class GotoImplementationHandler implements Handler, CanRegisterCapabilities
      */
     private $locationConverter;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(
         Workspace $workspace,
         ClassImplementationFinder $finder,
@@ -46,7 +42,7 @@ public function __construct(
         $this->workspace = $workspace;
         $this->finder = $finder;
         $this->locationConverter = $locationConverter;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     /**

lib/LanguageServerReferenceFinder/Handler/HighlightHandler.php

@@ -4,6 +4,7 @@
 
 use Amp\Promise;
 use Amp\Success;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\Extension\LanguageServerReferenceFinder\Model\Highlighter;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
@@ -16,7 +17,7 @@
 use Phpactor\LanguageServer\Core\Handler\Handler;
 use Phpactor\LanguageServer\Core\Workspace\Workspace;
 
-class HighlightHandler implements Handler, CanRegisterCapabilities
+class HighlightHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var Workspace
@@ -28,16 +29,11 @@ class HighlightHandler implements Handler, CanRegisterCapabilities
      */
     private $highlighter;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(Workspace $workspace, Highlighter $highlighter, ClientCapabilities $clientCapabilities)
     {
         $this->workspace = $workspace;
         $this->highlighter = $highlighter;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     /**

lib/LanguageServerReferenceFinder/Handler/ReferencesHandler.php

@@ -4,6 +4,7 @@
 
 use Amp\Delayed;
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\Location as LspLocation;
@@ -24,7 +25,7 @@
 use Phpactor\TextDocument\Locations;
 use Phpactor\TextDocument\TextDocumentBuilder;
 
-class ReferencesHandler implements Handler, CanRegisterCapabilities
+class ReferencesHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var Workspace
@@ -56,11 +57,6 @@ class ReferencesHandler implements Handler, CanRegisterCapabilities
      */
     private $clientApi;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(
         Workspace $workspace,
         ReferenceFinder $finder,
@@ -76,7 +72,7 @@ public function __construct(
         $this->timeoutSeconds = $timeoutSeconds;
         $this->locationConverter = $locationConverter;
         $this->clientApi = $clientApi;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     /**

lib/LanguageServerReferenceFinder/Handler/TypeDefinitionHandler.php

@@ -3,6 +3,7 @@
 namespace Phpactor\Extension\LanguageServerReferenceFinder\Handler;
 
 use Amp\Promise;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerBridge\Converter\PositionConverter;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\Position;
@@ -16,7 +17,7 @@
 use Phpactor\ReferenceFinder\TypeLocator;
 use Phpactor\TextDocument\TextDocumentBuilder;
 
-class TypeDefinitionHandler implements Handler, CanRegisterCapabilities
+class TypeDefinitionHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var TypeLocator
@@ -33,11 +34,6 @@ class TypeDefinitionHandler implements Handler, CanRegisterCapabilities
      */
     private $locationConverter;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(
         Workspace $workspace,
         TypeLocator $typeLocator,
@@ -48,7 +44,7 @@ public function __construct(
         $this->typeLocator = $typeLocator;
         $this->workspace = $workspace;
         $this->locationConverter = $locationConverter;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     public function methods(): array

lib/LanguageServerSymbolProvider/Handler/DocumentSymbolProviderHandler.php

@@ -4,6 +4,7 @@
 
 use Amp\Promise;
 use Amp\Success;
+use Phpactor\Extension\AbstractHandler;
 use Phpactor\Extension\LanguageServerSymbolProvider\Model\DocumentSymbolProvider;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\LanguageServerProtocol\DocumentSymbolOptions;
@@ -14,7 +15,7 @@
 use Phpactor\LanguageServer\Core\Handler\Handler;
 use Phpactor\LanguageServer\Core\Workspace\Workspace;
 
-class DocumentSymbolProviderHandler implements Handler, CanRegisterCapabilities
+class DocumentSymbolProviderHandler extends AbstractHandler implements Handler, CanRegisterCapabilities
 {
     /**
      * @var Workspace
@@ -26,19 +27,14 @@ class DocumentSymbolProviderHandler implements Handler, CanRegisterCapabilities
      */
     private $provider;
 
-    /**
-     * @var ClientCapabilities
-     */
-    private ClientCapabilities $clientCapabilities;
-
     public function __construct(
         Workspace $workspace,
         DocumentSymbolProvider $provider,
         ClientCapabilities $clientCapabilities,
     ) {
         $this->workspace = $workspace;
         $this->provider = $provider;
-        $this->clientCapabilities = $clientCapabilities;
+        parent::__construct($clientCapabilities);
     }
 
     /**