Merge branch 'master' into master

Author: cacharle

.github/workflows/python-package-develop.yml

@@ -25,6 +25,7 @@ jobs:
         os: [ubuntu-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/python-package.yml

@@ -30,6 +30,7 @@ jobs:
         os: [ubuntu-latest, macos-11]
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
+
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}

.gitignore

@@ -5,7 +5,7 @@ tags
 dist/
 build/
 docs/build/
-
+.coverage
 /.venv
 /debug
 /.vimspector.json

c_formatter_42/__main__.py

@@ -12,8 +12,8 @@
 #                                                                              #
 # ############################################################################ #
 
-import sys
 import argparse
+import sys
 
 from c_formatter_42.run import run_all
 
@@ -48,15 +48,15 @@ def main():
                     content = file.read()
                 if args.confirm:
                     result = input(
-                        "Are you sure you want to overwrite {}?[y/N]".format(filepath)
+                        f"Are you sure you want to overwrite {filepath}?[y/N]"
                     )
                     if result != "y":
                         continue
-                print("Writing to {}".format(filepath))
+                print(f"Writing to {filepath}")
                 with open(filepath, "w") as file:
                     file.write(run_all(content))
             except OSError as e:
-                print("Error: {}: {}".format(e.filename, e.strerror))
+                print(f"Error: {e.filename}: {e.strerror}")
 
 
 if __name__ == "__main__":

c_formatter_42/formatters/clang_format.py

@@ -10,17 +10,16 @@
 #                                                                              #
 # ############################################################################ #
 
-import os
-import sys
-import inspect
 import subprocess
+import sys
 from contextlib import contextmanager
+from pathlib import Path
 
 import c_formatter_42.data
 
-CONFIG_FILENAME = ".clang-format"
+CONFIG_FILENAME = Path(".clang-format")
 
-DATA_DIR = os.path.dirname(inspect.getfile(c_formatter_42.data))
+DATA_DIR = Path(c_formatter_42.data.__file__).parent
 
 
 @contextmanager
