Commit: runtime(yaml): do not re-indent when commenting out lines

21 views
Skip to first unread message

Christian Brabandt

unread,
Aug 15, 2024, 4:45:08 PM8/15/24
to vim...@googlegroups.com
runtime(yaml): do not re-indent when commenting out lines

Commit: https://github.com/vim/vim/commit/c6ed816761f44da92d8c61f5ea6cb7fdbb45fac5
Author: Christian Brabandt <c...@256bit.org>
Date: Thu Aug 15 22:29:47 2024 +0200

runtime(yaml): do not re-indent when commenting out lines

It's a personal annoyance for me. I have to edit yaml files on a lot of
customer environments and whenever you type '#' at the start of the
line, the commented line will be indented by whatever indent the
previous line had.

I hate this seriously, because it makes un-commenting painful. So let's
fix this. But instead of messing with the indent function, let's just
remove the '0#' from cinkeys, so that Vim won't perform re-indenting
when commenting out such a yaml file.

closes: #15494

Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/runtime/indent/yaml.vim b/runtime/indent/yaml.vim
index e5daf9f21..c38712745 100644
--- a/runtime/indent/yaml.vim
+++ b/runtime/indent/yaml.vim
@@ -3,7 +3,8 @@
" Maintainer: Nikolai Pavlov <zyx...@gmail.com>
" Last Updates: Lukas Reineke, "lacygoill"
" Last Change: 2022 Jun 17
-" 2024 Feb 29 disable mulitline indent by default (The Vim project)
+" 2024 Feb 29 by Vim project: disable mulitline indent by default
+" 2024 Aug 14 by Vim project: fix re-indenting when commenting out lines

" Only load this indent file when no other was loaded.
if exists('b:did_indent')
@@ -13,7 +14,7 @@ endif
let b:did_indent = 1

setlocal indentexpr=GetYAMLIndent(v:lnum)
-setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0-
+setlocal indentkeys=!^F,o,O,0},0],<:>,0-
setlocal nosmartindent

let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<'
Reply all
Reply to author
Forward
0 new messages