@@ -728,6 +728,20 @@ internal static CommandInfo LookupCommandInfo(
728
728
searchResolutionOptions , commandTypes , ref lastError ) ;
729
729
}
730
730
731
+ if ( result == null && ! commandName . Contains ( '-' ) && ! commandName . Contains ( '\\ ' ) )
732
+ {
733
+ discoveryTracer . WriteLine (
734
+ "The command [{0}] was not found, trying again with get- prepended" ,
735
+ commandName ) ;
736
+
737
+ try
738
+ {
739
+ result = LookupCommandInfo ( StringLiterals . DefaultCommandVerb + '-' + commandName ,
740
+ commandTypes , searchResolutionOptions , commandOrigin , context ) ;
741
+ }
742
+ catch ( CommandNotFoundException ) { }
743
+ }
744
+
731
745
// Otherwise, invoke the CommandNotFound handler
732
746
result ??= InvokeCommandNotFoundHandler ( commandName , context , originalCommandName , commandOrigin ) ;
733
747
} while ( false ) ;
@@ -902,24 +916,7 @@ private static CommandInfo TryNormalSearch(string commandName,
902
916
903
917
try
904
918
{
905
- if ( ! searcher . MoveNext ( ) )
906
- {
907
- if ( ! commandName . Contains ( '-' ) && ! commandName . Contains ( '\\ ' ) )
908
- {
909
- discoveryTracer . WriteLine (
910
- "The command [{0}] was not found, trying again with get- prepended" ,
911
- commandName ) ;
912
-
913
- commandName = StringLiterals . DefaultCommandVerb + StringLiterals . CommandVerbNounSeparator + commandName ;
914
-
915
- try
916
- {
917
- result = LookupCommandInfo ( commandName , commandTypes , searchResolutionOptions , commandOrigin , context ) ;
918
- }
919
- catch ( CommandNotFoundException ) { }
920
- }
921
- }
922
- else
919
+ if ( searcher . MoveNext ( ) )
923
920
{
924
921
result = ( ( IEnumerator < CommandInfo > ) searcher ) . Current ;
925
922
}
0 commit comments