simplify ClangTidy.merge_clang_tidy_checks (#142)

Fixes #125

Co-authored-by: Luc Grosheintz <[email protected]>

Author: tristan0x

cpp/lib.py

@@ -867,35 +867,26 @@ def merge_clang_tidy_checks(cls, orig_checks, new_checks):
         """Merge 2 'Checks' ClangTidy configuration key values"""
         if orig_checks is None:
             return new_checks
+        if new_checks is None:
+            return orig_checks
         orig_checks = [check.strip() for check in orig_checks.split(",")]
         new_checks = [check.strip() for check in new_checks.split(",")]
 
         for new_check in new_checks:
-            if new_check.startswith("-"):
-                name = new_check[1:]
-                # remove check when check=google-runtime-references to_=-google-*
-                orig_checks = list(
-                    check for check in orig_checks if not fnmatch(check, name)
-                )
-                # remove check when check=-google-runtime-references
-                # to_=-google-* (simplification)
-                orig_checks = list(
-                    check for check in orig_checks if not fnmatch(check, new_check)
-                )
-            else:
-                # remove check when check=-google-runtime-references to_=google-*
-                orig_checks = list(
-                    check
-                    for check in orig_checks
-                    if not fnmatch(check, "-" + new_check)
-                )
-                # remove check when check=google-runtime-references
-                # to_=google-* (simplification)
-                orig_checks = list(
-                    check for check in orig_checks if not fnmatch(check, new_check)
-                )
+            name_without_prefix = (
+                new_check[1:] if new_check.startswith("-") else new_check
+            )
+            name_with_prefix = "-" + name_without_prefix
+            orig_checks = list(
+                check for check in orig_checks if not fnmatch(check, name_with_prefix)
+            )
+            orig_checks = list(
+                check
+                for check in orig_checks
+                if not fnmatch(check, name_without_prefix)
+            )
             orig_checks.append(new_check)
-        return ",".join(orig_checks)
+        return ",".join(c for c in orig_checks if c)
 
 
 class TaskDescription(

dev/test_lib.py

@@ -9,6 +9,27 @@
 import cpp.lib  # noqa: E402
 
 
+def test_clang_tidy_conf_merger():
+    orig_checks = "foo-*,bar-pika,-bar-foo"
+    test_func = cpp.lib.ClangTidy.merge_clang_tidy_checks
+
+    assert test_func(orig_checks, None) == orig_checks
+    assert test_func(orig_checks, "") == orig_checks
+    assert test_func(orig_checks, "-bar-pika") == "foo-*,-bar-foo,-bar-pika"
+    assert test_func(orig_checks, "bar-pika") == "foo-*,-bar-foo,bar-pika"
+    assert test_func(orig_checks, "-bar-*") == "foo-*,-bar-*"
+    assert test_func(orig_checks, "bar-*") == "foo-*,bar-*"
+    assert test_func(orig_checks, "-bar-*") == "foo-*,-bar-*"
+    assert test_func(orig_checks, "-bar-foo") == "foo-*,bar-pika,-bar-foo"
+    assert test_func(orig_checks, "bar-foo") == "foo-*,bar-pika,bar-foo"
+
+    assert test_func("bar-foo", "-bar-*") == "-bar-*"
+
+    assert test_func("", "-bar-pika") == "-bar-pika"
+    assert test_func("", "bar-foo") == "bar-foo"
+    assert test_func(None, None) is None
+
+
 def test_where():
     """Test cpp.lib.where function"""
     with tempfile.TemporaryDirectory() as bin_dir: