Merge pull request #14 from keyhr/master

Fixed line break inserter

Author: keyhr

c_formatter_42/formatters/line_breaker.py

@@ -13,8 +13,9 @@ def insert_break(line: str, column_limit: int) -> str:
     if line_length(line) <= column_limit:
         return line
 
-    # break at all breakable spaces (space after comma or space before binary operators)
-    breakable_space_pattern = r"((?<=,) | (?=[+\-*/%])(?!\*+\S|\+\+|\-\-))"
+    # break at all breakable spaces (space after comma or space before binary
+    # operators or logical AND or OR)
+    breakable_space_pattern = r"((?<=,) | (?=[+\-*/%]|\|\||&&)(?!\*+\S|\+\+|\-\-))"
     line = re.sub(breakable_space_pattern, "\n", line)
     segments = line.split("\n")
 
@@ -54,7 +55,8 @@ def insert_break(line: str, column_limit: int) -> str:
 def additional_indent_level(s: str) -> int:
     additional_indent_level = 1
 
-    discount_pattern = r"(^\t*{type}\t+.*?[a-zA-Z0-9_]\()|(^\t*typedef)|(^\t*(if|while))"
+    discount_pattern = r"(^\t*{type}\t+.*?[a-zA-Z0-9_]\((?!.*?;))|(^\t*typedef)" \
+        "|(^\t*(if|while|return))"
     discount_pattern = discount_pattern.format(
         type=helper.REGEX_TYPE,
     )
@@ -83,4 +85,16 @@ def line_length(line: str) -> int:
 
 
 def indent_level(line: str) -> int:
+    # an exeptional rule for function declaration
+    align_pattern = r"^(static\s+)?{type}\s+{name}\((.|\s)*?\);"
+    align_pattern = align_pattern.format(
+        type=helper.REGEX_TYPE,
+        name=helper.REGEX_NAME
+    )
+    if re.match(align_pattern, line):
+        last_tab_index = line.rfind("\t")
+        if last_tab_index == -1:
+            return 0
+        return int(len(line[:last_tab_index + 1].expandtabs(4)) / 4)
+
     return line.count("\t")

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = c_formatter_42
-version = 0.1.3.4
+version = 0.1.4
 description = formatting tool complient with 42 school's norm
 long_description = file: README.md
 long_description_content_type = text/markdown

tests/formatters/test_line_breaker.py

@@ -19,6 +19,24 @@ def test_line_indent_depth_basic_3():
 """
     assert 4 == indent_level(input)
 
+def test_line_indent_depth_basic_4():
+    input = """\
+static\tint\t\ttest();
+"""
+    assert 4 == indent_level(input)
+
+def test_line_indent_depth_basic_5():
+    input = """\
+static void\tst_merge_fields_in_curr(char *strs[3], t_tok_lst **curr, t_tok_lst *fields);
+"""
+    assert 3 == indent_level(input)
+
+def test_additional_indent_level_1():
+    input = """\
+static void\tst_merge_fields_in_curr(char *strs[3], t_tok_lst **curr, t_tok_lst *fields);
+"""
+    assert 1 == additional_indent_level(input)
+
 
 def test_insert_line_break_basic_1():
     output = """\
@@ -40,8 +58,8 @@ def test_insert_line_break_basic_2():
 def test_insert_line_break_basic_3():
     output = """\
 \t\t\t\treturn (fooooooooooooooooooooooooo(a, b, cccccccccccc,
-\t\t\t\t\t\t\tddddddddddddd, eeeeeeeeeeeeeeee, fffffffffffffff,
-\t\t\t\t\t\t\tgggggggggggg, hhhhhhhhhhhhhhhhhh));
+\t\t\t\t\t\tddddddddddddd, eeeeeeeeeeeeeeee, fffffffffffffff,
+\t\t\t\t\t\tgggggggggggg, hhhhhhhhhhhhhhhhhh));
 """
     assert output == line_breaker("""\
 \t\t\t\treturn (fooooooooooooooooooooooooo(a, b, cccccccccccc, ddddddddddddd, eeeeeeeeeeeeeeee, fffffffffffffff, gggggggggggg, hhhhhhhhhhhhhhhhhh));
@@ -158,11 +176,11 @@ def test_insert_line_break_basic_23():
 
 def test_insert_line_break_long_function_declaration():
     input = """
-static void\tst_merge_fields_in_curr(char *strs[3], t_tok_lst **curr, t_tok_lst *fields)
+static void\tst_merge_fields_in_curr(char *strs[3], t_tok_lst **curr, t_tok_lst *fields);
 """
     output = """
 static void\tst_merge_fields_in_curr(char *strs[3], t_tok_lst **curr,
-\t\tt_tok_lst *fields)
+\t\t\t\tt_tok_lst *fields);
 """
     assert line_breaker(input) == output