Mercurial > vim
view runtime/indent/qml.vim @ 34397:f0cdbcf53264 v9.1.0124
patch 9.1.0124: display of below/right virtual text with non-virtual text overlap
Commit: https://github.com/vim/vim/commit/8055721c2d30f21cfabe7453014f526e7becfc06
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Wed Feb 21 21:00:59 2024 +0100
patch 9.1.0124: display of below/right virtual text with non-virtual text overlap
Problem: Virtual text with text_align 'right'/'below' wasn't being
used when a non-virtual text property overlaps with the end of
the line. This was because the non-virtual text property had a
higher priority, preventing the virtual text from being used.
Solution: Fix the sorting of text properties so virtual text properties
have a higher priority than non-virtual text properties.
(Dylan Thacker-Smith)
related: #14063
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 | Wed, 21 Feb 2024 21:15:03 +0100 |
parents | c781be83e11e |
children |
line wrap: on
line source
" Vim indent file " Language: QML " Maintainer: Chase Knowlden <haroldknowlden@gmail.com> " Last Change: 2024 Jan 24 by Vim Project " " Improved JavaScript indent script. " Indent script in place for this already? if exists("b:did_indent") finish endif let b:did_indent = 1 let b:undo_indent = "setlocal indentexpr< indentkeys<" setlocal indentexpr=s:GetQmlIndent() setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e,*<Return>,=*/ " Only define functions once per session if exists("*s:GetQmlIndent") finish endif " Clean up a line of code by removing trailing '//' and '/* */' comments, and trimming " whitespace function! s:Trim(line) return substitute(substitute(substitute(a:line, '// .*', '', ''), '/\* .* \*/', '', ''), '^\s*\|\s*$', '', 'g') endfunction function! s:GetQmlIndent() let num = v:lnum let line = s:Trim(getline(num)) let pnum = prevnonblank(num - 1) if pnum == 0 return 0 endif let pline = s:Trim(getline(pnum)) let ind = indent(pnum) " bracket/brace/paren blocks if pline =~ '[{[(]$' let ind += shiftwidth() endif if line =~ '^[}\])]' let ind -= shiftwidth() endif " '/*' comments if pline =~ '^/\*.*\*/' " no indent for single-line form elseif pline =~ '^/\*' let ind += 1 elseif pline =~ '^\*/' let ind -= 1 endif return ind endfunction