fix: formatting of triple quoted strings [#152]

snakemake · Nov 8, 2022 · 764e11d · 764e11d
1 parent beca978
commit 764e11d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 5 deletions.
diff --git a/snakefmt/formatter.py b/snakefmt/formatter.py
@@ -199,11 +199,11 @@ def align_strings(self, string: str, target_indent: int) -> str:
             match_slice = string[match.start(1) : match.end(1)].replace("\t", TAB)
             all_lines = match_slice.splitlines(keepends=True)
             first = textwrap.indent(textwrap.dedent(all_lines[0]), used_indent)
-            indented += first
-
             is_multiline_string = re.match(
                 r"[bfru]?\"\"\"|'''", first.lstrip(), flags=re.IGNORECASE
             )
+            indented += first
+
             if len(all_lines) > 2:
                 if is_multiline_string:
                     middle = "".join(all_lines[1:-1])
@@ -213,7 +213,10 @@ def align_strings(self, string: str, target_indent: int) -> str:
                     )
                 indented += middle
             if len(all_lines) > 1:
-                last = textwrap.indent(textwrap.dedent(all_lines[-1]), used_indent)
+                if is_multiline_string:
+                    last = all_lines[-1]
+                else:
+                    last = textwrap.indent(textwrap.dedent(all_lines[-1]), used_indent)
                 indented += last
             pos = match.end()
         indented += textwrap.indent(string[pos:], used_indent)

diff --git a/tests/test_formatter.py b/tests/test_formatter.py
@@ -649,7 +649,7 @@ def test_tpq_alignment_and_keep_relative_indenting(self):
 {TAB * 0}  Hello
 {TAB * 1}World
 {TAB * 2}  Tabbed
-{TAB * 2}"""
+{TAB * 1}"""
 '''
         assert formatter.get_formatted() == expected
 
@@ -737,12 +737,41 @@ def test_docstrings_get_retabbed_for_snakecode_only(self):
 
 rule a:
 {TAB * 1}"""The rule a
-{TAB * 1}"""
+{TAB * 0}"""
 {TAB * 1}message:
 {TAB * 2}"a"
 '''
         assert formatter.get_formatted() == expected
 
+    def test_tpq_inside_run_block(self):
+        snakecode = '''rule cutadapt:
+    input:
+        "a.txt",
+    output:
+        "b.txt",
+    run:
+        if True:
+            shell(
+                """ 
+            cutadapt \
+                -m 30 \
+                {input} \
+                -o {output}
+            """
+            )
+        else:
+            shell(
+                """
+            cutadapt \
+                {input} \
+                -o {output}
+            """
+            )
+'''
+        formatter = setup_formatter(snakecode)
+
+        assert formatter.get_formatted() == snakecode
+
 
 class TestReformatting_SMK_BREAK:
     """