Move duplicated clientCapabilities() to AbstractExtension

Author: przepompownia

lib/AbstractExtension.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Phpactor\Extension;
+
+use Phpactor\Container\Container;
+use Phpactor\LanguageServerProtocol\ClientCapabilities;
+
+abstract class AbstractExtension
+{
+    protected function clientCapabilities(Container $container): ClientCapabilities
+    {
+        return $container->get(ClientCapabilities::class);
+    }
+}

lib/LanguageServerCompletion/LanguageServerCompletionExtension.php

@@ -5,6 +5,7 @@
 use Phpactor\Container\Container;
 use Phpactor\Container\ContainerBuilder;
 use Phpactor\Container\Extension;
+use Phpactor\Extension\AbstractExtension;
 use Phpactor\Extension\Completion\CompletionExtension;
 use Phpactor\Extension\LanguageServerCodeTransform\Model\NameImport\NameImporter;
 use Phpactor\Extension\LanguageServerCompletion\Handler\SignatureHelpHandler;
@@ -14,7 +15,7 @@
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\MapResolver\Resolver;
 
-class LanguageServerCompletionExtension implements Extension
+class LanguageServerCompletionExtension extends AbstractExtension implements Extension
 {
     private const PARAM_TRIM_LEADING_DOLLAR = 'language_server_completion.trim_leading_dollar';
 
@@ -67,9 +68,4 @@ private function registerHandlers(ContainerBuilder $container): void
             );
         }, [ LanguageServerExtension::TAG_METHOD_HANDLER => [] ]);
     }
-
-    private function clientCapabilities(Container $container): ClientCapabilities
-    {
-        return $container->get(ClientCapabilities::class);
-    }
 }

lib/LanguageServerHover/LanguageServerHoverExtension.php

@@ -5,6 +5,7 @@
 use Phpactor\CodeBuilder\Domain\TemplatePathResolver\PhpVersionPathResolver;
 use Phpactor\Container\Container;
 use Phpactor\Container\ContainerBuilder;
+use Phpactor\Extension\AbstractExtension;
 use Phpactor\Extension\Logger\LoggingExtension;
 use Phpactor\Extension\Php\Model\PhpVersionResolver;
 use Phpactor\Extension\WorseReflection\WorseReflectionExtension;
@@ -16,7 +17,7 @@
 use Phpactor\Container\Extension;
 use Phpactor\MapResolver\Resolver;
 
-class LanguageServerHoverExtension implements Extension
+class LanguageServerHoverExtension extends AbstractExtension implements Extension
 {
     public const PARAM_TEMPLATE_PATHS = 'language_server_hover.template_paths';
 
@@ -77,9 +78,4 @@ public function load(ContainerBuilder $container): void
             return $builder->build();
         });
     }
-
-    private function clientCapabilities(Container $container): ClientCapabilities
-    {
-        return $container->get(ClientCapabilities::class);
-    }
 }

lib/LanguageServerIndexer/LanguageServerIndexerExtension.php

@@ -6,6 +6,7 @@
 use Phpactor\Container\Container;
 use Phpactor\Container\ContainerBuilder;
 use Phpactor\Container\Extension;
+use Phpactor\Extension\AbstractExtension;
 use Phpactor\Extension\LanguageServerIndexer\Handler\IndexerHandler;
 use Phpactor\Extension\LanguageServerIndexer\Handler\WorkspaceSymbolHandler;
 use Phpactor\Extension\LanguageServerIndexer\Listener\ReindexListener;
@@ -23,7 +24,7 @@
 use Phpactor\TextDocument\TextDocumentLocator;
 use Psr\EventDispatcher\EventDispatcherInterface;
 
-class LanguageServerIndexerExtension implements Extension
+class LanguageServerIndexerExtension extends AbstractExtension implements Extension
 {
     public const WORKSPACE_SYMBOL_SEARCH_LIMIT = 'language_server_indexer.workspace_symbol_search_limit';
 
@@ -85,9 +86,4 @@ private function registerSessionHandler(ContainerBuilder $container): void
             LanguageServerExtension::TAG_LISTENER_PROVIDER => [],
         ]);
     }
-
-    private function clientCapabilities(Container $container): ClientCapabilities
-    {
-        return $container->get(ClientCapabilities::class);
-    }
 }

lib/LanguageServerReferenceFinder/LanguageServerReferenceFinderExtension.php

@@ -6,6 +6,7 @@
 use Phpactor\Container\Container;
 use Phpactor\Container\ContainerBuilder;
 use Phpactor\Container\Extension;
+use Phpactor\Extension\AbstractExtension;
 use Phpactor\Extension\LanguageServerBridge\Converter\LocationConverter;
 use Phpactor\Extension\LanguageServerReferenceFinder\Handler\GotoDefinitionHandler;
 use Phpactor\Extension\LanguageServerReferenceFinder\Handler\GotoImplementationHandler;
@@ -22,7 +23,7 @@
 use Phpactor\MapResolver\Resolver;
 use Phpactor\ReferenceFinder\ReferenceFinder;
 
-class LanguageServerReferenceFinderExtension implements Extension
+class LanguageServerReferenceFinderExtension extends AbstractExtension implements Extension
 {
     const PARAM_REFERENCE_TIMEOUT = 'language_server_reference_reference_finder.reference_timeout';
 
@@ -99,9 +100,4 @@ public function configure(Resolver $schema): void
             self::PARAM_REFERENCE_TIMEOUT => 'Stop searching for references after this time (in seconds) has expired',
         ]);
     }
-
-    private function clientCapabilities(Container $container): ClientCapabilities
-    {
-        return $container->get(ClientCapabilities::class);
-    }
 }

lib/LanguageServerSymbolProvider/LanguageServerSymbolProviderExtension.php

@@ -6,14 +6,15 @@
 use Phpactor\Container\Container;
 use Phpactor\Container\ContainerBuilder;
 use Phpactor\Container\Extension;
+use Phpactor\Extension\AbstractExtension;
 use Phpactor\Extension\LanguageServerSymbolProvider\Adapter\TolerantDocumentSymbolProvider;
 use Phpactor\Extension\LanguageServerSymbolProvider\Handler\DocumentSymbolProviderHandler;
 use Phpactor\Extension\LanguageServerSymbolProvider\Model\DocumentSymbolProvider;
 use Phpactor\Extension\LanguageServer\LanguageServerExtension;
 use Phpactor\LanguageServerProtocol\ClientCapabilities;
 use Phpactor\MapResolver\Resolver;
 
-class LanguageServerSymbolProviderExtension implements Extension
+class LanguageServerSymbolProviderExtension extends AbstractExtension implements Extension
 {
     /**
      * {@inheritDoc}
@@ -40,9 +41,4 @@ public function load(ContainerBuilder $container): void
     public function configure(Resolver $schema): void
     {
     }
-
-    private function clientCapabilities(Container $container): ClientCapabilities
-    {
-        return $container->get(ClientCapabilities::class);
-    }
 }