Remove help description from all non-help-related models

DoctorKrolic · Mar 9, 2024 · 2fa5aed · 2fa5aed
1 parent 2454dca
commit 2fa5aed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/src/ArgumentParsing.Generators/ArgumentParserGenerator.Extract.cs b/src/ArgumentParsing.Generators/ArgumentParserGenerator.Extract.cs
@@ -124,6 +124,7 @@ private static (OptionsInfo? OptionsInfo, OptionsHelpInfo? OptionsHelpInfo, Immu
         var seenLongNames = new HashSet<string>();
 
         var parameterMap = new Dictionary<int, ParameterInfo>();
+        var parameterHelpDescriptionsMap = new Dictionary<ParameterInfo, string?>();
         var parametersProperties = new Dictionary<ParameterInfo, IPropertySymbol>();
         var firstIndexWithNoError = new Dictionary<int, IPropertySymbol>();
 
@@ -328,8 +329,7 @@ private static (OptionsInfo? OptionsInfo, OptionsHelpInfo? OptionsHelpInfo, Immu
                     parseStrategy,
                     isRequired,
                     nullableUnderlyingType,
-                    sequenceType,
-                    helpDescription));
+                    sequenceType));
 
                 optionsHelpBuilder.Add(new(
                     shortName,
@@ -396,10 +396,10 @@ private static (OptionsInfo? OptionsInfo, OptionsHelpInfo? OptionsHelpInfo, Immu
                         propertyType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
                         parseStrategy,
                         isRequired,
-                        nullableUnderlyingType,
-                        helpDescription);
+                        nullableUnderlyingType);
 
                     parameterMap.Add(parameterIndex, parameterInfo);
+                    parameterHelpDescriptionsMap.Add(parameterInfo, helpDescription);
                     parametersProperties.Add(parameterInfo, property);
                 }
             }
@@ -444,8 +444,7 @@ private static (OptionsInfo? OptionsInfo, OptionsHelpInfo? OptionsHelpInfo, Immu
                     propertyName,
                     sequenceUnderlyingType!,
                     parseStrategy,
-                    sequenceType,
-                    helpDescription);
+                    sequenceType);
 
                 remainingParametersHelpInfo = new(helpDescription);
             }
@@ -475,7 +474,7 @@ private static (OptionsInfo? OptionsInfo, OptionsHelpInfo? OptionsHelpInfo, Immu
 
             var parameterInfo = pair.Value;
             parametersBuilder.Add(parameterInfo);
-            parametersHelpBuilder.Add(new(parameterInfo.Name, parameterInfo.IsRequired, parameterInfo.HelpDescription));
+            parametersHelpBuilder.Add(new(parameterInfo.Name, parameterInfo.IsRequired, parameterHelpDescriptionsMap[parameterInfo]));
             lastSeenIndex = index;
         }
 

diff --git a/src/ArgumentParsing.Generators/Models/OptionInfo.cs b/src/ArgumentParsing.Generators/Models/OptionInfo.cs
@@ -8,5 +8,4 @@ internal sealed record OptionInfo(
     ParseStrategy ParseStrategy,
     bool IsRequired,
     string? NullableUnderlyingType,
-    SequenceType SequenceType,
-    string? HelpDescription);
+    SequenceType SequenceType);
diff --git a/src/ArgumentParsing.Generators/Models/ParameterInfo.cs b/src/ArgumentParsing.Generators/Models/ParameterInfo.cs
@@ -6,5 +6,4 @@ internal sealed record ParameterInfo(
     string Type,
     ParseStrategy ParseStrategy,
     bool IsRequired,
-    string? NullableUnderlyingType,
-    string? HelpDescription);
+    string? NullableUnderlyingType);
diff --git a/src/ArgumentParsing.Generators/Models/RemainingParametersInfo.cs b/src/ArgumentParsing.Generators/Models/RemainingParametersInfo.cs
@@ -4,5 +4,4 @@ internal sealed record RemainingParametersInfo(
     string PropertyName,
     string Type,
     ParseStrategy ParseStrategy,
-    SequenceType SequenceType,
-    string? HelpDescription);
+    SequenceType SequenceType);