Fix extmatch negation case (#219)

Fixes #218
facelessuser · May 15, 2024 · dd0b3c2 · dd0b3c2
1 parent df834c7
commit dd0b3c2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/docs/src/markdown/about/changelog.md b/docs/src/markdown/about/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 8.5.2
+
+-   **FIX**: Fix `pathlib` issue with inheritance on Python versions greater than 3.12.
+-   **FIX**: Fix `EXTMATCH` case with `!(...)` patterns.
+
 ## 8.5.1
 
 -   **FIX**: Fix issue with type check failure in `wcmatch.glob`.

diff --git a/tests/test_fnmatch.py b/tests/test_fnmatch.py
@@ -148,6 +148,10 @@ class TestFnMatch:
         ['!(test)', 'abc', True, fnmatch.D | fnmatch.E],
         ['!(test)', '..', False, fnmatch.D | fnmatch.E],
 
+        # Negation list followed by extended list
+        ['!(2)_@(foo|bar)', '1_foo', True, fnmatch.E],
+        ['!(!(2|3))_@(foo|bar)', '2_foo', True, fnmatch.E],
+
         # POSIX style character classes
         ['[[:alnum:]]bc', 'zbc', True, 0],
         ['[[:alnum:]]bc', '1bc', True, 0],

diff --git a/wcmatch/__meta__.py b/wcmatch/__meta__.py
@@ -194,5 +194,5 @@ def parse_version(ver: str) -> Version:
     return Version(major, minor, micro, release, pre, post, dev)
 
 
-__version_info__ = Version(8, 5, 1, "final")
+__version_info__ = Version(8, 5, 2, "final")
 __version__ = __version_info__._get_canonical()
diff --git a/wcmatch/_wcparse.py b/wcmatch/_wcparse.py
@@ -1435,7 +1435,8 @@ def parse_extend(self, c: str, i: util.StringIter, current: list[str], reset_dot
                         extended.append(self._restrict_extended_slash())
                     extended.append(self.sep)
                 elif c == "|":
-                    self.clean_up_inverse(extended, temp_inv_nest and self.inv_nest)
+                    if self.inv_nest:
+                        self.clean_up_inverse(extended, temp_inv_nest)
                     extended.append(c)
                     if temp_after_start:
                         self.set_start_dir()