Merge pull request #1615 from dmgonch/dmgonch/PluginsConfiguration

Support plugins configuration in omnisharp.json
OmniSharp · Nov 21, 2019 · a4e73f0 · a4e73f0
2 parents a3e7dbf + c256c1e
commit a4e73f0
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 18 deletions.
diff --git a/src/OmniSharp.Abstractions/Services/IAssemblyLoader.cs b/src/OmniSharp.Abstractions/Services/IAssemblyLoader.cs
@@ -1,4 +1,5 @@
-using System;
+using Microsoft.Extensions.Logging;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
@@ -54,11 +55,22 @@ public static Assembly LoadByAssemblyNameOrPath(
             }
         }
 
-        public static IEnumerable<Assembly> LoadByAssemblyNameOrPath(this IAssemblyLoader loader, IEnumerable<string>  assemblyNames)
+        public static IEnumerable<Assembly> LoadByAssemblyNameOrPath(this IAssemblyLoader loader, ILogger logger, IEnumerable<string>  assemblyNames)
         {
             foreach (var assemblyName in assemblyNames)
             {
-                yield return loader.LoadByAssemblyNameOrPath(assemblyName);
+                Assembly assembly;
+                try
+                {
+                    assembly = loader.LoadByAssemblyNameOrPath(assemblyName);
+                }
+                catch (Exception ex)
+                {
+                    logger.LogError(ex, $"Failed to load assembly by name or path: {assemblyName}");
+                    continue;
+                }
+
+                yield return assembly;
             }
         }
     }

diff --git a/src/OmniSharp.Host/CommandLineApplicationExtensions.cs b/src/OmniSharp.Host/CommandLineApplicationExtensions.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using OmniSharp.Options;
 using OmniSharp.Plugins;
 using OmniSharp.Services;
 
@@ -15,9 +16,11 @@ public static OmniSharpEnvironment CreateEnvironment(this CommandLineApplication
                 application.OtherArgs.ToArray<string>());
         }
 
-        public static PluginAssemblies CreatePluginAssemblies(this CommandLineApplication application)
+        public static PluginAssemblies CreatePluginAssemblies(this CommandLineApplication application,
+            OmniSharpOptions options,
+            OmniSharpEnvironment environment)
         {
-            return new PluginAssemblies(application.Plugin);
+            return new PluginAssemblies(application.Plugin.Concat(options.Plugins.GetNormalizedLocationPaths(environment)));
         }
     }
 }
diff --git a/src/OmniSharp.Http.Driver/Program.cs b/src/OmniSharp.Http.Driver/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using OmniSharp.Plugins;
 using OmniSharp.Services;
 
 namespace OmniSharp.Http.Driver
@@ -14,9 +15,9 @@ static int Main(string[] args) => HostHelpers.Start(() =>
                 Configuration.ZeroBasedIndices = application.ZeroBasedIndices;
 
                 var writer = new SharedTextWriter(Console.Out);
-                var plugins = application.CreatePluginAssemblies();
+                var commandLinePlugins = new PluginAssemblies(application.Plugin);
 
-                var host = new Host(environment, writer, plugins, application.Port, application.Interface);
+                var host = new Host(environment, writer, commandLinePlugins, application.Port, application.Interface);
                 host.Start();
 
                 return 0;

diff --git a/src/OmniSharp.Http/Host.cs b/src/OmniSharp.Http/Host.cs
@@ -14,20 +14,20 @@ internal class Host
     {
         private readonly IOmniSharpEnvironment _environment;
         private readonly ISharedTextWriter _sharedTextWriter;
-        private readonly PluginAssemblies _pluginAssemblies;
+        private readonly PluginAssemblies _commandLinePlugins;
         private readonly int _serverPort;
         private readonly string _serverInterface;
 
         public Host(
             IOmniSharpEnvironment environment,
             ISharedTextWriter sharedTextWriter,
-            PluginAssemblies pluginAssemblies,
+            PluginAssemblies commandLinePlugins,
             int serverPort,
             string serverInterface)
         {
             _environment = environment;
             _sharedTextWriter = sharedTextWriter;
-            _pluginAssemblies = pluginAssemblies;
+            _commandLinePlugins = commandLinePlugins;
             _serverPort = serverPort;
             _serverInterface = serverInterface;
         }
@@ -44,7 +44,7 @@ public void Start()
                     serviceCollection.AddSingleton(_environment);
                     serviceCollection.AddSingleton(_sharedTextWriter);
                     serviceCollection.AddSingleton(NullEventEmitter.Instance);
-                    serviceCollection.AddSingleton(_pluginAssemblies);
+                    serviceCollection.AddSingleton(_commandLinePlugins);
                     serviceCollection.AddSingleton(new HttpEnvironment { Port = _serverPort });
                 })
                 .UseUrls($"http://{_serverInterface}:{_serverPort}")

