refactor2

Author: neuecc

sandbox/GeneratorSandbox/Program.cs

@@ -8,11 +8,8 @@ public static class Program
 {
     public static void Main(string[] args)
     {
-        var app = ConsoleApp.Create();
-
-        app.Add("", (CancellationToken cancellationToken, ConsoleAppContext ctx) => { });
-
-        app.Run(args, CancellationToken.None);
+        var cmd = new Commands();
+        ConsoleApp.Run(args, cmd.SomeCommand);
 
     }
 }

src/ConsoleAppFramework/Command.cs

@@ -31,6 +31,7 @@ public record class Command
     public required EquatableArray<FilterInfo> Filters { get; init; }
     public IgnoreEquality<ISymbol> Symbol { get; init; }
     public bool HasFilter => Filters.Length != 0;
+    public bool IsRequireDynamicDependencyAttribute { get; set; } // can set...!
 
     // return is delegateType(Name).
     public string? BuildDelegateSignature(string customDelegateTypeName, out string? customDelegateDefinition)
@@ -145,6 +146,23 @@ public string BuildDelegateTypeDefinition(string delegateName)
         var parameters = string.Join(", ", Parameters.Select(x => x.ToString()));
         return $"delegate {retType} {delegateName}({parameters});";
     }
+
+    public string BuildDynamicDependencyAttribute()
+    {
+        if (!IsRequireDynamicDependencyAttribute) return "";
+
+        var dynamicDependencyMethod = Symbol.Value as IMethodSymbol;
+        if (dynamicDependencyMethod == null) return "";
+
+        var docCommentId = dynamicDependencyMethod.GetDocumentationCommentId();
+        var parameterPartIndex = docCommentId?.IndexOf('(') ?? -1;
+        var memberSignature = parameterPartIndex >= 0
+            ? dynamicDependencyMethod.Name + docCommentId!.Substring(parameterPartIndex)
+            : dynamicDependencyMethod.Name;
+
+        var containingType = dynamicDependencyMethod.ContainingType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
+        return $"[global::System.Diagnostics.CodeAnalysis.DynamicDependency(\"{memberSignature}\", typeof({containingType}))]";
+    }
 }
 
 public record class CommandParameter

src/ConsoleAppFramework/Emitter.cs

@@ -46,22 +46,6 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
         var cancellationTokenName = (emitForBuilder) ? "cancellationToken" : null;
         var cancellationTokenParameter = cancellationTokenName != null ? "CancellationToken cancellationToken" : null;
 
-        // TODO: to parser
-        string? dynamicDependencyAttribute = null;
-        if (command.CommandMethodInfo == null &&
-            command.Symbol.Value is IMethodSymbol dynamicDependencyMethod &&
-            dynamicDependencyMethod.ContainingType != null)
-        {
-            var docCommentId = dynamicDependencyMethod.GetDocumentationCommentId();
-            var parameterPartIndex = docCommentId?.IndexOf('(') ?? -1;
-            var memberSignature = parameterPartIndex >= 0
-                ? dynamicDependencyMethod.Name + docCommentId!.Substring(parameterPartIndex)
-                : dynamicDependencyMethod.Name;
-
-            var containingType = dynamicDependencyMethod.ContainingType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-            dynamicDependencyAttribute = $"[global::System.Diagnostics.CodeAnalysis.DynamicDependency(\"{memberSignature}\", typeof({containingType}))]";
-        }
-
         if (!emitForBuilder)
         {
             sb.AppendLine("/// <summary>");
@@ -75,10 +59,9 @@ command.Symbol.Value is IMethodSymbol dynamicDependencyMethod &&
             sb.AppendLine("/// </summary>");
         }
 
-        // method signature
-        if (dynamicDependencyAttribute != null)
+        if (emitForBuilder && command.IsRequireDynamicDependencyAttribute)
         {
-            sb.AppendLine(dynamicDependencyAttribute);
+            sb.AppendLine(command.BuildDynamicDependencyAttribute());
         }
 
         var methodArgument = command.HasFilter

src/ConsoleAppFramework/Parser.cs

@@ -3,6 +3,7 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Collections.Immutable;
 using System.Runtime.InteropServices.ComTypes;
+using System.Security.Cryptography;
 using System.Xml.Linq;
 
 namespace ConsoleAppFramework;
@@ -356,7 +357,12 @@ bool IsParsableType(ITypeSymbol type)
                 var methodSymbols = model.GetMemberGroup(expression);
                 if (methodSymbols.Length > 0 && methodSymbols[0] is IMethodSymbol methodSymbol)
                 {
-                    return ParseFromMethodSymbol(methodSymbol, addressOf: false, commandName, []);
+                    var cmd = ParseFromMethodSymbol(methodSymbol, addressOf: false, commandName, []);
+                    if (cmd != null)
+                    {
+                        cmd.IsRequireDynamicDependencyAttribute = true;
+                    }
+                    return cmd;
                 }
             }
         }
@@ -596,7 +602,8 @@ bool IsParsableType(ITypeSymbol type)
             MethodKind = MethodKind.Lambda,
             Description = "",
             DelegateBuildType = delegateBuildType,
-            Filters = globalFilters
+            Filters = globalFilters,
+            IsRequireDynamicDependencyAttribute = false,
         };
 
         return cmd;