mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-11 09:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:229f79c: runtime(yaml): fix wrong order of undo_ftplugin suboptions

Browse Source 
This commit fixes the following error message:
```
Compiler not supported: make inc< sw< sts<
```

1. orginal value: `setl com< cms< et< fo<| compiler make inc< sw< sts<`
2. correct value: `setl com< cms< et< fo< inc< sw< sts< | compiler make`

While at it, let's also document the g:yaml_recommended_style variable.

closes: vim/vim#17179

229f79c168

Co-authored-by: Vincent Law <vlaw@users.noreply.github.com>
Co-authored-by: Christian Brabandt <cb@256bit.org>
(cherry picked from commit 8d68dbf906)
This commit is contained in:
Christian Clason
2025-04-22 23:24:50 +02:00
committed by github-actions[bot]
parent 0978d83c6e
commit b3eab00e55
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/filetype.txt
View File

@@ -1117,6 +1117,13 @@ functions with [[ and ]]. Move around comments with ]" and [".
The mappings can be disabled with: > The mappings can be disabled with: >
let g:no_vim_maps = 1 let g:no_vim_maps = 1
YAML *ft-yaml-plugin*
By default, the YAML filetype plugin enables the following options: >
setlocal shiftwidth=2 softtabstop=2
To disable this, set the following variable: >
let g:yaml_recommended_style = 0
ZIG *ft-zig-plugin* ZIG *ft-zig-plugin*

28
runtime/ftplugin/yaml.vim
View File

@@ -2,6 +2,7 @@
" Language: YAML (YAML Ain't Markup Language) " Language: YAML (YAML Ain't Markup Language)
" Previous Maintainer: Nikolai Weibull <now@bitwi.se> (inactive) " Previous Maintainer: Nikolai Weibull <now@bitwi.se> (inactive)
" Last Change: 2024 Oct 04 " Last Change: 2024 Oct 04
" 2025 Apr 22 by Vim project re-order b:undo_ftplugin (#17179)
if exists("b:did_ftplugin") if exists("b:did_ftplugin")
finish finish
@@ -16,20 +17,25 @@ let b:undo_ftplugin = "setl com< cms< et< fo<"
setlocal comments=:# commentstring=#\ %s expandtab setlocal comments=:# commentstring=#\ %s expandtab
setlocal formatoptions-=t formatoptions+=croql setlocal formatoptions-=t formatoptions+=croql
" rime input method engine uses `*.custom.yaml` as its config files if get(g:, "yaml_recommended_style",1)
if expand('%:r:e') ==# 'custom'
if !exists('current_compiler')
compiler rime_deployer
let b:undo_ftplugin ..= "| compiler make"
endif
setlocal include=__include:\\s*
let b:undo_ftplugin ..= " inc<"
endif
if !exists("g:yaml_recommended_style") || g:yaml_recommended_style != 0
let b:undo_ftplugin ..= " sw< sts<" let b:undo_ftplugin ..= " sw< sts<"
setlocal shiftwidth=2 softtabstop=2 setlocal shiftwidth=2 softtabstop=2
endif endif
" rime input method engine(https://rime.im/)
" uses `*.custom.yaml` as its config files
if expand('%:r:e') ==# 'custom'
" `__include` command in `*.custom.yaml`
" see: https://github.com/rime/home/wiki/Configuration#%E5%8C%85%E5%90%AB
setlocal include=__include:\\s*
let b:undo_ftplugin ..= " inc<"
if !exists('current_compiler')
compiler rime_deployer
let b:undo_ftplugin ..= " | compiler make"
endif
endif
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:cpo_save unlet s:cpo_save