diff options
| author | Marius Ungureanu <marius.ungureanu@xamarin.com> | 2019-06-26 19:10:03 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-26 19:10:03 +0300 |
| commit | 7e5eecf24b6ada9d49b721a6939c4ec5f1f70a81 (patch) | |
| tree | c655fc61e60943296b986886e2019ef1a15b8761 /main/src/core/MonoDevelop.Ide | |
| parent | ab0e4891d1826a2654453a12405fc9694f4ef19a (diff) | |
| parent | cdcf52bea46f2bbeccc3f00d3a99a357414951f6 (diff) | |
Merge pull request #8003 from mono/master-vsts936228
Fixes VSTS Bug 936228: Exact match and regex match mimetypes no longer
Diffstat (limited to 'main/src/core/MonoDevelop.Ide')
| -rw-r--r-- | main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/FileNameEvalutor.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/FileNameEvalutor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/FileNameEvalutor.cs index f7e7a70fae..ec5d3deaee 100644 --- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/FileNameEvalutor.cs +++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Extensions/FileNameEvalutor.cs @@ -54,6 +54,16 @@ namespace MonoDevelop.Ide.Extensions public abstract bool SupportsFile (string fileName); + static string SafeGetFileName (string fileName) + { + try { + return System.IO.Path.GetFileName (fileName); + } catch (Exception e) { + LoggingService.LogInternalError (e); + return fileName; + } + } + class RegexFileNameEvaluator : FileNameEvalutor { Regex regex; @@ -81,7 +91,7 @@ namespace MonoDevelop.Ide.Extensions public override bool SupportsFile (string fileName) { - return regex.IsMatch (fileName); + return regex.IsMatch (SafeGetFileName (fileName)); } } @@ -133,6 +143,7 @@ namespace MonoDevelop.Ide.Extensions public override bool SupportsFile (string fileName) { + fileName = SafeGetFileName (fileName); foreach (var name in names) if (name.Equals (fileName, StringComparison.OrdinalIgnoreCase)) return true; |