chore: dead code elimination

ErpNetDocs · Jun 28, 2024 · 9765e96 · 9765e96
1 parent c5362df
commit 9765e96
Show file tree

Hide file tree

Showing 34 changed files with 52 additions and 502 deletions.
diff --git a/src/Docfx.App/Helpers/Constants.cs b/src/Docfx.App/Helpers/Constants.cs
diff --git a/src/Docfx.App/RunBuild.cs b/src/Docfx.App/RunBuild.cs
@@ -6,8 +6,6 @@
 
 namespace Docfx;
 
-#pragma warning disable CS0618 // Type or member is obsolete
-
 /// <summary>
 /// Helper class to build document.
 /// </summary>
@@ -20,7 +18,7 @@ public static string Exec(BuildJsonConfig config, BuildOptions options, string c
     {
         if (config.Template == null || config.Template.Count == 0)
         {
-            config.Template = new ListWithStringFallback { Constants.DefaultTemplateName };
+            config.Template = new ListWithStringFallback { "default" };
         }
 
         var baseDirectory = Path.GetFullPath(string.IsNullOrEmpty(configDirectory) ? Directory.GetCurrentDirectory() : configDirectory);

diff --git a/src/Docfx.Build/DocumentBuilder.cs b/src/Docfx.Build/DocumentBuilder.cs
@@ -192,27 +192,25 @@ List<IDocumentProcessor> LoadSchemaDrivenDocumentProcessors(DocumentBuildParamet
         {
             var result = new List<IDocumentProcessor>();
 
-            using (var resource = parameter?.TemplateManager?.CreateTemplateResource())
+            var resource = parameter?.TemplateManager?.CreateTemplateResource();
+            if (resource == null || resource.IsEmpty)
             {
-                if (resource == null || resource.IsEmpty)
-                {
-                    return result;
-                }
+                return result;
+            }
 
-                foreach (var pair in resource.GetResources(@"^schemas/.*\.schema\.json"))
-                {
-                    var fileName = Path.GetFileName(pair.Path);
+            foreach (var pair in resource.GetResources(@"^schemas/.*\.schema\.json"))
+            {
+                var fileName = Path.GetFileName(pair.Path);
 
-                    using (new LoggerFileScope(fileName))
-                    {
-                        var schema = DocumentSchema.Load(pair.Content, fileName.Remove(fileName.Length - ".schema.json".Length));
-                        var sdp = new SchemaDrivenDocumentProcessor(
-                            schema,
-                            new CompositionContainer(CompositionContainer.DefaultContainer),
-                            markdownService);
-                        Logger.LogVerbose($"\t{sdp.Name} with build steps ({string.Join(", ", from bs in sdp.BuildSteps orderby bs.BuildOrder select bs.Name)})");
-                        result.Add(sdp);
-                    }
+                using (new LoggerFileScope(fileName))
+                {
+                    var schema = DocumentSchema.Load(pair.Content, fileName.Remove(fileName.Length - ".schema.json".Length));
+                    var sdp = new SchemaDrivenDocumentProcessor(
+                        schema,
+                        new CompositionContainer(CompositionContainer.DefaultContainer),
+                        markdownService);
+                    Logger.LogVerbose($"\t{sdp.Name} with build steps ({string.Join(", ", from bs in sdp.BuildSteps orderby bs.BuildOrder select bs.Name)})");
+                    result.Add(sdp);
                 }
             }
 
@@ -227,7 +225,7 @@ List<IDocumentProcessor> LoadSchemaDrivenDocumentProcessors(DocumentBuildParamet
 
     private static MarkdigMarkdownService CreateMarkdigMarkdownService(DocumentBuildParameters parameters)
     {
-        using var resource = parameters.TemplateManager?.CreateTemplateResource();
+        var resource = parameters.TemplateManager?.CreateTemplateResource();
 
         return new MarkdigMarkdownService(
             new MarkdownServiceParameters

diff --git a/src/Docfx.Build/HostServiceCreator.cs b/src/Docfx.Build/HostServiceCreator.cs
@@ -9,7 +9,7 @@
 
 namespace Docfx.Build.Engine;
 
-internal class HostServiceCreator : IHostServiceCreator
+class HostServiceCreator
 {
     private readonly DocumentBuildContext _context;
 

diff --git a/src/Docfx.Build/IHostServiceCreator.cs b/src/Docfx.Build/IHostServiceCreator.cs
diff --git a/src/Docfx.Build/LinkPhaseHandler.cs b/src/Docfx.Build/LinkPhaseHandler.cs
@@ -87,10 +87,10 @@ private InternalManifestItem HandleSaveResult(
         SaveResult result)
     {
         Context.SetFilePath(model.Key, ((RelativePath)model.File).GetPathFromWorkingFolder());
-        DocumentException.RunAll(
-            () => CheckFileLink(model, hostService, result),
-            () => HandleUids(result),
-            () => RegisterXRefSpec(result));
+
+        CheckFileLink(model, hostService, result);
+        HandleUids(result);
+        RegisterXRefSpec(result);
 
         return GetManifestItem(model, result);
     }

diff --git a/src/Docfx.Build/OSPlatformSensitiveDictionary.cs b/src/Docfx.Build/OSPlatformSensitiveDictionary.cs
diff --git a/src/Docfx.Build/PostProcessors/ValidateBookmark.cs b/src/Docfx.Build/PostProcessors/ValidateBookmark.cs
@@ -16,15 +16,12 @@ public sealed class ValidateBookmark : HtmlDocumentHandler
     /// <summary>
     /// bookmarks mapping from output file -> bookmarks
     /// </summary>
-    private readonly OSPlatformSensitiveDictionary<HashSet<string>> _registeredBookmarks =
-        new();
+    private readonly Dictionary<string, HashSet<string>> _registeredBookmarks = new(FilePathComparer.OSPlatformSensitiveStringComparer);
     /// <summary>
     /// file mapping from output file -> src file
     /// </summary>
-    private readonly OSPlatformSensitiveDictionary<string> _fileMapping =
-        new();
-    private readonly OSPlatformSensitiveDictionary<List<LinkItem>> _linksWithBookmark =
-        new();
+    private readonly Dictionary<string, string> _fileMapping = new(FilePathComparer.OSPlatformSensitiveStringComparer);
+    private readonly Dictionary<string, List<LinkItem>> _linksWithBookmark = new(FilePathComparer.OSPlatformSensitiveStringComparer);
 
     #region IHtmlDocumentHandler members
 

diff --git a/src/Docfx.Build/ResourceFileReaders/ArchiveResourceReader.cs b/src/Docfx.Build/ResourceFileReaders/ArchiveResourceReader.cs
diff --git a/src/Docfx.Build/ResourceFileReaders/CompositeResourceReader.cs b/src/Docfx.Build/ResourceFileReaders/CompositeResourceReader.cs
@@ -31,14 +31,6 @@ public override Stream GetResourceStream(string name)
         return null;
     }
 
-    protected override void Dispose(bool disposing)
-    {
-        foreach (var reader in _readers)
-            reader.Dispose();
-
-        base.Dispose(disposing);
-    }
-
     public IEnumerator<ResourceFileReader> GetEnumerator() => ((IEnumerable<ResourceFileReader>)_readers).GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator() => _readers.GetEnumerator();

diff --git a/src/Docfx.Build/ResourceFileReaders/IResourceFileReader.cs b/src/Docfx.Build/ResourceFileReaders/IResourceFileReader.cs
diff --git a/src/Docfx.Build/ResourceFileReaders/ResourceFileReader.cs b/src/Docfx.Build/ResourceFileReaders/ResourceFileReader.cs
@@ -5,7 +5,7 @@
 
 namespace Docfx.Build.Engine;
 
-public abstract class ResourceFileReader : IResourceFileReader, IDisposable
+public abstract class ResourceFileReader
 {
     public abstract string Name { get; }
 
@@ -55,24 +55,6 @@ bool filter(string s)
 
     public abstract Stream GetResourceStream(string name);
 
-    public void Dispose()
-    {
-        Dispose(true);
-        GC.SuppressFinalize(this);
-    }
-
-    protected virtual void Dispose(bool disposing)
-    {
-    }
-
-    /// <summary>
-    /// Override Object.Finalize by defining a destructor
-    /// </summary>
-    ~ResourceFileReader()
-    {
-        Dispose(false);
-    }
-
     protected static string GetString(Stream stream)
     {
         if (stream == null) return null;

diff --git a/src/Docfx.Build/SingleDocumentBuilder.cs b/src/Docfx.Build/SingleDocumentBuilder.cs
@@ -56,13 +56,12 @@ public Manifest Build(DocumentBuildParameters parameters, IMarkdownService markd
 
         // Start building document...
         List<HostService> hostServices = null;
-        IHostServiceCreator hostServiceCreator = null;
         try
         {
-            using var templateProcessor = parameters.TemplateManager?.GetTemplateProcessor(context, parameters.MaxParallelism)
-                                          ?? new TemplateProcessor(new EmptyResourceReader(), context, 16);
+            var templateProcessor = parameters.TemplateManager?.GetTemplateProcessor(context, parameters.MaxParallelism)
+                ?? new TemplateProcessor(new EmptyResourceReader(), context, 16);
 
-            hostServiceCreator = new HostServiceCreator(context);
+            var hostServiceCreator = new HostServiceCreator(context);
             hostServices = GetInnerContexts(parameters, Processors, templateProcessor, hostServiceCreator, markdownService);
 
             templateProcessor.CopyTemplateResources(context.ApplyTemplateSettings);
@@ -100,7 +99,7 @@ private List<HostService> GetInnerContexts(
         DocumentBuildParameters parameters,
         IEnumerable<IDocumentProcessor> processors,
         TemplateProcessor templateProcessor,
-        IHostServiceCreator creator,
+        HostServiceCreator creator,
         IMarkdownService markdownService)
     {
         var files = (from file in parameters.Files.EnumerateFiles().AsParallel().WithDegreeOfParallelism(parameters.MaxParallelism)

diff --git a/src/Docfx.Build/TemplateProcessors/Preprocessors/PreprocessorLoader.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/PreprocessorLoader.cs
@@ -9,11 +9,11 @@ namespace Docfx.Build.Engine;
 
 public class PreprocessorLoader
 {
-    private readonly IResourceFileReader _reader;
+    private readonly ResourceFileReader _reader;
     private readonly int _maxParallelism;
     private readonly DocumentBuildContext _context;
 
-    public PreprocessorLoader(IResourceFileReader reader, DocumentBuildContext context, int maxParallelism)
+    public PreprocessorLoader(ResourceFileReader reader, DocumentBuildContext context, int maxParallelism)
     {
         _reader = reader;
         _maxParallelism = maxParallelism;

diff --git a/src/Docfx.Build/TemplateProcessors/Preprocessors/TemplateJintPreprocessor.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/TemplateJintPreprocessor.cs
@@ -71,7 +71,7 @@ public class TemplateJintPreprocessor : ITemplatePreprocessor
 
     private Func<object, object> _getOptionsFunc;
 
-    public TemplateJintPreprocessor(IResourceFileReader resourceCollection, ResourceInfo scriptResource, DocumentBuildContext context, string name = null)
+    public TemplateJintPreprocessor(ResourceFileReader resourceCollection, ResourceInfo scriptResource, DocumentBuildContext context, string name = null)
     {
         if (!string.IsNullOrWhiteSpace(scriptResource.Content))
         {
@@ -112,7 +112,7 @@ public object TransformModel(object model)
         return model;
     }
 
-    private Jint.Engine SetupEngine(IResourceFileReader resourceCollection, ResourceInfo scriptResource, DocumentBuildContext context)
+    private Jint.Engine SetupEngine(ResourceFileReader resourceCollection, ResourceInfo scriptResource, DocumentBuildContext context)
     {
         var rootPath = (RelativePath)scriptResource.Path;
         var engineCache = new Dictionary<string, Jint.Engine>();