crackerjack 0.20.12__py3-none-any.whl → 0.20.13__py3-none-any.whl

crackerjack/crackerjack.py

@@ -118,7 +118,10 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
                     i += 1
                 elif char == "#" and in_string is None:
                     comment = line[i:].strip()
-                    if re.match("^#\\s*(?:type:\\s*ignore|noqa)\\b", comment):
+                    if re.match(
+                        "^#\\s*(?:type:\\s*ignore|noqa|nosec|pragma:\\s*no\\s*cover|pylint:\\s*disable|mypy:\\s*ignore)",
+                        comment,
+                    ):
                         result.append(line[i:])
                         break
                     break
@@ -133,11 +136,55 @@ class CodeCleaner(BaseModel, arbitrary_types_allowed=True):
     def remove_extra_whitespace(self, code: str) -> str:
         lines = code.split("\n")
         cleaned_lines = []
+        in_function = False
+        function_indent = 0
         for i, line in enumerate(lines):
             line = line.rstrip()
-            if i > 0 and (not line) and (not cleaned_lines[-1]):
-                continue
+            stripped_line = line.lstrip()
+            if stripped_line.startswith(("def ", "async def ")):
+                in_function = True
+                function_indent = len(line) - len(stripped_line)
+            elif (
+                in_function
+                and line
+                and (len(line) - len(stripped_line) <= function_indent)
+                and (not stripped_line.startswith(("@", "#")))
+            ):
+                in_function = False
+                function_indent = 0
+            if not line:
+                if i > 0 and cleaned_lines and (not cleaned_lines[-1]):
+                    continue
+                if in_function:
+                    next_line_idx = i + 1
+                    if next_line_idx < len(lines):
+                        next_line = lines[next_line_idx].strip()
+                        if not (
+                            next_line.startswith(
+                                ("return", "class ", "def ", "async def ", "@")
+                            )
+                            or next_line in ("pass", "break", "continue", "raise")
+                            or (
+                                next_line.startswith("#")
+                                and any(
+                                    (
+                                        pattern in next_line
+                                        for pattern in (
+                                            "type:",
+                                            "noqa",
+                                            "nosec",
+                                            "pragma:",
+                                            "pylint:",
+                                            "mypy:",
+                                        )
+                                    )
+                                )
+                            )
+                        ):
+                            continue
             cleaned_lines.append(line)
+        while cleaned_lines and (not cleaned_lines[-1]):
+            cleaned_lines.pop()
         return "\n".join(cleaned_lines)
 
     def reformat_code(self, code: str) -> str:

crackerjack/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "pdm-backend" ]
 
 [project]
 name = "crackerjack"
