Skip to content

Fix the issue Wildcard matching should be used in help file search #3971

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
lzybkr merged 1 commit into from
Jun 12, 2017
Merged

Fix the issue Wildcard matching should be used in help file search #3971

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 9 additions & 8 deletions src/System.Management.Automation/help/MUIFileSearcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ private string[] GetFiles(string path, string pattern)
ArrayList result = new ArrayList();
string[] files = Directory.GetFiles(path);

string regexPattern = pattern.Replace(".", @"\.");
regexPattern = regexPattern.Replace("*", ".*");
regexPattern = regexPattern.Replace("?", ".?");
var wildcardPattern = WildcardPattern.ContainsWildcardCharacters(pattern)
? WildcardPattern.Get(pattern, WildcardOptions.IgnoreCase)
: null;

foreach (string filePath in files)
{
Expand All @@ -133,11 +133,12 @@ private string[] GetFiles(string path, string pattern)
result.Add(filePath);
break;
}
// If the input is pattern instead of string, we need to use Regex expression.
if (pattern.Contains("*") || pattern.Contains("?"))
{
if (Regex.IsMatch(filePath, regexPattern))
{

if (wildcardPattern != null)
{
string fileName = Path.GetFileName(filePath);
if (wildcardPattern.IsMatch(fileName))
{
result.Add(filePath);
}
}
Expand Down