diff --git a/src/OmniSharp.Http/Startup.cs b/src/OmniSharp.Http/Startup.cs
@@ -1,11 +1,15 @@
 using System;
 using System.Composition.Hosting;
+using System.Linq;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using OmniSharp.Eventing;
 using OmniSharp.Http.Middleware;
+using OmniSharp.Options;
+using OmniSharp.Plugins;
 using OmniSharp.Roslyn;
 using OmniSharp.Services;
 using OmniSharp.Utilities;
@@ -17,11 +21,13 @@ internal class Startup
         private readonly IOmniSharpEnvironment _environment;
         private readonly IEventEmitter _eventEmitter;
         private CompositionHost _compositionHost;
+        private PluginAssemblies _commandLinePlugins;
 
-        public Startup(IOmniSharpEnvironment environment, IEventEmitter eventEmitter, ISharedTextWriter writer)
+        public Startup(IOmniSharpEnvironment environment, IEventEmitter eventEmitter, PluginAssemblies commandLinePlugins)
         {
             _environment = environment;
             _eventEmitter = eventEmitter;
+            _commandLinePlugins = commandLinePlugins;
         }
 
         public IServiceProvider ConfigureServices(IServiceCollection services)
@@ -45,8 +51,15 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
                                 !category.Equals(projectEventForwarder, StringComparison.OrdinalIgnoreCase)));
                 });
 
+            var options = serviceProvider.GetRequiredService<IOptionsMonitor<OmniSharpOptions>>();
+            var plugins = _commandLinePlugins.AssemblyNames.Concat(options.CurrentValue.Plugins.GetNormalizedLocationPaths(_environment));
+
+            var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
+            var logger = loggerFactory.CreateLogger<Startup>();
+            var assemblyLoader = serviceProvider.GetRequiredService<IAssemblyLoader>();
             _compositionHost = new CompositionHostBuilder(serviceProvider)
                 .WithOmniSharpAssemblies()
+                .WithAssemblies(assemblyLoader.LoadByAssemblyNameOrPath(logger, plugins).ToArray())
                 .Build();
 
             return serviceProvider;

diff --git a/src/OmniSharp.LanguageServerProtocol/LanguageServerHost.cs b/src/OmniSharp.LanguageServerProtocol/LanguageServerHost.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
@@ -16,6 +17,7 @@
 using OmniSharp.LanguageServerProtocol.Handlers;
 using OmniSharp.Mef;
 using OmniSharp.Models.Diagnostics;
+using OmniSharp.Options;
 using OmniSharp.Roslyn;
 using OmniSharp.Services;
 using OmniSharp.Utilities;
@@ -91,13 +93,14 @@ private void CreateCompositionHost(InitializeParams initializeParams)
             _eventEmitter = new LanguageServerEventEmitter();
             _serviceProvider = CompositionHostBuilder.CreateDefaultServiceProvider(_environment, configurationRoot, _eventEmitter, _services);
 
