Merge pull request #18 from dawnbeen/master

merge upstream

Author: cacharle

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

@@ -23,7 +23,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["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,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-11]
-        python-version: ["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

@@ -1,7 +1,7 @@
 <p align="center">
   <a style="text-decoration:none" href="https://badge.fury.io/py/c-formatter-42"><img src="https://badge.fury.io/py/c-formatter-42.svg" alt="PyPI version" height="20"></a>
-  <a style="text-decoration:none" href="https://github.com/cacharle/c_formatter_42/actions"><img src="https://github.com/cacharle/c_formatter_42/actions/workflows/python-package.yml/badge.svg" height="20"></a>
-  <a style="text-decoration:none" href="https://github.com/cacharle/c_formatter_42/actions"><img src="https://github.com/cacharle/c_formatter_42/actions/workflows/python-publish.yml/badge.svg" height="20"></a>
+  <a style="text-decoration:none" href="https://github.com/dawnbeen/c_formatter_42/actions"><img src="https://github.com/cacharle/c_formatter_42/actions/workflows/python-package.yml/badge.svg" height="20"></a>
+  <a style="text-decoration:none" href="https://github.com/dawnbeen/c_formatter_42/actions"><img src="https://github.com/cacharle/c_formatter_42/actions/workflows/python-publish.yml/badge.svg" height="20"></a>
   <a style="text-decoration:none" href="https://pypi.org/project/c-formatter-42/"><img src="https://img.shields.io/pypi/pyversions/c-formatter-42" height="20"></a>
 </p>
 
@@ -19,7 +19,7 @@ It's just for convenience.
 
 ## Installation
 
-Requires Python 3.7+ (3.7, 3.8, 3.9, 3.10)
+Requires Python3.7+ (3.8, 3.9, 3.10, 3.11)
 
 ### From PyPI
 

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
+    try:
+        lastline_index = idented[-1][0]
+        if lines[lastline_index + 1] != "":
+            lines.insert(lastline_index + 1, "")
+    except IndexError:
+        pass
+
     return "\n".join(lines)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = c_formatter_42
-version = 0.1.6
+version = 0.2.1
 description = formatting tool complient with 42 school's norm
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -12,6 +12,7 @@ classifiers =
     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

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))

tests/test_run.py

@@ -53,3 +53,18 @@ def test_run_align_break_column_max():
 
 def test_run_func_decl_single_tab_and_global_aligned():
     pass
+
+
+def test_basic():
+    input = """
+int main(int argc, char*argv[]){
+	return 0;
+}
+"""
+    output = """
+int\tmain(int argc, char *argv[])
+{
+	return (0);
+}
+"""
+    assert output == run_all(input)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = 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]