fix: collate consecutive directives after if block [#172]

snakemake · Feb 2, 2023 · cbe88c7 · cbe88c7
1 parent e736235
commit cbe88c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/snakefmt/parser/parser.py b/snakefmt/parser/parser.py
@@ -106,6 +106,7 @@ def __init__(self, snakefile: TokenIterator):
                 elif self.from_python:
                     # We are exiting python context, so force spacing out keywords
                     self.last_recognised_keyword = ""
+                    self.from_python = self.syntax.from_python
                 self.flush_buffer(
                     from_python=self.from_python,
                     in_global_context=self.in_global_context,

diff --git a/tests/test_formatter.py b/tests/test_formatter.py
@@ -520,13 +520,15 @@ def test_indented_consecutive_snakemake_directives(self):
         formatter = setup_formatter(snakecode)
         assert formatter.get_formatted() == snakecode
 
-    def test_spaced_out_consecutive_dedented_directive(self):
+    def test_spaced_out_consecutive_dedented_directive_dedented_stays_collated(self):
+        """https://github.com/snakemake/snakefmt/pull/172"""
         snakecode = (
             'if config["load"]:\n\n'
             f'{TAB * 1}include: "module_a.smk"\n\n'
             f"else:\n\n"
             f'{TAB * 1}include: "module_b.smk"\n\n\n'
-            f'include: "other.smk"\n'
+            'include: "other.smk"\n'
+            'include: "other2.smk"\n'
         )
         formatter = setup_formatter(snakecode)
         assert formatter.get_formatted() == snakecode