Skip to content

Refactor complex if statement #14398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anmenaga merged 12 commits into from
Dec 17, 2020
Merged

Refactor complex if statement #14398

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e7a0175
Remove unecessary parenthesis
xtqqczze Dec 11, 2020
a6ec51e
Invert if
xtqqczze Dec 11, 2020
dc74a35
Split into consecutive if statements
xtqqczze Dec 11, 2020
c2f539c
Inline temporary variable
xtqqczze Dec 11, 2020
921ad4a
Split into consecutive if statements
xtqqczze Dec 11, 2020
efddec4
Reorder if statements
xtqqczze Dec 11, 2020
7313e4e
Hoist loop-invariant code
xtqqczze Dec 11, 2020
df55e4d
Move iteration variable to left-hand side of expressions
xtqqczze Dec 11, 2020
8643969
Merge with previous if statement
xtqqczze Dec 11, 2020
a495496
Reformat
xtqqczze Dec 11, 2020
27191f4
Invert if
xtqqczze Dec 11, 2020
89fd067
Use pattern matching
xtqqczze Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 24 additions & 15 deletions src/System.Management.Automation/engine/GetCommandCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,22 +1489,31 @@ private IEnumerable<CommandInfo> GetMatchingCommandsFromModules(string commandNa
private bool IsCommandInResult(CommandInfo command)
{
bool isPresent = false;
bool commandHasModule = command.Module != null;
foreach (CommandInfo commandInfo in _accumulatedResults)
{
if ((command.CommandType == commandInfo.CommandType &&
(string.Equals(command.Name, commandInfo.Name, StringComparison.OrdinalIgnoreCase) ||
// If the command has been imported with a prefix, then just checking the names for duplication will not be enough.
// Hence, an additional check is done with the prefix information
string.Equals(ModuleCmdletBase.RemovePrefixFromCommandName(commandInfo.Name, commandInfo.Prefix), command.Name, StringComparison.OrdinalIgnoreCase))
) && commandInfo.Module != null && commandHasModule &&
( // We do reference equal comparison if both command are imported. If either one is not imported, we compare the module path
(commandInfo.IsImported && command.IsImported && commandInfo.Module.Equals(command.Module)) ||
((!commandInfo.IsImported || !command.IsImported) && commandInfo.Module.Path.Equals(command.Module.Path, StringComparison.OrdinalIgnoreCase))
))

if (command.Module is not null)
{
foreach (CommandInfo commandInfo in _accumulatedResults)
{
isPresent = true;
break;
if (commandInfo.Module is null || commandInfo.CommandType != command.CommandType)
{
continue;
}

// We do reference equal comparison if both command are imported. If either one is not imported, we compare the module path
if ((!commandInfo.IsImported || !command.IsImported || !commandInfo.Module.Equals(command.Module))
&& ((commandInfo.IsImported && command.IsImported) || !commandInfo.Module.Path.Equals(command.Module.Path, StringComparison.OrdinalIgnoreCase)))
{
continue;
}

// If the command has been imported with a prefix, then just checking the names for duplication will not be enough.
// Hence, an additional check is done with the prefix information
if (commandInfo.Name.Equals(command.Name, StringComparison.OrdinalIgnoreCase)
|| ModuleCmdletBase.RemovePrefixFromCommandName(commandInfo.Name, commandInfo.Prefix).Equals(command.Name, StringComparison.OrdinalIgnoreCase))
{
isPresent = true;
break;
}
}
}

Expand Down