-            var plugins = _application.CreatePluginAssemblies();
+            var options = _serviceProvider.GetRequiredService<IOptionsMonitor<OmniSharpOptions>>();
+            var plugins = _application.CreatePluginAssemblies(options.CurrentValue, _environment);
 
             var assemblyLoader = _serviceProvider.GetRequiredService<IAssemblyLoader>();
             var compositionHostBuilder = new CompositionHostBuilder(_serviceProvider)
                 .WithOmniSharpAssemblies()
                 .WithAssemblies(typeof(LanguageServerHost).Assembly)
-                .WithAssemblies(assemblyLoader.LoadByAssemblyNameOrPath(plugins.AssemblyNames).ToArray());
+                .WithAssemblies(assemblyLoader.LoadByAssemblyNameOrPath(_logger, plugins.AssemblyNames).ToArray());
 
             _compositionHost = compositionHostBuilder.Build();
 

diff --git a/src/OmniSharp.Shared/Options/OmniSharpOptions.cs b/src/OmniSharp.Shared/Options/OmniSharpOptions.cs
@@ -11,5 +11,7 @@ public class OmniSharpOptions
         public FileOptions FileOptions { get; set; } = new FileOptions();
 
         public RenameOptions RenameOptions { get; set; } = new RenameOptions();
+
+        public OmniSharpExtensionsOptions Plugins { get; set; } = new OmniSharpExtensionsOptions();
     }
 }
diff --git a/src/OmniSharp.Shared/Options/RoslynExtensionsOptions.cs b/src/OmniSharp.Shared/Options/RoslynExtensionsOptions.cs
@@ -5,11 +5,14 @@
 
 namespace OmniSharp.Options
 {
-    public class RoslynExtensionsOptions
+    public class RoslynExtensionsOptions : OmniSharpExtensionsOptions
     {
         public bool EnableAnalyzersSupport { get; set; }
         public int DocumentAnalysisTimeoutMs { get; set; } = 10 * 1000;
+    }
 
+    public class OmniSharpExtensionsOptions
+    {
         public string[] LocationPaths { get; set; }
 
         public IEnumerable<string> GetNormalizedLocationPaths(IOmniSharpEnvironment env)
@@ -32,4 +35,4 @@ public IEnumerable<string> GetNormalizedLocationPaths(IOmniSharpEnvironment env)
             return normalizePaths;
         }
     }
-}
+}
diff --git a/src/OmniSharp.Stdio.Driver/Program.cs b/src/OmniSharp.Stdio.Driver/Program.cs
@@ -4,7 +4,9 @@
 using System.Threading;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using OmniSharp.LanguageServerProtocol;
+using OmniSharp.Options;
 using OmniSharp.Services;
 using OmniSharp.Stdio.Eventing;
 using OmniSharp.Stdio.Logging;
@@ -57,11 +59,13 @@ static int Main(string[] args) => HostHelpers.Start(() =>
                     var loggerFactory = serviceProvider.GetRequiredService<ILoggerFactory>();
                     var assemblyLoader = serviceProvider.GetRequiredService<IAssemblyLoader>();
 
-                    var plugins = application.CreatePluginAssemblies();
+                    var options = serviceProvider.GetRequiredService<IOptionsMonitor<OmniSharpOptions>>();
+                    var plugins = application.CreatePluginAssemblies(options.CurrentValue, environment);
 
+                    var logger = loggerFactory.CreateLogger<Program>();
                     var compositionHostBuilder = new CompositionHostBuilder(serviceProvider)
                         .WithOmniSharpAssemblies()
-                        .WithAssemblies(assemblyLoader.LoadByAssemblyNameOrPath(plugins.AssemblyNames).ToArray());
+                        .WithAssemblies(assemblyLoader.LoadByAssemblyNameOrPath(logger, plugins.AssemblyNames).ToArray());
 
                     using (var host = new Host(input, writer, environment, serviceProvider, compositionHostBuilder, loggerFactory, cancellation))
                     {