Single-line conditionals can confuse indenting

[immerrr]

Single-line conditionals can confuse indenting

[vhallac]

The problem is caused by a bug in the function lua-cleanup-indentation-info. When fed the list

( (remove-matching . 0)
  (replace-matching relative . 4)
  (relative . 4)
  (relative . 0))

it should return (relative . 0) (the second element's cdr should replace the third, and the first one should remove it), but it returns (relative . 4). The problem is, the second case in the function should check erase count as well instead of unconditionally adding the cdr to value.

A quick and dirty fix for the bug is:

(defun lua-cleanup-indentation-info (info)
  "Cleanup the list of indentation information.
There are two tokens that cause list cleanup: remove-matching,
and replace matching. These tokens are considered cleanup tokens.

When a remove-matching token is found, the next non cleanup token
is removed from list.

When a replace-matching token is found, the next non-cleanup
token is removed from the list, and the cdr of the
replace-matching token is inserted in its place."
  (let (value
        (erase-count 0))
    (dolist (elt info value)
      (cond
       ( (eq 'remove-matching (car elt))
         (setq erase-count (1+ erase-count)))
       ( (eq 'replace-matching (car elt))
         (if (= erase-count 0)
             (setq value (cons (cdr elt) value))
           (setq erase-count (1- erase-count)))
         (setq erase-count (1+ erase-count)))
       ( t
         (if (= erase-count 0)
             (setq value (cons elt value))
           (setq erase-count (1- erase-count))))))
    (reverse value)))

A bit of refactoring/simplification would be a good idea. :)

I will try to get a tidied up fix with a pull request for this as soon as I can.

[immerrr]

I guess, that's fixed now thanks to Vedat.

[rrthomas]

Indeed; thanks, both of you!