indent: fix end-of-control-block indent if block is empty

pboettch · Oct 30, 2019 · 7edeedb · 7edeedb
1 parent 7c77415
commit 7edeedb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/indent/cmake.vim b/indent/cmake.vim
@@ -105,7 +105,9 @@ fun! CMakeGetIndent(lnum)
 
   if previous_line =~? s:cmake_indent_begin_regex " control begin block
 	let ind = ind + shiftwidth()
-  elseif this_line =~? s:cmake_indent_end_regex  " control end block
+  endif
+
+  if this_line =~? s:cmake_indent_end_regex  " control end block
 	let ind = ind - shiftwidth()
   elseif this_line =~? s:cmake_indent_comment_line
 	if g:cmake_indent_align_comments_to_first_column == 1

diff --git a/test/if-endif-indent.cmake b/test/if-endif-indent.cmake
@@ -0,0 +1,2 @@
+if(HELLO)
+endif()
diff --git a/test/if-endif-indent.cmake.html.ref b/test/if-endif-indent.cmake.html.ref
@@ -0,0 +1,6 @@
+<body>
+<pre id='vimCodeElement'>
+<span class="Statement">if</span>(HELLO)
+<span class="Statement">endif</span>()
+</pre>
+</body>