Port changes from dotnet#40513

mavasani · Feb 20, 2020 · b006324 · b006324
1 parent 508ed76
commit b006324
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/...rkspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs b/...rkspaces/Core/Portable/Options/EditorConfig/EditorConfigDocumentOptionsProviderFactory.cs
@@ -14,24 +14,17 @@
 
 namespace Microsoft.CodeAnalysis.Options.EditorConfig
 {
-    [Export(typeof(IDocumentOptionsProviderFactory)), Shared]
-    [ExportMetadata("Name", PredefinedDocumentOptionsProviderNames.EditorConfig)]
-    internal sealed class EditorConfigDocumentOptionsProviderFactory : IDocumentOptionsProviderFactory
+    internal static class EditorConfigDocumentOptionsProviderFactory
     {
-        [ImportingConstructor]
-        public EditorConfigDocumentOptionsProviderFactory()
-        {
-        }
-
-        public IDocumentOptionsProvider? TryCreate(Workspace workspace)
+        public static IDocumentOptionsProvider? TryCreate(Workspace workspace)
         {
             if (!ShouldUseNativeEditorConfigSupport(workspace))
             {
                 // Simply disable if the feature isn't on
                 return null;
             }
 
-            return new EditorConfigDocumentOptionsProvider(workspace.Services.GetRequiredService<IErrorLoggerService>());
+            return new EditorConfigDocumentOptionsProvider(workspace.Services.GetService<IErrorLoggerService>());
         }
 
         private const string LocalRegistryPath = @"Roslyn\Internal\OnOff\Features\";
@@ -47,9 +40,9 @@ public static bool ShouldUseNativeEditorConfigSupport(Workspace workspace)
 
         private class EditorConfigDocumentOptionsProvider : IDocumentOptionsProvider
         {
-            private readonly IErrorLoggerService _errorLogger;
+            private readonly IErrorLoggerService? _errorLogger;
 
-            public EditorConfigDocumentOptionsProvider(IErrorLoggerService errorLogger)
+            public EditorConfigDocumentOptionsProvider(IErrorLoggerService? errorLogger)
             {
                 _errorLogger = errorLogger;
             }
@@ -64,9 +57,9 @@ public EditorConfigDocumentOptionsProvider(IErrorLoggerService errorLogger)
             private class DocumentOptions : IDocumentOptions
             {
                 private readonly ImmutableDictionary<string, string> _options;
-                private readonly IErrorLoggerService _errorLogger;
+                private readonly IErrorLoggerService? _errorLogger;
 
-                public DocumentOptions(ImmutableDictionary<string, string> options, IErrorLoggerService errorLogger)
+                public DocumentOptions(ImmutableDictionary<string, string> options, IErrorLoggerService? errorLogger)
                 {
                     _options = options;
                     _errorLogger = errorLogger;

diff --git a/src/Workspaces/Core/Portable/Workspace/Workspace.cs b/src/Workspaces/Core/Portable/Workspace/Workspace.cs
@@ -16,6 +16,7 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Options.EditorConfig;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 using Microsoft.CodeAnalysis.Text;
@@ -86,6 +87,19 @@ protected Workspace(HostServices host, string? workspaceKind)
             var info = SolutionInfo.Create(SolutionId.CreateNewId(), VersionStamp.Create());
             var emptyOptions = new SerializableOptionSet(languages: ImmutableHashSet<string>.Empty, _optionService, serializableOptions: ImmutableHashSet<IOption>.Empty, values: ImmutableDictionary<OptionKey, object?>.Empty);
             _latestSolution = CreateSolution(info, emptyOptions);
+
+            TryRegisterDocumentOptionsProvider();
+        }
+
+        internal void TryRegisterDocumentOptionsProvider()
+        {
+            var documentOptionsProvider = EditorConfigDocumentOptionsProviderFactory.TryCreate(this);
+            if (documentOptionsProvider is null)
+            {
+                return;
+            }
+
+            _optionService.RegisterDocumentOptionsProvider(documentOptionsProvider);
         }
 
         internal void LogTestMessage(string message)