Don't require content in parens for single statment indent

This commit is contained in:
Justin Frank 2018-11-01 00:21:48 -07:00
parent ee65954ed4
commit 521e5032c9

View File

@ -47,9 +47,9 @@ define-command -hidden c-family-indent-on-newline %< evaluate-commands -draft -i
# indent after a label # indent after a label
try %< execute-keys -draft k <a-x> s[a-zA-Z0-9_-]+:\h*$<ret> j <a-gt> > try %< execute-keys -draft k <a-x> s[a-zA-Z0-9_-]+:\h*$<ret> j <a-gt> >
# indent after a statement not followed by an opening brace # indent after a statement not followed by an opening brace
try %< execute-keys -draft k <a-x> <a-k>\b(if|else|for|while)\h*(\(.+?\)\h*)?$<ret> j <a-gt> > try %< execute-keys -draft k <a-x> <a-k>\b(if|else|for|while)\h*(\(.*?\)\h*)?$<ret> j <a-gt> >
# deindent after a single line statement end # deindent after a single line statement end
try %< execute-keys -draft K <a-x> <a-k>\;\h*$<ret> K <a-x> s\b(if|else|for|while)\h*(\(.+?\)\h*)?$|.\z<ret> 1<a-&> > try %< execute-keys -draft K <a-x> <a-k>\;\h*$<ret> K <a-x> s\b(if|else|for|while)\h*(\(.*?\)\h*)?$|.\z<ret> 1<a-&> >
# align to the opening parenthesis or opening brace (whichever is first) # align to the opening parenthesis or opening brace (whichever is first)
# on a previous line if its followed by text on the same line # on a previous line if its followed by text on the same line
try %< evaluate-commands -draft %< try %< evaluate-commands -draft %<