Mercurial > vim
view runtime/indent/hog.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 | 63b0b7b79b25 |
children |
line wrap: on
line source
" Vim indent file " Language: hog (Snort.conf) " Maintainer: Victor Roemer, <vroemer@badsec.org> " Last Change: Mar 7, 2013 " Only load this indent file when no other was loaded. if exists("b:did_indent") finish endif let b:did_indent = 1 let b:undo_indent = 'setlocal smartindent< indentexpr< indentkeys<' setlocal nosmartindent setlocal indentexpr=GetHogIndent() setlocal indentkeys+=!^F,o,O,0# " Only define the function once. if exists("*GetHogIndent") finish endif let s:cpo_save = &cpo set cpo&vim let s:syn_blocks = '\<SnortRuleTypeBody\>' function s:IsInBlock(lnum) return synIDattr(synID(a:lnum, 1, 1), 'name') =~ s:syn_blocks endfunction function GetHogIndent() let prevlnum = prevnonblank(v:lnum-1) " Comment blocks have identical indent if getline(v:lnum) =~ '^\s*#' && getline(prevlnum) =~ '^\s*#' return indent(prevlnum) endif " Ignore comment lines when calculating indent while getline(prevlnum) =~ '^\s*#' let prevlnum = prevnonblank(prevlnum-1) if !prevlnum return previndent endif endwhile " Continuation of a line that wasn't indented let prevline = getline(prevlnum) if prevline =~ '^\k\+.*\\\s*$' return shiftwidth() endif " Continuation of a line that was indented if prevline =~ '\k\+.*\\\s*$' return indent(prevlnum) endif " Indent the next line if previous line contained a start of a block " definition ('{' or '('). if prevline =~ '^\k\+[^#]*{}\@!\s*$' " TODO || prevline =~ '^\k\+[^#]*()\@!\s*$' return shiftwidth() endif " Match inside of a block if s:IsInBlock(v:lnum) if prevline =~ "^\k\+.*$" return shiftwidth() else return indent(prevlnum) endif endif return 0 endfunction let &cpo = s:cpo_save unlet s:cpo_save