Mercurial > vim
annotate runtime/indent/context.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 | f00c56ee8118 |
| children | d81556766132 |
| rev | line source |
|---|---|
| 29885 | 1 vim9script |
| 2 | |
| 3 # Language: ConTeXt typesetting engine | |
| 4 # Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com> | |
| 5 # Former Maintainers: Nikolai Weibull <now@bitwi.se> | |
| 6 # Latest Revision: 2022 Aug 12 | |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
7 |
|
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
8 if exists("b:did_indent") |
|
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
9 finish |
|
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
10 endif |
|
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
11 |
| 29885 | 12 # Load MetaPost indentation script (this will also set b:did_indent) |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
13 runtime! indent/mp.vim |
|
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
14 |
| 29885 | 15 setlocal indentexpr=ConTeXtIndent() |
| 16 | |
| 17 b:undo_indent = "setl indentexpr<" | |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
18 |
| 29885 | 19 def PrevNotComment(l: number): number |
| 20 var prevlnum = prevnonblank(l) | |
| 21 | |
| 22 while prevlnum > 0 && getline(prevlnum) =~# '^\s*%' | |
| 23 prevlnum = prevnonblank(prevlnum - 1) | |
| 24 endwhile | |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
25 |
| 29885 | 26 return prevlnum |
| 27 enddef | |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
28 |
| 29885 | 29 def FindPair(pstart: string, pmid: string, pend: string): number |
| 30 cursor(v:lnum, 1) | |
| 31 return indent(searchpair(pstart, pmid, pend, 'bWn', | |
| 32 'synIDattr(synID(line("."), col("."), 0), "name") =~? "string\\|comment"')) | |
| 33 enddef | |
| 34 | |
| 35 def ConTeXtIndent(): number | |
| 36 # Use MetaPost rules inside MetaPost graphic environments | |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
37 if len(synstack(v:lnum, 1)) > 0 && |
| 29885 | 38 synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic' |
| 39 return g:MetaPostIndent() | |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
40 endif |
| 29885 | 41 |
| 42 const prevlnum = PrevNotComment(v:lnum - 1) | |
| 43 const prevind = indent(prevlnum) | |
| 44 const prevline = getline(prevlnum) | |
| 45 const currline = getline(v:lnum) | |
| 46 | |
| 47 # If the current line starts with ], match indentation. | |
| 48 if currline =~# '^\s*\]' | |
| 49 return FindPair('\[', '', '\]') | |
| 50 endif | |
| 51 | |
| 52 # If the current line starts with }, match indentation. | |
| 53 if currline =~# '^\s*}' | |
| 54 return FindPair('{', '', '}') | |
| 55 endif | |
| 56 | |
| 57 # If the previous line ends with [ or { (possibly followed by a comment) then indent. | |
| 58 if prevline =~# '[{[]\s*\%(%.*\)\=$' | |
| 59 return prevind + shiftwidth() | |
| 60 endif | |
| 61 | |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
62 return -1 |
| 29885 | 63 enddef |
|
10301
07d2b5a3b7cc
commit https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
64 |
| 29885 | 65 # vim: sw=2 fdm=marker |