diff --git a/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php b/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
index b9dd9e6..c0e7bbe9 100644
--- a/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
+++ b/core/lib/Drupal/Core/Plugin/PluginDependencyTrait.php
@@ -16,7 +16,7 @@
   use DependencyTrait;
 
   /**
-   * Calculates and adds dependencies of a specific plugin instance.
+   * Calculates dependencies of a specific plugin instance.
    *
    * Dependencies are added for the module that provides the plugin, as well
    * as any dependencies declared by the instance's calculateDependencies()
@@ -27,26 +27,37 @@
    *   The plugin instance.
    */
   protected function calculatePluginDependencies(PluginInspectionInterface $instance) {
+    return $this->addDependencies($this->getPluginDependencies($instance));
+  }
+
+  /**
+   * Adds dependencies of a specific plugin instance.
+   *
+   * @param PluginInspectionInterface $instance
+   *   The plugin instance.
+   */
+  protected function getPluginDependencies(PluginInspectionInterface $instance){
     $definition = $instance->getPluginDefinition();
 
     if ($definition instanceof PluginDefinitionInterface) {
-      $this->addDependency('module', $definition->getProvider());
+      $dependency = $this->addDependency('module', $definition->getProvider());
       if ($definition instanceof DependentPluginDefinitionInterface && $config_dependencies = $definition->getConfigDependencies()) {
-        $this->addDependencies($config_dependencies);
+        $dependency = $this->addDependencies($config_dependencies);
       }
     }
     elseif (is_array($definition)) {
-      $this->addDependency('module', $definition['provider']);
+      $dependency = $this->addDependency('module', $definition['provider']);
       // Plugins can declare additional dependencies in their definition.
       if (isset($definition['config_dependencies'])) {
-        $this->addDependencies($definition['config_dependencies']);
+        $dependency = $this->addDependencies($definition['config_dependencies']);
       }
     }
 
     // If a plugin is dependent, calculate its dependencies.
     if ($instance instanceof DependentPluginInterface && $plugin_dependencies = $instance->calculateDependencies()) {
-      $this->addDependencies($plugin_dependencies);
+      $dependency = $this->addDependencies($plugin_dependencies);
     }
+    return $dependency;
   }
 
 }