chore: Fix argument checks (dotnet#9027)

* fix: Add empty filePath check (based on previous doc comment)

dotnet#9024 (comment)

* chore: Fix additional CA1510 rules

* chore: fix redundant names (IDE0020)

Commented on dotnet#9024 (comment)

* fix: Fix wrong behavior changes introduced by previous PR

Commented on dotnet#9024 (comment)

* fix: Change thrown exception type.

Commented on dotnet#9024 (comment)

src/Docfx.App/Helpers/MetadataMerger.cs

@@ -21,10 +21,8 @@ internal class MetadataMerger
 
     public void Merge(MetadataMergeParameters parameters)
     {
-        if (parameters == null)
-        {
-            throw new ArgumentNullException(nameof(parameters));
-        }
+        ArgumentNullException.ThrowIfNull(parameters);
+
         if (parameters.OutputBaseDir == null)
         {
             throw new ArgumentException("Output folder cannot be null.", nameof(parameters) + "." + nameof(parameters.OutputBaseDir));

src/Docfx.Build.Common/Reference/OverwriteDocumentReader.cs

@@ -35,10 +35,7 @@ public static FileModel Read(FileAndType file)
     /// <returns></returns>
     public static IEnumerable<T> Transform<T>(FileModel model, string uid, Func<T, T> itemBuilder) where T : class, IOverwriteDocumentViewModel
     {
-        if (model == null)
-        {
-            throw new ArgumentNullException(nameof(model));
-        }
+        ArgumentNullException.ThrowIfNull(model);
 
         var overwrites = ((List<OverwriteDocumentModel>)model.Content).Where(s => s.Uid == uid);
         return overwrites.Select(s =>

src/Docfx.Build.Engine/DocumentBuildContext.cs

@@ -461,8 +461,8 @@ public IImmutableList<string> GetTocFileKeySet(string key)
     public void RegisterToc(string tocFileKey, string fileKey)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(fileKey);
-        ArgumentNullException.ThrowIfNullOrEmpty(tocFileKey);
+        ArgumentException.ThrowIfNullOrEmpty(fileKey);
+        ArgumentException.ThrowIfNullOrEmpty(tocFileKey);
 #else
         if (string.IsNullOrEmpty(fileKey)) throw new ArgumentNullException(nameof(fileKey));
         if (string.IsNullOrEmpty(tocFileKey)) throw new ArgumentNullException(nameof(tocFileKey));

src/Docfx.Build.Engine/TemplateProcessors/TemplateManager.cs

@@ -75,7 +75,7 @@ public void ProcessTheme(string outputDirectory, bool overwrite)
     private bool TryExportResourceFiles(IEnumerable<string> resourceNames, string outputDirectory, bool overwrite, string? regexFilter = null)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(outputDirectory);
+        ArgumentException.ThrowIfNullOrEmpty(outputDirectory);
 #else
         if (string.IsNullOrEmpty(outputDirectory))
             throw new ArgumentNullException(nameof(outputDirectory));

src/Docfx.Build.Engine/TemplateProcessors/TemplateProcessor.cs

@@ -45,7 +45,7 @@ public TemplateProcessor(ResourceFileReader resourceProvider, DocumentBuildConte
     public TemplateBundle GetTemplateBundle(string documentType)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(documentType);
+        ArgumentException.ThrowIfNullOrEmpty(documentType);
 #else
         if (string.IsNullOrEmpty(documentType)) throw new ArgumentNullException(nameof(documentType));
 #endif
@@ -55,7 +55,7 @@ public TemplateBundle GetTemplateBundle(string documentType)
     public bool TryGetFileExtension(string documentType, out string fileExtension)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(documentType);
+        ArgumentException.ThrowIfNullOrEmpty(documentType);
 #else
         if (string.IsNullOrEmpty(documentType)) throw new ArgumentNullException(nameof(documentType));
 #endif

src/Docfx.Build.TableOfContents/TocHelper.cs

@@ -59,7 +59,7 @@ public static IEnumerable<FileModel> Resolve(ImmutableList<FileModel> models, IH
     public static TocItemViewModel LoadSingleToc(string file)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(file);
+        ArgumentException.ThrowIfNullOrEmpty(file);
 #else
         if (string.IsNullOrEmpty(file))
         {
@@ -100,7 +100,7 @@ public static TocItemViewModel LoadSingleToc(string file)
     public static TocItemViewModel LoadYamlToc(string file)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(file);
+        ArgumentException.ThrowIfNullOrEmpty(file);
 #else
         if (string.IsNullOrEmpty(file))
         {

src/Docfx.Common/CompositeDictionary.cs

@@ -72,10 +72,8 @@ void ICollection<KeyValuePair<string, object>>.Add(KeyValuePair<string, object>
 
     public void Add(string key, object value)
     {
-        if (key == null)
-        {
-            throw new ArgumentNullException(nameof(key));
-        }
+        ArgumentNullException.ThrowIfNull(key);
+
         foreach (var entry in _entries)
         {
             if (key.StartsWith(entry.Prefix))

src/Docfx.Common/Git/GitUtility.cs

@@ -86,7 +86,7 @@ public static string RawContentUrlToContentUrl(string rawUrl)
     public static GitRepoInfo Parse(string repoUrl)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(repoUrl);
+        ArgumentException.ThrowIfNullOrEmpty(repoUrl);
 #else
         if (string.IsNullOrEmpty(repoUrl))
         {

src/Docfx.Common/Path/RelativePath.cs

@@ -189,7 +189,7 @@ public string GetFileNameWithoutExtension()
     public RelativePath ChangeFileName(string fileName)
     {
 #if NET7_0_OR_GREATER
-        ArgumentNullException.ThrowIfNullOrEmpty(fileName);
+        ArgumentException.ThrowIfNullOrEmpty(fileName);
 #else
         if (string.IsNullOrEmpty(fileName))
         {

src/Docfx.MarkdigEngine/MarkdigMarkdownService.cs

@@ -44,7 +44,13 @@ public MarkupResult Markup(string content, string filePath)
     public MarkupResult Markup(string content, string filePath, bool multipleYamlHeader)
     {
         ArgumentNullException.ThrowIfNull(content);
-        ArgumentNullException.ThrowIfNull(filePath);
+
+#if NET7_0_OR_GREATER
+        ArgumentException.ThrowIfNullOrEmpty(filePath);
+#else
+        if(string.IsNullOrEmpty(filePath))
+            throw new ArgumentNullException(nameof(filePath));
+#endif
 
         var pipeline = CreateMarkdownPipeline(isInline: false, multipleYamlHeader);
 

src/Docfx.Plugins/XRefSpec.cs

@@ -27,10 +27,8 @@ public XRefSpec(IDictionary<string, object> dictionary)
 
     public XRefSpec(XRefSpec spec)
     {
-        if (spec == null)
-        {
-            throw new ArgumentNullException(nameof(spec));
-        }
+        ArgumentNullException.ThrowIfNull(spec);
+
         _dict = new Dictionary<string, object>(spec._dict);
     }
 

src/docfx/Models/InitCommand.cs

@@ -375,7 +375,7 @@ public SingleChoiceQuestion(string content, Action<T, DefaultConfigModel, Questi
             ArgumentNullException.ThrowIfNull(options);
             ArgumentNullException.ThrowIfNull(converter);
 
-            if (options.Length == 0) throw new ArgumentNullException(nameof(options));
+            if (options.Length == 0) throw new ArgumentOutOfRangeException(nameof(options));
 
             _converter = converter;
             Options = options;

test/Docfx.Tests.Common/TestBase.cs

@@ -99,7 +99,11 @@ protected static string UpdateFile(string fileName, string content, string baseF
 
     protected static string CreateDirectory(string dir, string baseFolder)
     {
-        ArgumentNullException.ThrowIfNull(dir);
+        if (string.IsNullOrEmpty(dir))
+        {
+            return string.Empty;
+        }
+
         ArgumentNullException.ThrowIfNull(baseFolder);
 
         var subDirectory = Path.Combine(baseFolder, dir);