Fix generation of root file (#1221)

dotnet · Oct 6, 2023 · 2214b4d · 2214b4d
1 parent 2bc4356
commit 2214b4d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 20 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix [RCS1241](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1241) ([#1197](https://github.com/JosefPihrt/Roslynator/pull/1197)).
 - Fix [RCS1250](https://josefpihrt.github.io/docs/roslynator/analyzers/RCS1250) ([#1205](https://github.com/JosefPihrt/Roslynator/pull/1205)).
 - [CLI] Fix globbing ([#1215](https://github.com/JosefPihrt/Roslynator/pull/1215)).
+- [CLI] Fix generation of root file ([#1221](https://github.com/JosefPihrt/Roslynator/pull/1221)).
 
 ## [4.5.0] - 2023-08-27
 

diff --git a/src/CommandLine/Commands/GenerateDocCommand.cs b/src/CommandLine/Commands/GenerateDocCommand.cs
@@ -230,7 +230,7 @@ DocumentationWriter CreateDocumentationWriter(DocumentationContext context)
 
         WriteLine($"Generate documentation to '{Options.Output}'", Verbosity.Minimal);
 
-        IEnumerable<DocumentationGeneratorResult> results = generator.Generate(heading: Options.Heading, cancellationToken);
+        IEnumerable<DocumentationGeneratorResult> results = generator.Generate(cancellationToken);
 
         if (DocumentationHost == DocumentationHost.Sphinx)
         {
@@ -283,6 +283,8 @@ private void GenerateRootFile(DocumentationGenerator generator)
         File.WriteAllText(rootFilePath, result.Content, _defaultEncoding);
 
         WriteLine($"Documentation root successfully generated to '{rootFilePath}'.", Verbosity.Minimal);
+
+        generator.Options.RootDirectoryUrl = null;
     }
 
     private static void AddTableOfContents(IEnumerable<DocumentationGeneratorResult> results)

diff --git a/src/Documentation/DocumentationGenerator.cs b/src/Documentation/DocumentationGenerator.cs
@@ -151,20 +151,12 @@ private DocumentationWriter CreateWriter(ISymbol currentSymbol = null)
         return writer;
     }
 
-    public IEnumerable<DocumentationGeneratorResult> Generate(string heading = null, CancellationToken cancellationToken = default)
+    public IEnumerable<DocumentationGeneratorResult> Generate(CancellationToken cancellationToken = default)
     {
         cancellationToken.ThrowIfCancellationRequested();
 
         DocumentationDepth depth = Options.Depth;
 
-        using (DocumentationWriter writer = CreateWriter())
-        {
-            DocumentationGeneratorResult result = GenerateRoot(writer, heading);
-
-            if (result.Content is not null)
-                yield return result;
-        }
-
         if (depth <= DocumentationDepth.Namespace)
         {
             IEnumerable<INamedTypeSymbol> typeSymbols = DocumentationModel.Types.Where(f => !Options.ShouldBeIgnored(f));

diff --git a/tools/generate_ref_docs.ps1 b/tools/generate_ref_docs.ps1
@@ -11,13 +11,5 @@ $rootDirectoryUrl="build/ref"
  --heading "Roslynator .NET API Reference" `
  --group-by-common-namespace `
  --ignored-common-parts content `
- --ignored-root-parts all `
- --max-derived-types 10
-
-& $roslynatorExe generate-doc-root generate_ref_docs.sln `
- --properties Configuration=Release `
- -o "build/ref.md" `
- --host docusaurus `
- --heading "Roslynator .NET API Reference" `
- --ignored-parts content `
- --root-directory-url "ref"
+ --max-derived-types 10 `
+ --root-file-path "build/ref.md"