Mercurial > vim
annotate runtime/indent/obse.vim @ 32876:522f16e3e058 v9.0.1747
patch 9.0.1747: screenpos() may cause unnecessary redraw
Commit: https://github.com/vim/vim/commit/6235a109c48ff2559eca3b16578c429ffb61eadc
Author: zeertzjq <zeertzjq@outlook.com>
Date: Sat Aug 19 14:12:42 2023 +0200
patch 9.0.1747: screenpos() may cause unnecessary redraw
Problem: screenpos() may cause unnecessary redraw.
Solution: Don't unnecessarily reset VALID_WROW flag.
VALID_WROW flag is only used by two functions: validate_cursor() and
cursor_valid(), and cursor_valid() is only used once in ex_sleep().
When adjust_plines_for_skipcol() was first added in patch 9.0.0640, it
was called in two functions: comp_botline() and curs_rows().
- comp_botline() is called in two places:
- onepage(), which resets VALID_WROW flag immediately afterwards.
- validate_botline_win(), where resetting a VALID_ flag is strange.
- curs_rows() is called in two places:
- curs_columns(), which sets VALID_WROW flag afterwards.
- validate_cline_row(), which is only used by GUI mouse focus.
Therefore resetting VALID_WROW there doesn't seem to do anything useful.
Also, a w_skipcol check (which resets VALID_WROW flag) was added to
check_cursor_moved() in patch 9.0.0734, which seems to make more sense
than resetting that flag in the middle of a computation.
While at it make adjust_plines_for_skipcol() and textpos2screenpos() a
bit less confusing:
- Make adjust_plines_for_skipcol() return "off" instead of "n - off".
- Use 0-based "row" in textpos2screenpos() until W_WINROW is added.
closes: #12832
Signed-off-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 19 Aug 2023 14:30:02 +0200 |
| parents | a7801222c9c5 |
| children |
| rev | line source |
|---|---|
| 31200 | 1 " Vim indent file |
| 2 " Language: Oblivion Language (obl) | |
| 3 " Original Creator: Kat <katisntgood@gmail.com> | |
| 4 " Maintainer: Kat <katisntgood@gmail.com> | |
| 5 " Created: 01 November 2021 | |
| 6 " Last Change: 13 November 2022 | |
| 7 | |
| 8 if exists("b:did_indent") | |
| 9 finish | |
| 10 endif | |
| 11 let b:did_indent = 1 | |
| 12 let b:undo_indent = 'setlocal indentkeys< indentexpr<' | |
| 13 | |
| 14 setlocal indentexpr=GetOblIndent() | |
| 15 setlocal indentkeys+==~endif,=~else,=~loop,=~end | |
| 16 | |
| 17 if exists("*GetOblIndent") | |
| 18 finish | |
| 19 endif | |
| 20 let s:keepcpo = &cpo | |
| 21 set cpo&vim | |
| 22 | |
| 23 let s:SKIP_LINES = '^\s*\(;.*\)' | |
| 24 function! GetOblIndent() | |
| 25 | |
| 26 let lnum = prevnonblank(v:lnum - 1) | |
| 27 let cur_text = getline(v:lnum) | |
| 28 if lnum == 0 | |
| 29 return 0 | |
| 30 endif | |
| 31 let prev_text = getline(lnum) | |
| 32 let found_cont = 0 | |
| 33 let ind = indent(lnum) | |
| 34 | |
| 35 " indent next line on start terms | |
| 36 let i = match(prev_text, '\c^\s*\(\s\+\)\?\(\(if\|while\|foreach\|begin\|else\%[if]\)\>\)') | |
| 37 if i >= 0 | |
| 38 let ind += shiftwidth() | |
| 39 if strpart(prev_text, i, 1) == '|' && has('syntax_items') | |
| 40 \ && synIDattr(synID(lnum, i, 1), "name") =~ '\(Comment\|String\)$' | |
| 41 let ind -= shiftwidth() | |
| 42 endif | |
| 43 endif | |
| 44 " indent current line on end/else terms | |
| 45 if cur_text =~ '\c^\s*\(\s\+\)\?\(\(loop\|endif\|else\%[if]\)\>\)' | |
| 46 let ind = ind - shiftwidth() | |
| 47 " if we are at a begin block just go to column 0 | |
| 48 elseif cur_text =~ '\c^\s*\(\s\+\)\?\(\(begin\|end\)\>\)' | |
| 49 let ind = 0 | |
| 50 endif | |
| 51 return ind | |
| 52 endfunction | |
| 53 | |
| 54 let &cpo = s:keepcpo | |
| 55 unlet s:keepcpo |