Mercurial > vim
view runtime/indent/nginx.vim @ 34625:ad1b0609b2f8 v9.1.0201
patch 9.1.0201: gM not working correctly with virt text
Commit: https://github.com/vim/vim/commit/366c81a2005370ac738618d889ec0337397a9f96
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Sun Mar 24 09:46:56 2024 +0100
patch 9.1.0201: gM not working correctly with virt text
Problem: `gM` would include outer virtual text and its padding when
getting the line length used to calculate the middle of the
line, putting the cursor much closer to virtual text lines.
Solution: Exclude outer virtual text in getting the line length for
`gM`, so that virtual text doesn't influence where the cursor
is moved to (Dylan Thacker-Smith).
closes: #14262
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 24 Mar 2024 10:00:07 +0100 |
parents | 7d68a90cbf5c |
children |
line wrap: on
line source
" Vim indent file " Language: nginx.conf " Maintainer: Chris Aumann <me@chr4.org> " Last Change: 2022 Dec 01 " Only load this indent file when no other was loaded. if exists('b:did_indent') finish endif let b:did_indent = 1 setlocal indentexpr=GetNginxIndent() setlocal indentkeys=0{,0},0#,!^F,o,O let b:undo_indent = 'setl inde< indk<' " Only define the function once. if exists('*GetNginxIndent') finish endif function GetNginxIndent() abort let plnum = s:PrevNotAsBlank(v:lnum - 1) " Hit the start of the file, use zero indent. if plnum == 0 return 0 endif let ind = indent(plnum) " Add a 'shiftwidth' after '{' if s:AsEndWith(getline(plnum), '{') let ind = ind + shiftwidth() end " Subtract a 'shiftwidth' on '}' " This is the part that requires 'indentkeys'. if getline(v:lnum) =~ '^\s*}' let ind = ind - shiftwidth() endif let pplnum = s:PrevNotAsBlank(plnum - 1) if s:IsLineContinuation(plnum) if !s:IsLineContinuation(pplnum) let ind = ind + shiftwidth() end else if s:IsLineContinuation(pplnum) let ind = ind - shiftwidth() end endif return ind endfunction " Find the first line at or above {lnum} that is non-blank and not a comment. function s:PrevNotAsBlank(lnum) abort let lnum = prevnonblank(a:lnum) while lnum > 0 if getline(lnum) !~ '^\s*#' break endif let lnum = prevnonblank(lnum - 1) endwhile return lnum endfunction " Check whether {line} ends with {pat}, ignoring trailing comments. function s:AsEndWith(line, pat) abort return a:line =~ a:pat . '\m\s*\%(#.*\)\?$' endfunction function s:IsLineContinuation(lnum) abort return a:lnum > 0 && !s:AsEndWith(getline(a:lnum), '[;{}]') endfunction