Mercurial > vim
view runtime/indent/nginx.vim @ 34215:8b0648002604 v9.1.0056
patch 9.1.0056: wrong number of trailing spaces inserted after blockwise put
Commit: https://github.com/vim/vim/commit/6638ec8afa9875ff565020536954c424d5f6f27d
Author: VanaIgr <vanaigranov@gmail.com>
Date: Thu Jan 25 21:50:41 2024 +0100
patch 9.1.0056: wrong number of trailing spaces inserted after blockwise put
Problem: Incorrect number of trailing spaces inserted for multibyte
characters when pasting a blockwise register in blockwise visual
mode (VanaIgr)
Solution: Skip over trailing UTF-8 bytes when computing the number of trailing
spaces (VanaIgr)
When pasting in blockwise visual mode, and the register type is <CTRL-V>, Vim
aligns the text after the replaced area by inserting spaces after pasted
lines that are shorter than the longest line. When a shorter line contains
multibyte characters, each trailing UTF-8 byte's width is counted in addition
to the width of the character itself. Each trailing byte counts as being 4
cells wide (since it would be displayed as <xx>).
closes: #13909
Signed-off-by: VanaIgr <vanaigranov@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 25 Jan 2024 22:15:02 +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