@@ -29,31 +28,29 @@ def _config_context():
     If there already is a config in the current directory, it's backed up
     then put back in place after clang-format is done running
     """
-    config_path = os.path.join(DATA_DIR, CONFIG_FILENAME)
+    config_path = DATA_DIR / CONFIG_FILENAME
     previous_config = None
     try:
-        os.symlink(config_path, CONFIG_FILENAME)
+        CONFIG_FILENAME.symlink_to(config_path)
     except FileExistsError:
-        if not os.path.islink(CONFIG_FILENAME):
-            with open(CONFIG_FILENAME) as f:
-                previous_config = f.read()
-        os.unlink(CONFIG_FILENAME)
-        os.symlink(config_path, CONFIG_FILENAME)
+        if not CONFIG_FILENAME.is_symlink():
+            previous_config = CONFIG_FILENAME.read_text()
+        CONFIG_FILENAME.unlink()
+        CONFIG_FILENAME.symlink_to(config_path)
     try:
         yield
     finally:
-        os.unlink(CONFIG_FILENAME)
+        CONFIG_FILENAME.unlink()
         if previous_config is not None:
-            with open(CONFIG_FILENAME, "w") as f:
-                f.write(previous_config)
+            CONFIG_FILENAME.write_text(previous_config)
 
 
 if sys.platform == "linux":
-    CLANG_FORMAT_EXEC = os.path.join(DATA_DIR, "clang-format-linux")
+    CLANG_FORMAT_EXEC = DATA_DIR / "clang-format-linux"
 elif sys.platform == "darwin":
-    CLANG_FORMAT_EXEC = os.path.join(DATA_DIR, "clang-format-darwin")
+    CLANG_FORMAT_EXEC = DATA_DIR / "clang-format-darwin"
 elif sys.platform == "win32":
-    CLANG_FORMAT_EXEC = os.path.join(DATA_DIR, "clang-format-win32.exe")
+    CLANG_FORMAT_EXEC = DATA_DIR / "clang-format-win32.exe"
 else:
     raise NotImplementedError("Your platform is not supported")
 
@@ -73,6 +70,6 @@ def clang_format(content: str) -> str:
             stderr=subprocess.PIPE,
         )
         out, err = process.communicate(input=content.encode())
-        if process.returncode != 0:
+        if process.returncode != 0:  # pragma: no cover
             raise RuntimeError(f"clang-format error: {err.decode()}")
         return out.decode()

c_formatter_42/formatters/helper.py

@@ -12,7 +12,6 @@
 
 import re
 
-
 # regex for a type
 REGEX_TYPE = r"(?!return)([a-z]+\s+)*[a-zA-Z_]\w*"
 # regex for a c variable/function name

c_formatter_42/formatters/hoist.py

@@ -55,7 +55,7 @@ def hoist(content: str) -> str:
             line,
         )
         if m is not None:
-            lines.append("\t{}\t{};".format(m.group("type"), m.group("name")))
+            lines.append(f"\t{m.group('type')}\t{m.group('name')};")
             lines.append(
                 "{}{} = {};".format(
                     m.group("indent"),

c_formatter_42/formatters/line_breaker.py

@@ -1,11 +1,11 @@
 import re
+
 from c_formatter_42.formatters import helper
 
 
 def line_breaker(content: str, column_limit: int = 80) -> str:
     lines = content.split("\n")
     lines = [insert_break(line, column_limit) for line in lines]
-
     return "\n".join(lines)
 
 
@@ -36,7 +36,6 @@ def insert_break(line: str, column_limit: int) -> str:
     return line
 
 
-#
 # additional indent level increases in proportion to corresponds paren depth
 #
 # (examples)

c_formatter_42/formatters/misc.py

@@ -16,7 +16,7 @@
 def parenthesize_return(content: str) -> str:
     return re.sub(
         r"return\s+(?!;)(?!\(.*\);)(?P<value>\(?.*?)\s*;",
-        lambda match: "return ({});".format(match.group("value").strip()),
+        lambda match: f"return ({match.group('value').strip()});",
         content,
         re.DOTALL,
     )
@@ -33,14 +33,14 @@ def space_before_semi_colon(content: str) -> str:
 def remove_multiline_condition_space(content: str) -> str:
     return re.sub(
         r"(?P<tabs>\t+) {1,3}(?P<rest>.*)",
-        lambda match: "{}\t{}".format(match.group("tabs"), match.group("rest")),
+        lambda match: f"{match.group('tabs')}\t{match.group('rest')}",
         content,
     )
 
 
 def insert_void(content: str) -> str:
     return re.sub(
         r"(?P<funcdef>[0-9a-zA-Z_]+\t+\**[0-9a-zA-Z_]*\s*)\(\s*\)",
-        lambda match: "{}({})".format(match.group("funcdef"), "void"),
+        lambda match: f"{match.group('funcdef')}(void)",
         content,
     )

c_formatter_42/run.py

@@ -10,18 +10,18 @@
 #                                                                              #
 # ############################################################################ #
 
+from c_formatter_42.formatters.align import align
 from c_formatter_42.formatters.clang_format import clang_format
 from c_formatter_42.formatters.hoist import hoist
-from c_formatter_42.formatters.align import align
-from c_formatter_42.formatters.preprocessor_directive import preprocessor_directive
-from c_formatter_42.formatters.return_type_single_tab import return_type_single_tab
+from c_formatter_42.formatters.line_breaker import line_breaker
 from c_formatter_42.formatters.misc import (
+    insert_void,
     parenthesize_return,
-    space_before_semi_colon,
     remove_multiline_condition_space,
-    insert_void,
+    space_before_semi_colon,
 )
-from c_formatter_42.formatters.line_breaker import line_breaker
+from c_formatter_42.formatters.preprocessor_directive import preprocessor_directive
+from c_formatter_42.formatters.return_type_single_tab import return_type_single_tab
 
 
 def run_all(content: str) -> str: