Merge pull request #35621 from jasonmalinowski/fix-editorconfig-bugs

Fix three .editorconfig bugs

src/Features/Core/Portable/Diagnostics/WorkspaceAnalyzerOptions.cs

@@ -18,7 +18,7 @@ internal sealed class WorkspaceAnalyzerOptions : AnalyzerOptions
         private readonly OptionSet _optionSet;
 
         public WorkspaceAnalyzerOptions(AnalyzerOptions options, OptionSet optionSet, Solution solution)
-            : base(options.AdditionalFiles)
+            : base(options.AdditionalFiles, options.AnalyzerConfigOptionsProvider)
         {
             _solution = solution;
             _optionSet = optionSet;

src/VisualStudio/Core/Impl/ProjectSystem/CPS/CPSProject_IWorkspaceProjectContext.cs

@@ -257,12 +257,12 @@ internal VisualStudioProject GetProject_TestOnly()
 
         public void AddAnalyzerConfigFile(string filePath)
         {
-            // TODO: implement. Right now this exists to provide a stub for the project system work to be implemented against.
+            _visualStudioProject.AddAnalyzerConfigFile(filePath);
         }
 
         public void RemoveAnalyzerConfigFile(string filePath)
         {
-            // TODO: implement. Right now this exists to provide a stub for the project system work to be implemented against.
+            _visualStudioProject.RemoveAnalyzerConfigFile(filePath);
         }
     }
 }

src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.cs

@@ -533,7 +533,9 @@ public SolutionState AddProject(ProjectInfo projectInfo)
         }
 
         private static IEnumerable<TextDocumentState> GetDocumentStates(ProjectState projectState)
-            => projectState.DocumentStates.Values.Concat(projectState.AdditionalDocumentStates.Values);
+            => projectState.DocumentStates.Values
+                   .Concat(projectState.AdditionalDocumentStates.Values)
+                   .Concat(projectState.AnalyzerConfigDocumentStates.Values);
 
         /// <summary>
         /// Create a new solution instance without the project specified.

src/Workspaces/CoreTest/SolutionTests/SolutionTests.cs

@@ -1729,6 +1729,29 @@ public async Task TestChangingAnEditorConfigFile()
             Assert.True(finalCompilation.ContainsSyntaxTree(syntaxTreeAfterEditorConfigChange));
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.Workspace)]
+        public void AddingAndRemovingProjectsUpdatesFilePathMap()
+        {
+            var solution = CreateSolution();
+            var projectId = ProjectId.CreateNewId();
+            var editorConfigDocumentId = DocumentId.CreateNewId(projectId);
+
+            const string editorConfigFilePath = @"Z:\.editorconfig";
+
+            var projectInfo =
+                ProjectInfo.Create(projectId, VersionStamp.Default, "Test", "Test", LanguageNames.CSharp)
+                    .WithAnalyzerConfigDocuments(new[] { DocumentInfo.Create(editorConfigDocumentId, ".editorconfig", filePath: editorConfigFilePath) });
+
+
+            solution = solution.AddProject(projectInfo);
+
+            Assert.Equal(editorConfigDocumentId, Assert.Single(solution.GetDocumentIdsWithFilePath(editorConfigFilePath)));
+
+            solution = solution.RemoveProject(projectId);
+
+            Assert.Empty(solution.GetDocumentIdsWithFilePath(editorConfigFilePath));
+        }
+
         private static void GetMultipleProjects(
             out Project csBrokenProject,
             out Project vbNormalProject,