-version = "0.20.11"
+version = "0.20.12"
 description = "Crackerjack: code quality toolkit"
 readme = "README.md"
 keywords = [

{crackerjack-0.20.12.dist-info → crackerjack-0.20.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: crackerjack
-Version: 0.20.12
+Version: 0.20.13
 Summary: Crackerjack: code quality toolkit
 Keywords: bandit,black,creosote,mypy,pyright,pytest,refurb,ruff
 Author-Email: lesleslie <les@wedgwoodwebworks.com>

{crackerjack-0.20.12.dist-info → crackerjack-0.20.13.dist-info}/RECORD

@@ -1,7 +1,7 @@
-crackerjack-0.20.12.dist-info/METADATA,sha256=gHRTrYvhEZ-nyYUTBBzSGYBasArLg-yhj_5Wg1y1T3U,26384
-crackerjack-0.20.12.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-crackerjack-0.20.12.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-crackerjack-0.20.12.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
+crackerjack-0.20.13.dist-info/METADATA,sha256=3KcyynnFmWmncj4aGPVu5kFy5wnnPMYVf7aCyTrsOoc,26384
+crackerjack-0.20.13.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+crackerjack-0.20.13.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+crackerjack-0.20.13.dist-info/licenses/LICENSE,sha256=fDt371P6_6sCu7RyqiZH_AhT1LdN3sN1zjBtqEhDYCk,1531
 crackerjack/.gitignore,sha256=4DYG7ZoVEHR5Tv1gQliRWmsNku5Fw2_k756cG_t12Cg,185
 crackerjack/.libcst.codemod.yaml,sha256=a8DlErRAIPV1nE6QlyXPAzTOgkB24_spl2E9hphuf5s,772
 crackerjack/.pdm.toml,sha256=dZe44HRcuxxCFESGG8SZIjmc-cGzSoyK3Hs6t4NYA8w,23
@@ -23,7 +23,7 @@ crackerjack/.ruff_cache/0.11.12/16869036553936192448,sha256=pYYUCDrYh7fPq8xkFLxv
 crackerjack/.ruff_cache/0.11.12/1867267426380906393,sha256=2w4M0Lrjd9flwuq6uJxehTbm7FVUcK5sL2sz1gS2Yvo,256
 crackerjack/.ruff_cache/0.11.12/4240757255861806333,sha256=uph5uIRG-XnF7ywAEcCxqqgIkWALPCvJFcwCgnNfTI4,77
 crackerjack/.ruff_cache/0.11.12/4441409093023629623,sha256=eHrESew3XCFJ2WqmKvtGLO1r4mY5Q_mv7yGlDmM1sSc,153
-crackerjack/.ruff_cache/0.11.13/1867267426380906393,sha256=s4evVvK3xEUHREBY0I3-8s4RjvYjIkcpb59IL8BuT6s,256
+crackerjack/.ruff_cache/0.11.13/1867267426380906393,sha256=KmwKiZGTVUDcLqqzw2kSoqlT6ABtaGbSBFLbNLO_MHw,256
 crackerjack/.ruff_cache/0.11.13/4240757255861806333,sha256=l35TwAYyTusgJgyePvfP4_CCllPs1sWapEiLFZw8chQ,83
 crackerjack/.ruff_cache/0.11.2/4070660268492669020,sha256=FTRTUmvj6nZw_QQBp_WHI-h3_iqRejzL39api-9wTvs,224
 crackerjack/.ruff_cache/0.11.3/9818742842212983150,sha256=U-4mT__a-OljovvAJvv5M6X7TCMa3dReLXx3kTNGgwU,224
@@ -61,9 +61,9 @@ crackerjack/.ruff_cache/0.9.9/8843823720003377982,sha256=e4ymkXfQsUg5e_mtO34xTsa
 crackerjack/.ruff_cache/CACHEDIR.TAG,sha256=WVMVbX4MVkpCclExbq8m-IcOZIOuIZf5FrYw5Pk-Ma4,43
 crackerjack/__init__.py,sha256=LyIPEfjBcqWp7UVuJ-b7cc8oiFxrQqyL8RJ7g6c17Qs,838
 crackerjack/__main__.py,sha256=g-vag4kDCPjbY_ik6l6Qqc5ZRVuKGN4ofVA5x3syfFI,6733
-crackerjack/crackerjack.py,sha256=uArlzm_sC9cuXz1upnta5YZnFVXWj7hu1J9PXi_rP7U,23772
+crackerjack/crackerjack.py,sha256=nwsAFZwTfc4zmdMUeuhFzF7QXY0U2pC60XC5LaimiXY,25869
 crackerjack/errors.py,sha256=xvXO3bk0VrxQz0lysIuVOju6SxxDgf04Wne1BedLFB8,4061
 crackerjack/interactive.py,sha256=hNYhsLkdy956AUQ10_21pE_ZBqfV81iKK9i2EKVSY9Q,15332
 crackerjack/py313.py,sha256=o6ywqlRANq4I_IESPMuaOU_IEQDOBiHkApFu1klvbZ4,5892
-crackerjack/pyproject.toml,sha256=cMeV6-v679ePioqhGbLdIamKqsNw7fa5cwRsq3KBlSs,4880
-crackerjack-0.20.12.dist-info/RECORD,,
+crackerjack/pyproject.toml,sha256=szylSeogkB0mlSeToFr84pk-hY_XdtgOoizGhW672V4,4880
+crackerjack-0.20.13.dist-info/RECORD,,