complete filter expression evaluation

coverlet-coverage · May 13, 2018 · 9d09fde · 9d09fde
1 parent 1dd3b70
commit 9d09fde
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/coverlet.core/Helpers/InstrumentationHelper.cs b/src/coverlet.core/Helpers/InstrumentationHelper.cs
@@ -83,44 +83,49 @@ public static void DeleteHitsFile(string path)
 
         public static bool IsModuleExcluded(string module, string[] filters)
         {
-            if (filters == null || !filters.Any())
+            if (filters == null)
                 return false;
 
-            module = Path.GetFileNameWithoutExtension(module);
             bool isMatch = false;
+            module = Path.GetFileNameWithoutExtension(module);
 
             foreach (var filter in filters)
             {
                 if (!IsValidFilterExpression(filter))
                     continue;
 
-                string pattern = filter.Substring(1, filter.IndexOf(']') - 1);
-                pattern = WildcardToRegex(pattern);
+                string modulePattern = filter.Substring(1, filter.IndexOf(']') - 1);
+                string typePattern = filter.Substring(filter.IndexOf(']') + 1);
 
-                var regex = new Regex(pattern);
-                isMatch = regex.IsMatch(module);
+                modulePattern = WildcardToRegex(modulePattern);
+
+                var regex = new Regex(modulePattern);
+                isMatch = regex.IsMatch(module) && typePattern == "*";
             }
 
             return isMatch;
         }
 
-        public static bool IsTypeExcluded(string type, string[] filters)
+        public static bool IsTypeExcluded(string module, string type, string[] filters)
         {
-            if (filters == null || !filters.Any())
+            if (filters == null)
                 return false;
 
             bool isMatch = false;
+            module = Path.GetFileNameWithoutExtension(module);
 
             foreach (var filter in filters)
             {
                 if (!IsValidFilterExpression(filter))
                     continue;
 
-                string pattern = filter.Substring(filter.IndexOf(']') + 1);
-                pattern = WildcardToRegex(pattern);
+                string typePattern = filter.Substring(filter.IndexOf(']') + 1);
+                string modulePattern = filter.Substring(1, filter.IndexOf(']') - 1);
 
-                var regex = new Regex(pattern);
-                isMatch = regex.IsMatch(type);
+                typePattern = WildcardToRegex(typePattern);
+                modulePattern = WildcardToRegex(modulePattern);
+
+                isMatch = new Regex(typePattern).IsMatch(type) && new Regex(modulePattern).IsMatch(module);
             }
 
             return isMatch;
@@ -206,7 +211,10 @@ private static bool IsValidFilterExpression(string filter)
             if (filter.IndexOf(']') - filter.IndexOf('[') == 1)
                 return false;
 
-            if (new Regex(@"[^\w*]").IsMatch(filter.Replace("[", "").Replace("]", "")))
+            if (filter.EndsWith("]"))
+                return false;
+
+            if (new Regex(@"[^\w*]").IsMatch(filter.Replace(".", "").Replace("[", "").Replace("]", "")))
                 return false;
 
             return true;

diff --git a/src/coverlet.core/Instrumentation/Instrumenter.cs b/src/coverlet.core/Instrumentation/Instrumenter.cs
@@ -75,7 +75,7 @@ private void InstrumentModule()
         private void InstrumentType(TypeDefinition type)
         {
             if (type.CustomAttributes.Any(IsExcludeAttribute)
-                && InstrumentationHelper.IsTypeExcluded(type.FullName, _filters))
+                || InstrumentationHelper.IsTypeExcluded(_module, type.FullName, _filters))
                 return;
 
             foreach (var method in type.Methods)