Merge remote-tracking branch 'laelath/c-indent-edits'

rc/core/c-family.kak

@@ -48,6 +48,8 @@ define-command -hidden c-family-indent-on-newline %< evaluate-commands -draft -i
     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
     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
+    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)
     # on a previous line if its followed by text on the same line
     try %< evaluate-commands -draft %<

test/indent/c-family/deindent-if-body/cmd

@@ -0,0 +1 @@
+c<ret>baz<esc>

test/indent/c-family/deindent-if-body/in

@@ -0,0 +1,2 @@
+if (int i = bar())
+    foo();%( )

test/indent/c-family/deindent-if-body/out

@@ -0,0 +1,3 @@
+if (int i = bar())
+    foo();
+baz

test/indent/c-family/deindent-if-body/rc

@@ -0,0 +1,3 @@
+source "%val{runtime}/colors/default.kak"
+source "%val{runtime}/rc/core/c-family.kak"
+set buffer filetype cpp

test/indent/c-family/deindent-if-body/state

@@ -0,0 +1 @@
+3.4,3.4