Cleanup and give better debug output for exclude patterns in findbugs…

… and errorprone (pantsbuild#4408)
lenucksi · Apr 22, 2017 · c933ccd · c933ccd
1 parent 7889d76
commit c933ccd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/contrib/errorprone/src/python/pants/contrib/errorprone/tasks/errorprone.py b/contrib/errorprone/src/python/pants/contrib/errorprone/tasks/errorprone.py
@@ -58,7 +58,7 @@ def prepare(cls, options, round_manager):
 
   @memoized_property
   def _exclude_patterns(self):
-    return "(" + ")|(".join(self.get_options().exclude_patterns) + ")"
+    return [re.compile(x) for x in set(self.get_options().exclude_patterns or [])]
 
   def _is_errorprone_target(self, target):
     if not target.has_sources(self._JAVA_SOURCE_EXTENSION):
@@ -67,9 +67,11 @@ def _is_errorprone_target(self, target):
     if target.is_synthetic:
       self.context.log.debug('Skipping [{}] because it is a synthetic target'.format(target.address.spec))
       return False
-    if self.get_options().exclude_patterns and re.match(self._exclude_patterns, target.address.spec):
-      self.context.log.debug('Skipping [{}] because it matches exclude pattern'.format(target.address.spec))
-      return False
+    for pattern in self._exclude_patterns:
+      if pattern.search(target.address.spec):
+        self.context.log.debug(
+          "Skipping [{}] because it matches exclude pattern '{}'".format(target.address.spec, pattern.pattern))
+        return False
     return True
 
   @property

diff --git a/contrib/findbugs/src/python/pants/contrib/findbugs/tasks/findbugs.py b/contrib/findbugs/src/python/pants/contrib/findbugs/tasks/findbugs.py
@@ -68,8 +68,7 @@ def register_options(cls, register):
                           ],
                           main=cls._FINDBUGS_MAIN,
                           custom_rules=[
-                            Shader.exclude_package('edu.umd.cs.findbugs',
-                                                   recursive=True),
+                            Shader.exclude_package('edu.umd.cs.findbugs', recursive=True),
                           ])
 
   @classmethod
@@ -83,7 +82,7 @@ def cache_target_dirs(self):
 
   @memoized_property
   def _exclude_patterns(self):
-    return "(" + ")|(".join(self.get_options().exclude_patterns) + ")"
+    return [re.compile(x) for x in set(self.get_options().exclude_patterns or [])]
 
   def _is_findbugs_target(self, target):
     if not isinstance(target, (JavaLibrary, JUnitTests)):
@@ -92,9 +91,11 @@ def _is_findbugs_target(self, target):
     if target.is_synthetic:
       self.context.log.debug('Skipping [{}] because it is a synthetic target'.format(target.address.spec))
       return False
-    if self.get_options().exclude_patterns and re.match(self._exclude_patterns, target.address.spec):
-      self.context.log.debug('Skipping [{}] because it matches exclude pattern'.format(target.address.spec))
-      return False
+    for pattern in self._exclude_patterns:
+      if pattern.search(target.address.spec):
+        self.context.log.debug(
+          "Skipping [{}] because it matches exclude pattern '{}'".format(target.address.spec, pattern.pattern))
+        return False
     return True
 
   def execute(self):