Merge pull request #44 from keyhr/master

Merge updates.

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

@@ -23,7 +23,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/python-package.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-11]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -9,3 +9,5 @@ docs/build/
 /.venv
 /debug
 /.vimspector.json
+
+.vscode

README.md

@@ -19,7 +19,7 @@ It's just for convenience.
 
 ## Installation
 
-Requires Python 3.6+ (3.7, 3.8, 3.9, 3.10)
+Requires Python3.7+ (3.8, 3.9, 3.10, 3.11)
 
 ### From PyPI
 
@@ -54,7 +54,7 @@ positional arguments:
 
 optional arguments:
   -h, --help     show this help message and exit
-  -c, --confirm  Ask confirmation before overwritting any file
+  -c, --confirm  Ask confirmation before overwriting any file
 ```
 
 ## Plugins / Extensions

c_formatter_42/__main__.py

@@ -28,7 +28,7 @@ def main():
         "-c",
         "--confirm",
         action="store_true",
-        help="Ask confirmation before overwritting any file",
+        help="Ask confirmation before overwriting any file",
     )
     arg_parser.add_argument(
         "filepaths",
@@ -52,7 +52,7 @@ def main():
                     )
                     if result != "y":
                         continue
-                print("Writting to {}".format(filepath))
+                print("Writing to {}".format(filepath))
                 with open(filepath, "w") as file:
                     file.write(run_all(content))
             except OSError as e:

c_formatter_42/formatters/preprocessor_directive.py

@@ -33,4 +33,13 @@ def preprocessor_directive(content: str) -> str:
             indent += 1
         if directive_name == "endif":
             indent -= 1
+
+    # if newline doesn't follows preprocessor part, insert one
+    lastline_index = idented[-1][0]
+    try:
+        if lines[lastline_index + 1] != "":
+            lines.insert(lastline_index + 1, "")
+    except IndexError:
+        pass
+
     return "\n".join(lines)

setup.cfg

@@ -8,11 +8,11 @@ url = https://github.com/dawnbeen/c_formatter_42
 project_urls =
     Tracker = https://github.com/dawnbeen/c_formatter_42/issues
 classifiers =
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Programming Language :: C
     Intended Audience :: Developers
     Environment :: Console
@@ -22,7 +22,7 @@ classifiers =
 
 [options]
 packages = find:
-python_requires = >=3.6
+python_requires = >=3.7
 
 [options.package_data]
 * =

tests/formatters/test_preprocessor_directive.py

@@ -217,3 +217,17 @@ def test_preprocessor_directive_nested_10():
 #endif
 """
     assert output == preprocessor_directive(input)
+
+
+def test_preprocessor_1():
+    input = """
+#include "libft.h"
+void *ft_function(char c)
+"""
+    output = """
+#include "libft.h"
+
+void *ft_function(char c)
+"""
+    assert output == preprocessor_directive(input)
+    assert output == preprocessor_directive(preprocessor_directive(input))

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = python3.6,python3.7,python3.8,python3.9,python3.10
+envlist = python3.7,python3.8,python3.9,python3.10,python3.11
 distshare = {env:XDG_CACHE_HOME}/tox/distshare
 
 [testenv]