Move methods refactoring 😛

gsscoder · gsscoder · commit bd36969a8b74 · 2015-06-29T12:06:21.000+02:00
diff --git a/src/CommandLine/Core/InstanceBuilder.cs b/src/CommandLine/Core/InstanceBuilder.cs
@@ -78,7 +78,7 @@ public static ParserResult<T> Build<T>(
 
             var missingValueErrors = from token in partitions.Errors
                                      select new MissingValueOptionError(
-                                         NameInfo.FromOptionSpecification(optionSpecs.Single(o => token.Text.MatchName(o.ShortName, o.LongName, nameComparer))));
+                                         NameExtensions.FromOptionSpecification(optionSpecs.Single(o => token.Text.MatchName(o.ShortName, o.LongName, nameComparer))));
 
             var specPropsWithValue = optionSpecProps.Value.Concat(valueSpecProps.Value);
 
diff --git a/src/CommandLine/Core/NameExtensions.cs b/src/CommandLine/Core/NameExtensions.cs
@@ -12,5 +12,23 @@ public static bool MatchName(this string value, string shortName, string longNam
                ? comparer.Equals(value, shortName)
                : comparer.Equals(value, longName);
         }
+
+        public static NameInfo FromOptionSpecification(this OptionSpecification specification)
+        {
+            return new NameInfo(
+                specification.LongName,
+                specification.ShortName);
+        }
+
+        public static NameInfo FromSpecification(this Specification specification)
+        {
+            switch (specification.Tag)
+            {
+                case SpecificationType.Option:
+                    return FromOptionSpecification((OptionSpecification)specification);
+                default:
+                    return NameInfo.EmptyName;
+            }
+        }
     }
 }
diff --git a/src/CommandLine/Core/OptionMapper.cs b/src/CommandLine/Core/OptionMapper.cs
@@ -31,7 +31,7 @@ public static StatePair<
                                                 Maybe.Nothing<Error>()),
                                             Tuple.Create<SpecificationProperty, Maybe<Error>>(
                                                 pt,
-                                                Maybe.Just<Error>(new BadFormatConversionError(NameInfo.FromOptionSpecification((OptionSpecification)pt.Specification))))),
+                                                Maybe.Just<Error>(new BadFormatConversionError(NameExtensions.FromOptionSpecification((OptionSpecification)pt.Specification))))),
                                 Tuple.Create(pt, Maybe.Nothing<Error>()))
                 );
             return StatePair.Create(
diff --git a/src/CommandLine/Core/SpecificationPropertyRules.cs b/src/CommandLine/Core/SpecificationPropertyRules.cs
@@ -35,7 +35,7 @@ private static Func<IEnumerable<SpecificationProperty>, IEnumerable<Error>> Enfo
                     {
                         return options.Select(s =>
                             new MutuallyExclusiveSetError(
-                                NameInfo.FromOptionSpecification((OptionSpecification)s.Specification)));
+                                NameExtensions.FromOptionSpecification((OptionSpecification)s.Specification)));
                     }
                     return Enumerable.Empty<Error>();
                 };
@@ -63,7 +63,7 @@ private static Func<IEnumerable<SpecificationProperty>, IEnumerable<Error>> Enfo
                             && sp.Specification.Required)).ToList();
                     if (requiredButEmpty.Any()) {
                         return requiredButEmpty.Select(s =>new MissingRequiredOptionError(
-                            NameInfo.FromSpecification(s.Specification)));
+                            NameExtensions.FromSpecification(s.Specification)));
                     }
                     return Enumerable.Empty<Error>();
                 };
@@ -84,7 +84,7 @@ private static Func<IEnumerable<SpecificationProperty>, IEnumerable<Error>> Enfo
                     if (options.Any())
                     {
                         return options.Select(s => new SequenceOutOfRangeError(
-                            NameInfo.FromSpecification(s.Specification)));
+                            NameExtensions.FromSpecification(s.Specification)));
                     }
                     return Enumerable.Empty<Error>();
                 };
diff --git a/src/CommandLine/NameInfo.cs b/src/CommandLine/NameInfo.cs
@@ -58,24 +58,6 @@ public string NameText
             }
         }
 
-        internal static NameInfo FromOptionSpecification(OptionSpecification specification)
-        {
-            return new NameInfo(
-                specification.LongName,
-                specification.ShortName);
-        }
-
-        internal static NameInfo FromSpecification(Specification specification)
-        {
-            switch (specification.Tag)
-            {
-                case SpecificationType.Option:
-                    return FromOptionSpecification((OptionSpecification)specification);
-                default:
-                    return EmptyName;
-            }
-        }
-
         /// <summary>
         /// Determines whether the specified <see cref="System.Object"/> is equal to the current <see cref="System.Object"/>.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private static Func<IEnumerable<SpecificationProperty>, IEnumerable<Error>> Enfo`
`35`	`35`	`{`
`36`	`36`	`return options.Select(s =>`
`37`	`37`	`new MutuallyExclusiveSetError(`
`38`		`- NameInfo.FromOptionSpecification((OptionSpecification)s.Specification)));`
	`38`	`+ NameExtensions.FromOptionSpecification((OptionSpecification)s.Specification)));`
`39`	`39`	`}`
`40`	`40`	`return Enumerable.Empty<Error>();`
`41`	`41`	`};`
`@@ -63,7 +63,7 @@ private static Func<IEnumerable<SpecificationProperty>, IEnumerable<Error>> Enfo`
`63`	`63`	`&& sp.Specification.Required)).ToList();`
`64`	`64`	`if (requiredButEmpty.Any()) {`
`65`	`65`	`return requiredButEmpty.Select(s =>new MissingRequiredOptionError(`
`66`		`- NameInfo.FromSpecification(s.Specification)));`
	`66`	`+ NameExtensions.FromSpecification(s.Specification)));`
`67`	`67`	`}`
`68`	`68`	`return Enumerable.Empty<Error>();`
`69`	`69`	`};`
`@@ -84,7 +84,7 @@ private static Func<IEnumerable<SpecificationProperty>, IEnumerable<Error>> Enfo`
`84`	`84`	`if (options.Any())`
`85`	`85`	`{`
`86`	`86`	`return options.Select(s => new SequenceOutOfRangeError(`
`87`		`- NameInfo.FromSpecification(s.Specification)));`
	`87`	`+ NameExtensions.FromSpecification(s.Specification)));`
`88`	`88`	`}`
`89`	`89`	`return Enumerable.Empty<Error>();`
`90`	`90`	`};`