采纳代码审查意见

Author: walterlv

src/DotNetCampus.CommandLine.Analyzer/Analyzers/ConvertOptionProperty/FindOptionPropertyTypeAnalyzer.cs

@@ -9,20 +9,20 @@ namespace DotNetCampus.CommandLine.Analyzers.ConvertOptionProperty;
 [DiagnosticAnalyzer(LanguageNames.CSharp)]
 public class FindOptionPropertyTypeAnalyzer : DiagnosticAnalyzer
 {
-    private readonly ImmutableArray<string> _nonGenericTypeNames =
+    private readonly ImmutableHashSet<string> _nonGenericTypeNames =
     [
         "String", "string", "Boolean", "bool", "Byte", "byte", "Int16", "short", "UInt16", "ushort", "Int32", "int", "UInt32", "uint", "Int64", "long",
         "UInt64", "ulong", "Single", "float", "Double", "double", "Decimal", "decimal", "IList", "ICollection", "IEnumerable",
     ];
 
-    private readonly ImmutableArray<string> _oneGenericTypeNames =
+    private readonly ImmutableHashSet<string> _oneGenericTypeNames =
     [
         "[]", "ImmutableArray", "List", "IList", "IReadOnlyList", "ImmutableHashSet", "Collection", "ICollection", "IReadOnlyCollection", "IEnumerable",
     ];
 
-    private readonly ImmutableArray<string> _twoGenericTypeNames = ["ImmutableDictionary", "Dictionary", "IDictionary", "IReadOnlyDictionary", "KeyValuePair"];
-    private readonly ImmutableArray<string> _genericKeyArgumentTypeNames = ["String", "string"];
-    private readonly ImmutableArray<string> _genericArgumentTypeNames = ["String", "string"];
+    private readonly ImmutableHashSet<string> _twoGenericTypeNames = ["ImmutableDictionary", "Dictionary", "IDictionary", "IReadOnlyDictionary", "KeyValuePair"];
+    private readonly ImmutableHashSet<string> _genericKeyArgumentTypeNames = ["String", "string"];
+    private readonly ImmutableHashSet<string> _genericArgumentTypeNames = ["String", "string"];
 
     /// <summary>
     /// Supported diagnostics.

src/DotNetCampus.CommandLine.Analyzer/Analyzers/OptionLongNameMustBeKebabCaseAnalyzer.cs

@@ -17,7 +17,7 @@ public class OptionLongNameMustBeKebabCaseAnalyzer : DiagnosticAnalyzer
     /// <summary>
     /// Recognize these attributes.
     /// </summary>
-    private readonly IList<string> _attributeNames = new List<string> { "Option", "OptionAttribute" };
+    private readonly ImmutableHashSet<string> _attributeNames = ["Option", "OptionAttribute"];
 
     /// <summary>
     /// Supported diagnostics.

src/DotNetCampus.CommandLine.Analyzer/Analyzers/OptionLongNameMustBeKebabCaseCodeFixProvider.cs

@@ -57,6 +57,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
     private async Task<Solution> MakeKebabCaseAsync(Document document, ExpressionSyntax expressionSyntax, CancellationToken cancellationToken)
     {
         var expression = expressionSyntax.ToString();
+        // 去掉引号。
         var oldName = expression.Substring(1, expression.Length - 2);
         var newName = NamingHelper.MakeKebabCase(oldName);
 

src/DotNetCampus.CommandLine.Analyzer/GeneratorInfo.cs

@@ -5,7 +5,7 @@ namespace DotNetCampus.CommandLine;
 
 internal static class GeneratorInfo
 {
-    public static string RootNamespace { get; } = typeof(GeneratorInfo).Namespace!;
+    public static string RootNamespace => typeof(GeneratorInfo).Namespace!;
 
     public static string ToolName { get; } = typeof(GeneratorInfo).Assembly
         .GetCustomAttribute<AssemblyTitleAttribute>()?.Title ?? typeof(GeneratorInfo).Namespace!;

src/DotNetCampus.CommandLine.Analyzer/Generators/ModelProviding/CommandModelProvider.cs

@@ -229,10 +229,6 @@ public string GetDisplayCommandOption()
         var shortName = optionAttribute.ConstructorArguments.FirstOrDefault(x => x.Type?.SpecialType is SpecialType.System_Char).Value?.ToString();
         var caseSensitive = optionAttribute.NamedArguments.FirstOrDefault(a => a.Key == nameof(OptionAttribute.CaseSensitive)).Value.Value?.ToString();
         var exactSpelling = optionAttribute.NamedArguments.FirstOrDefault(a => a.Key == nameof(OptionAttribute.ExactSpelling)).Value.Value is true;
-        if (exactSpelling)
-        {
-            throw new InvalidOperationException($"Property: {propertySymbol.Name}");
-        }
         var aliases = optionAttribute.NamedArguments.FirstOrDefault(a => a.Key == nameof(OptionAttribute.Aliases)).Value switch
         {
             { Kind: TypedConstantKind.Array } typedConstant => typedConstant.Values.Select(a => a.Value?.ToString())

src/DotNetCampus.CommandLine.Analyzer/Properties/Localizations.Designer.cs

@@ -141,7 +141,7 @@
     <value>Use 'string' type instead</value>
   </data>
   <data name="DCL202_Description" xml:space="preserve">
-    <value>This property has the type '{0}' which is not built-in supported. It's recommended to use bool/string/IList&lt;string&gt; or other types that the code fix will suggest you change instead or add a custom converter on your Value or Option attribute.</value>
+    <value>This property has the type '{0}' which is not built-in supported. It's recommended to use bool/string/IReadOnlyList&lt;string&gt; or other types that the code fix will suggest you change instead or add a custom converter on your Value or Option attribute.</value>
   </data>
   <data name="DCL202_Message" xml:space="preserve">
     <value>This property has the type '{0}' which is not built-in supported.</value>

src/DotNetCampus.CommandLine.Analyzer/Properties/Localizations.resx

@@ -22,8 +22,8 @@
         <value>命令行选项：改为字典类型 (IReadOnlyDictionary&lt;string, string&gt;)</value>
     </data>
   <data name="DCL201_202_Fix_OptionTypeToDouble" xml:space="preserve">
-        <value>命令行选项：改为小数类型 (double)</value>
-    </data>
+    <value>命令行选项：改为浮点数类型 (double)</value>
+  </data>
   <data name="DCL201_202_Fix_OptionTypeToInt32" xml:space="preserve">
         <value>命令行选项：改为整数类型 (int)</value>
     </data>
@@ -34,8 +34,8 @@
         <value>命令行选项：改为字符串类型 (string)</value>
     </data>
   <data name="DCL202_Description" xml:space="preserve">
-        <value>作为命令行选项，此属性的类型 {0} 不被内置支持。 建议使用 bool / string / IList&lt;string&gt; 或代码修复会建议您更改的其他类型，或者在 Value / Option 特性上添加自定义转换器。</value>
-    </data>
+    <value>作为命令行选项，此属性的类型 {0} 不被内置支持。 建议使用 bool / string / IReadOnlyList&lt;string&gt; 或代码修复会建议您更改的其他类型，或者在 Value / Option 特性上添加自定义转换器。</value>
+  </data>
   <data name="DCL202_Message" xml:space="preserve">
         <value>作为命令行选项，此属性的类型 {0} 不被内置支持。</value>
     </data>

src/DotNetCampus.CommandLine.Analyzer/Properties/Localizations.zh-hans-cn.resx

@@ -28,8 +28,13 @@ public static bool IsAttributeOf<TAttribute>(this AttributeSyntax attribute)
 
     public static bool IsAttributeOf<TAttribute>(this INamedTypeSymbol attribute)
     {
+        if (attribute.ContainingNamespace.ToString() != typeof(TAttribute).Namespace)
+        {
+            return false;
+        }
+
         var compareName = typeof(TAttribute).Name;
-        if (attribute.Name == compareName)
+        if (attribute.Name == typeof(TAttribute).Name)
         {
             return true;
         }

src/DotNetCampus.CommandLine.Analyzer/Utils/CodeAnalysis/AttributeExtensions.cs

@@ -413,7 +413,7 @@ public override string ToString()
     {
         return MatchedUrlScheme is { } scheme
             ? $"{scheme}://{string.Join("/", PositionalArguments)}?{string.Join("&", LongOptionValues.Select(x => $"{x.Key}={string.Join("&", x.Value)}"))}"
-            : string.Join(" ", CommandLineArguments);
+            : string.Join(" ", CommandLineArguments.Select(x => x.Contains(' ') ? $"\"{x}\"" : x));
     }
 }
 

src/DotNetCampus.CommandLine/CommandLine.cs

@@ -5,38 +5,38 @@ namespace DotNetCampus.Cli;
 /// <summary>
 /// 在解析命令行参数时，指定命令行参数的解析方式。
 /// </summary>
-public record CommandLineParsingOptions
+public readonly record struct CommandLineParsingOptions()
 {
     /// <inheritdoc cref="CommandLineStyle.Flexible" />
-    public static CommandLineParsingOptions Flexible { get; } = new CommandLineParsingOptions
+    public static CommandLineParsingOptions Flexible => new CommandLineParsingOptions
     {
         Style = CommandLineStyle.Flexible,
         CaseSensitive = false,
     };
 
     /// <inheritdoc cref="CommandLineStyle.GNU" />
-    public static CommandLineParsingOptions GNU { get; } = new CommandLineParsingOptions
+    public static CommandLineParsingOptions GNU => new CommandLineParsingOptions
     {
         Style = CommandLineStyle.GNU,
         CaseSensitive = true,
     };
 
     /// <inheritdoc cref="CommandLineStyle.POSIX" />
-    public static CommandLineParsingOptions POSIX { get; } = new CommandLineParsingOptions
+    public static CommandLineParsingOptions POSIX => new CommandLineParsingOptions
     {
         Style = CommandLineStyle.POSIX,
         CaseSensitive = true,
     };
 
     /// <inheritdoc cref="CommandLineStyle.DotNet" />
-    public static CommandLineParsingOptions DotNet { get; } = new CommandLineParsingOptions
+    public static CommandLineParsingOptions DotNet => new CommandLineParsingOptions
     {
         Style = CommandLineStyle.DotNet,
         CaseSensitive = false,
     };
 
     /// <inheritdoc cref="CommandLineStyle.PowerShell" />
-    public static CommandLineParsingOptions PowerShell { get; } = new CommandLineParsingOptions
+    public static CommandLineParsingOptions PowerShell => new CommandLineParsingOptions
     {
         Style = CommandLineStyle.PowerShell,
         CaseSensitive = false,

src/DotNetCampus.CommandLine/CommandLineParsingOptions.cs

@@ -14,7 +14,7 @@ public class CommandRunner : ICommandRunnerBuilder, IAsyncCommandRunnerBuilder
 
     private readonly CommandLine _commandLine;
     private readonly DictionaryCommandHandlerCollection _dictionaryVerbHandlers = new();
-    private readonly List<ICommandHandlerCollection> _assemblyVerbHandlers = [];
+    private readonly ConcurrentDictionary<ICommandHandlerCollection, ICommandHandlerCollection> _assemblyVerbHandlers = [];
 
     internal CommandRunner(CommandLine commandLine)
     {
@@ -97,7 +97,8 @@ internal CommandRunner AddHandler<T>(Func<T, Task<int>> handler)
     internal CommandRunner AddHandlers<T>()
         where T : ICommandHandlerCollection, new()
     {
-        _assemblyVerbHandlers.Add(new T());
+        var c = new T();
+        _assemblyVerbHandlers.TryAdd(c, c);
         return this;
     }
 
@@ -114,7 +115,7 @@ internal CommandRunner AddHandlers<T>()
         // 其次寻找程序集中自动搜集到的处理器。
         foreach (var handler in _assemblyVerbHandlers)
         {
-            if (handler.TryMatch(verbName, _commandLine) is { } h2)
+            if (handler.Value.TryMatch(verbName, _commandLine) is { } h2)
             {
                 return h2;
             }
@@ -127,7 +128,7 @@ internal CommandRunner AddHandlers<T>()
         }
         foreach (var handler in _assemblyVerbHandlers)
         {
-            if (handler.TryMatch(null, _commandLine) is { } h4)
+            if (handler.Value.TryMatch(null, _commandLine) is { } h4)
             {
                 return h4;
             }

src/DotNetCampus.CommandLine/CommandRunner.cs

@@ -14,6 +14,13 @@
     <InternalsVisibleTo Include="DotNetCampus.CommandLine.Tests" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <Target Name="_IncludeAllDependencies" BeforeTargets="_GetPackageFiles">
     <ItemGroup>
       <None Include="$(RepositoryRoot)README.md" Pack="true" PackagePath="\" />

src/DotNetCampus.CommandLine/DotNetCampus.CommandLine.csproj

@@ -82,13 +82,13 @@ internal static bool ArgumentStringsToBoolean(ImmutableArray<string>? arguments)
         }
     }
 
-    internal static T ArgumentStringsToEnum<T>(ImmutableArray<string>? arguments) where T : unmanaged, Enum => arguments switch
+    private static T? ArgumentStringsToValue<T>(ImmutableArray<string>? arguments) where T : IParsable<T> => arguments switch
     {
         null or { Length: 0 } => default,
-        { } values => Enum.TryParse<T>(values[0], true, out var result)
+        { } values => T.TryParse(values[0], null, out var result)
             ? result
             : throw new CommandLineParseValueException(
-                $"Value [{values[0]}] is not a valid enum value for type {typeof(T).Name}."),
+                $"Value [{values[0]}] is not a valid value for type {typeof(T).Name}."),
     };
 
     internal static byte ArgumentStringsToByte(ImmutableArray<string>? arguments) => arguments switch

src/DotNetCampus.CommandLine/Utils/CommandLineValueConverter.cs

@@ -1,11 +1,12 @@
+using System.Collections.Concurrent;
 using DotNetCampus.Cli.Compiler;
 
 namespace DotNetCampus.Cli.Utils.Handlers;
 
 internal sealed class DictionaryCommandHandlerCollection : ICommandHandlerCollection
 {
     private Func<CommandLine, ICommandHandler>? _defaultHandlerCreator;
-    private readonly Dictionary<string, Func<CommandLine, ICommandHandler>> _verbHandlers = [];
+    private readonly ConcurrentDictionary<string, Func<CommandLine, ICommandHandler>> _verbHandlers = [];
 
     public void AddHandler(string? verbName, Func<CommandLine, ICommandHandler> handlerCreator)
     {
@@ -19,7 +20,10 @@ public void AddHandler(string? verbName, Func<CommandLine, ICommandHandler> hand
         }
         else
         {
-            _verbHandlers[verbName] = handlerCreator;
+            if (!_verbHandlers.TryAdd(verbName, handlerCreator))
+            {
+                throw new InvalidOperationException($"Duplicate handler with verb {verbName}. Existed: {_verbHandlers}, new: {handlerCreator}");
+            }
         }
     }