Change IComponentRegistry interface to use Type parameters

This change modifies the IComponentRegistry method signatures to take a
Type parameter directly rather than using a generic parameter.  This
allows callers in PowerShell to request component implementations
without resorting to generic method invocation.  An
IComponentRegistryExtensions class is also added to provide extension
methods which expose the original generic method signatures for
convenience in C# code.

Author: daviwil

src/PowerShellEditorServices.Host/EditorServicesHost.cs

@@ -3,6 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
+using Microsoft.PowerShell.EditorServices.Components;
 using Microsoft.PowerShell.EditorServices.CodeLenses;
 using Microsoft.PowerShell.EditorServices.Extensions;
 using Microsoft.PowerShell.EditorServices.Protocol.MessageProtocol;

src/PowerShellEditorServices/Components/ComponentRegistry.cs

@@ -24,17 +24,19 @@ public class ComponentRegistry : IComponentRegistry
         /// or throws an ArgumentException if an instance has
         /// already been registered.
         /// </summary>
+        /// <param name="componentType">
+        /// The component type that the instance represents.
+        /// </param>
         /// <param name="componentInstance">
         /// The instance of the component to be registered.
         /// </param>
         /// <returns>
         /// The provided component instance for convenience in assignment
         /// statements.
         /// </returns>
-        public TComponent Register<TComponent>(TComponent componentInstance)
-            where TComponent : class
+        public object Register(Type componentType, object componentInstance)
         {
-            this.componentRegistry.Add(typeof(TComponent), componentInstance);
+            this.componentRegistry.Add(componentType, componentInstance);
             return componentInstance;
         }
 
@@ -44,11 +46,13 @@ public TComponent Register<TComponent>(TComponent componentInstance)
         /// component type or throws a KeyNotFoundException if
         /// no instance has been registered.
         /// </summary>
+        /// <param name="componentType">
+        /// The component type for which an instance will be retrieved.
+        /// </param>
         /// <returns>The implementation of the specified type.</returns>
-        public TComponent Get<TComponent>()
-            where TComponent : class
+        public object Get(Type componentType)
         {
-            return (TComponent)this.componentRegistry[typeof(TComponent)];
+            return this.componentRegistry[componentType];
         }
 
         /// <summary>
@@ -59,18 +63,18 @@ public TComponent Get<TComponent>()
         /// <param name="componentInstance">
         /// The out parameter in which the found instance will be stored.
         /// </param>
+        /// <param name="componentType">
+        /// The component type for which an instance will be retrieved.
+        /// </param>
         /// <returns>
         /// True if a registered instance was found, false otherwise.
         /// </returns>
-        public bool TryGet<TComponent>(out TComponent componentInstance)
-            where TComponent : class
+        public bool TryGet(Type componentType, out object componentInstance)
         {
-            object componentObject = null;
             componentInstance = null;
 
-            if (this.componentRegistry.TryGetValue(typeof(TComponent), out componentObject))
+            if (this.componentRegistry.TryGetValue(componentType, out componentInstance))
             {
-                componentInstance = componentObject as TComponent;
                 return componentInstance != null;
             }
 

src/PowerShellEditorServices/Components/IComponentRegistry.cs

@@ -3,9 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
+using System;
 
 namespace Microsoft.PowerShell.EditorServices.Components
 {
@@ -19,37 +17,45 @@ public interface IComponentRegistry
         /// or throws an ArgumentException if an instance has
         /// already been registered.
         /// </summary>
+        /// <param name="componentType">
+        /// The component type that the instance represents.
+        /// </param>
         /// <param name="componentInstance">
         /// The instance of the component to be registered.
         /// </param>
         /// <returns>
         /// The provided component instance for convenience in assignment
         /// statements.
         /// </returns>
-        TComponent Register<TComponent>(TComponent componentInstance)
-            where TComponent : class;
+        object Register(
+            Type componentType,
+            object componentInstance);
 
         /// <summary>
         /// Gets the registered instance of the specified
         /// component type or throws a KeyNotFoundException if
         /// no instance has been registered.
         /// </summary>
+        /// <param name="componentType">
+        /// The component type for which an instance will be retrieved.
+        /// </param>
         /// <returns>The implementation of the specified type.</returns>
-        TComponent Get<TComponent>()
-            where TComponent : class;
+        object Get(Type componentType);
 
         /// <summary>
         /// Attempts to retrieve the instance of the specified
         /// component type and, if found, stores it in the
         /// componentInstance parameter.
         /// </summary>
+        /// <param name="componentType">
+        /// The component type for which an instance will be retrieved.
+        /// </param>
         /// <param name="componentInstance">
         /// The out parameter in which the found instance will be stored.
         /// </param>
         /// <returns>
         /// True if a registered instance was found, false otherwise.
         /// </returns>
-        bool TryGet<TComponent>(out TComponent componentInstance)
-            where TComponent : class;
+        bool TryGet(Type componentType, out object componentInstance);
     }
 }

src/PowerShellEditorServices/Components/IComponentRegistryExtensions.cs

@@ -0,0 +1,87 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+namespace Microsoft.PowerShell.EditorServices.Components
+{
+    /// <summary>
+    /// Provides generic helper methods for working with IComponentRegistry
+    /// methods.
+    /// </summary>
+    public static class IComponentRegistryExtensions
+    {
+        /// <summary>
+        /// Registers an instance of the specified component type
+        /// or throws an ArgumentException if an instance has
+        /// already been registered.
+        /// </summary>
+        /// <param name="componentRegistry">
+        /// The IComponentRegistry instance.
+        /// </param>
+        /// <param name="componentInstance">
+        /// The instance of the component to be registered.
+        /// </param>
+        /// <returns>
+        /// The provided component instance for convenience in assignment
+        /// statements.
+        /// </returns>
+        public static TComponent Register<TComponent>(
+            this IComponentRegistry componentRegistry,
+            TComponent componentInstance)
+                where TComponent : class
+        {
+            return
+                (TComponent)componentRegistry.Register(
+                    typeof(TComponent),
+                    componentInstance);
+        }
+
+        /// <summary>
+        /// Gets the registered instance of the specified
+        /// component type or throws a KeyNotFoundException if
+        /// no instance has been registered.
+        /// </summary>
+        /// <param name="componentRegistry">
+        /// The IComponentRegistry instance.
+        /// </param>
+        /// <returns>The implementation of the specified type.</returns>
+        public static TComponent Get<TComponent>(
+            this IComponentRegistry componentRegistry)
+                where TComponent : class
+        {
+            return (TComponent)componentRegistry.Get(typeof(TComponent));
+        }
+
+        /// <summary>
+        /// Attempts to retrieve the instance of the specified
+        /// component type and, if found, stores it in the
+        /// componentInstance parameter.
+        /// </summary>
+        /// <param name="componentRegistry">
+        /// The IComponentRegistry instance.
+        /// </param>
+        /// <param name="componentInstance">
+        /// The out parameter in which the found instance will be stored.
+        /// </param>
+        /// <returns>
+        /// True if a registered instance was found, false otherwise.
+        /// </returns>
+        public static bool TryGet<TComponent>(
+            this IComponentRegistry componentRegistry,
+            out TComponent componentInstance)
+                where TComponent : class
+        {
+            object componentObject = null;
+            componentInstance = null;
+
+            if (componentRegistry.TryGet(typeof(TComponent), out componentObject))
+            {
+                componentInstance = componentObject as TComponent;
+                return componentInstance != null;
+            }
+
+            return false;
+        }
+    }
+}