fix for issue 31 - taskmatch ends exclude block

example.yml

@@ -143,3 +143,28 @@
     enabled: false
     state: stopped
     masked: true
+
+---
+# issue #31
+- name: test file 1
+  file:
+    path: /a/b/c/1
+
+- name: command with vars 1
+  command: echo "before file 2"
+  vars:
+    ansible_ssh_pipelining: true
+
+- name: test file 2
+  file:
+    path: /a/b/c/2
+
+- name: command with vars 2
+  vars:
+    ansible_ssh_pipelining: true
+  command: echo "before file 3"
+
+- name: test file 3
+  file:
+    path: /a/b/c/3
+# end issue #31

exampleconverted.yml

@@ -143,3 +143,28 @@
     enabled: false
     state: stopped
     masked: true
+
+---
+# issue #31
+- name: test file 1
+  ansible.builtin.file:
+    path: /a/b/c/1
+
+- name: command with vars 1
+  ansible.builtin.command: echo "before file 2"
+  vars:
+    ansible_ssh_pipelining: true
+
+- name: test file 2
+  ansible.builtin.file:
+    path: /a/b/c/2
+
+- name: command with vars 2
+  vars:
+    ansible_ssh_pipelining: true
+  ansible.builtin.command: echo "before file 3"
+
+- name: test file 3
+  ansible.builtin.file:
+    path: /a/b/c/3
+# end issue #31

fqcn-fixer.py

@@ -384,6 +384,7 @@ def increase_indent(self, flow=False, *dargs, **dkwargs): # pylint: disable=keyw
             if args.printdiff:
                 originallines.append(line)
             nline = line
+            taskmatch = _taskstartregex.match(line)
             if checkstartexcludeblock(line):
                 in_ignore_block = True
                 startingwhitespaces_ignore_block = re.match(r'\s*-?\s*', line).group()
@@ -398,11 +399,15 @@ def increase_indent(self, flow=False, *dargs, **dkwargs): # pylint: disable=keyw
                     startingwhitespaces_ignore_block = None
                     if args.debug:
                         debugmsg('end exclude block!')
+                elif taskmatch:
+                    in_ignore_block = False
+                    startingwhitespaces_ignore_block = None
+                    if args.debug:
+                        debugmsg('taskmatch in exclude block => end exclude block!')
                 else:
                     if args.debug:
                         debugmsg('... in exclude block ... ignore line')
             if not in_ignore_block:
-                taskmatch = _taskstartregex.match(line)
                 if taskmatch:
                     if args.debug:
                         debugmsg('taskmatch: %s' % taskmatch)