Honour .editorconfig files when formatting new projects

src/VisualStudio/Core/Def/Implementation/AbstractEditorFactory.cs

@@ -309,6 +309,10 @@ private async Task FormatDocumentCreatedFromTemplateAsync(IVsHierarchy hierarchy
                     name: nameof(FormatDocumentCreatedFromTemplate),
                     assemblyName: nameof(FormatDocumentCreatedFromTemplate),
                     language: LanguageName);
+
+                // We have to discover .editorconfig files ourselves to ensure that code style rules are followed.
+                // Normally the project system would tell us about these.
+                projectToAddTo = AddEditorConfigFiles(projectToAddTo, Path.GetDirectoryName(filePath));
             }
 
             // We need to ensure that decisions made during new document formatting are based on the right language
@@ -361,5 +365,41 @@ private async Task FormatDocumentCreatedFromTemplateAsync(IVsHierarchy hierarchy
                 formattedText.Write(textWriter, cancellationToken: CancellationToken.None);
             });
         }
+
+        private static Project AddEditorConfigFiles(Project projectToAddTo, string projectFolder)
+        {
+            do
+            {
+                projectToAddTo = AddEditorConfigFile(projectToAddTo, projectFolder, out var foundRoot);
+
+                if (foundRoot)
+                    break;
+
+                projectFolder = Path.GetDirectoryName(projectFolder);
+            }
+            while (projectFolder is not null);
+
+            return projectToAddTo;
+
+            static Project AddEditorConfigFile(Project project, string folder, out bool foundRoot)
+            {
+                const string EditorConfigFileName = ".editorconfig";
+
+                foundRoot = false;
+
+                var editorConfigFile = Path.Combine(folder, EditorConfigFileName);
+
+                var text = IOUtilities.PerformIO(() =>
+                {
+                    using var stream = File.OpenRead(editorConfigFile);
+                    return SourceText.From(stream);
+                });
+
+                if (text is null)
+                    return project;
+
+                return project.AddAnalyzerConfigDocument(EditorConfigFileName, text, filePath: editorConfigFile).Project;
+            }
+        }
     }
 }

src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpNewDocumentFormatting.cs

@@ -4,6 +4,7 @@
 
 #nullable disable
 
+using System.IO;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.VisualStudio.IntegrationTest.Utilities;
@@ -54,5 +55,85 @@ public void CreateSDKProjectWithFileScopedNamespaces()
             VisualStudio.ErrorList.ShowErrorList();
             VisualStudio.ErrorList.Verify.NoErrors();
         }
+
+        [WpfFact]
+        [WorkItem(60449, "https://github.com/dotnet/roslyn/issues/60449")]
+        public void CreateSDKProjectWithBlockScopedNamespacesFromEditorConfig()
+        {
+            var project = new ProjectUtils.Project("TestProj");
+
+            VisualStudio.Workspace.SetFileScopedNamespaces(true);
+
+            var editorConfigFilePath = Path.Combine(VisualStudio.SolutionExplorer.DirectoryName, ".editorconfig");
+            File.WriteAllText(editorConfigFilePath,
+@"
+root = true
+
+[*.cs]
+csharp_style_namespace_declarations = block_scoped
+");
+
+            VisualStudio.SolutionExplorer.AddProject(project, WellKnownProjectTemplates.CSharpNetCoreClassLibrary, LanguageNames.CSharp);
+
+            VisualStudio.ErrorList.ShowErrorList();
+            VisualStudio.ErrorList.Verify.NoErrors();
+
+            VisualStudio.Editor.Verify.TextContains("namespace TestProj\r\n{");
+        }
+
+        [WpfFact]
+        [WorkItem(60449, "https://github.com/dotnet/roslyn/issues/60449")]
+        public void CreateSDKProjectWithBlockScopedNamespacesFromIrrelevantEditorConfigH()
+        {
+            var project = new ProjectUtils.Project("TestProj");
+
+            VisualStudio.Workspace.SetFileScopedNamespaces(true);
+
+            var editorConfigFilePath = Path.Combine(VisualStudio.SolutionExplorer.DirectoryName, ".editorconfig");
+            File.WriteAllText(editorConfigFilePath,
+@"
+root = true
+");
+
+            // This editor config file should be ignored
+            editorConfigFilePath = Path.Combine(VisualStudio.SolutionExplorer.DirectoryName, "..", ".editorconfig");
+            File.WriteAllText(editorConfigFilePath,
+@"
+[*.cs]
+csharp_style_namespace_declarations = block_scoped
+");
+
+            VisualStudio.SolutionExplorer.AddProject(project, WellKnownProjectTemplates.CSharpNetCoreClassLibrary, LanguageNames.CSharp);
+
+            VisualStudio.ErrorList.ShowErrorList();
+            VisualStudio.ErrorList.Verify.NoErrors();
+
+            VisualStudio.Editor.Verify.TextContains("namespace TestProj;");
+        }
+
+        [WpfFact]
+        [WorkItem(60449, "https://github.com/dotnet/roslyn/issues/60449")]
+        public void CreateSDKProjectWithFileScopedNamespacesFromEditorConfig()
+        {
+            var project = new ProjectUtils.Project("TestProj");
+
+            VisualStudio.Workspace.SetFileScopedNamespaces(false);
+
+            var editorConfigFilePath = Path.Combine(VisualStudio.SolutionExplorer.DirectoryName, ".editorconfig");
+            File.WriteAllText(editorConfigFilePath,
+@"
+root = true
+
+[*.cs]
+csharp_style_namespace_declarations = file_scoped
+");
+
+            VisualStudio.SolutionExplorer.AddProject(project, WellKnownProjectTemplates.CSharpNetCoreClassLibrary, LanguageNames.CSharp);
+
+            VisualStudio.ErrorList.ShowErrorList();
+            VisualStudio.ErrorList.Verify.NoErrors();
+
+            VisualStudio.Editor.Verify.TextContains("namespace TestProj;");
+        }
     }
 }

src/VisualStudio/IntegrationTest/TestUtilities/OutOfProcess/SolutionExplorer_OutOfProc.cs

@@ -21,6 +21,9 @@ public SolutionExplorer_OutOfProc(VisualStudioInstance visualStudioInstance)
             _inProc = CreateInProcComponent<SolutionExplorer_InProc>(visualStudioInstance);
         }
 
+        public string DirectoryName
+            => _inProc.DirectoryName;
+
         public void CloseSolution(bool saveFirst = false)
             => _inProc.CloseSolution(saveFirst);