Mercurial > vim
view runtime/indent/bzl.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 | bdda48f01a68 |
children |
line wrap: on
line source
" Vim indent file " Language: Bazel (http://bazel.io) " Maintainer: David Barnett (https://github.com/google/vim-ft-bzl) " Last Change: 2021 Jul 08 if exists('b:did_indent') finish endif " Load base python indent. if !exists('*GetPythonIndent') runtime! indent/python.vim endif let b:did_indent = 1 " Only enable bzl google indent if python google indent is enabled. if !get(g:, 'no_google_python_indent') setlocal indentexpr=GetBzlIndent(v:lnum) endif if exists('*GetBzlIndent') finish endif let s:save_cpo = &cpo set cpo-=C " Maximum number of lines to look backwards. let s:maxoff = 50 "" " Determine the correct indent level given an {lnum} in the current buffer. function GetBzlIndent(lnum) abort let l:use_recursive_indent = !get(g:, 'no_google_python_recursive_indent') if l:use_recursive_indent " Backup and override indent setting variables. if exists('g:pyindent_nested_paren') let l:pyindent_nested_paren = g:pyindent_nested_paren endif if exists('g:pyindent_open_paren') let l:pyindent_open_paren = g:pyindent_open_paren endif let g:pyindent_nested_paren = 'shiftwidth()' let g:pyindent_open_paren = 'shiftwidth()' endif let l:indent = -1 call cursor(a:lnum, 1) let [l:par_line, l:par_col] = searchpairpos('(\|{\|\[', '', ')\|}\|\]', 'bW', \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" . \ " synIDattr(synID(line('.'), col('.'), 1), 'name')" . \ " =~ '\\(Comment\\|String\\)$'") if l:par_line > 0 " Indent inside parens. if searchpair('(\|{\|\[', '', ')\|}\|\]', 'W', \ "line('.') < " . (a:lnum - s:maxoff) . " ? dummy :" . \ " synIDattr(synID(line('.'), col('.'), 1), 'name')" . \ " =~ '\\(Comment\\|String\\)$'") && line('.') == a:lnum " If cursor is at close parens, match indent with open parens. " E.g. " foo( " ) let l:indent = indent(l:par_line) else " Align with the open paren unless it is at the end of the line. " E.g. " open_paren_not_at_EOL(100, " (200, " 300), " 400) " open_paren_at_EOL( " 100, 200, 300, 400) call cursor(l:par_line, 1) if l:par_col != col('$') - 1 let l:indent = l:par_col endif endif endif " Delegate the rest to the original function. if l:indent == -1 let l:indent = GetPythonIndent(a:lnum) endif if l:use_recursive_indent " Restore global variables. if exists('l:pyindent_nested_paren') let g:pyindent_nested_paren = l:pyindent_nested_paren else unlet g:pyindent_nested_paren endif if exists('l:pyindent_open_paren') let g:pyindent_open_paren = l:pyindent_open_paren else unlet g:pyindent_open_paren endif endif return l:indent endfunction let &cpo = s:save_cpo unlet s:save_cpo