Mercurial > vim
annotate runtime/indent/yaml.vim @ 26686:c04b28fad0cc v8.2.3872
patch 8.2.3872: Vim9: finddir() and uniq() return types can be more specific
Commit: https://github.com/vim/vim/commit/080182216e605df3428cc699b9fd7e761368d12f
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Dec 22 18:45:37 2021 +0000
patch 8.2.3872: Vim9: finddir() and uniq() return types can be more specific
Problem: Vim9: finddir() and uniq() return types can be more specific.
Solution: Adjust the return type.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 22 Dec 2021 20:00:04 +0100 |
| parents | 29ec2c198c8d |
| children | b96ceb97e896 |
| rev | line source |
|---|---|
| 3996 | 1 " Vim indent file |
| 20753 | 2 " Language: YAML |
| 3 " Maintainer: Nikolai Pavlov <zyx.vim@gmail.com> | |
| 4 " Last Update: Lukas Reineke | |
| 25619 | 5 " Last Change: 2021 Aug 13 |
| 3996 | 6 |
| 7 " Only load this indent file when no other was loaded. | |
| 8 if exists('b:did_indent') | |
| 9 finish | |
| 10 endif | |
| 11 | |
| 12 let b:did_indent = 1 | |
| 13 | |
| 14 setlocal indentexpr=GetYAMLIndent(v:lnum) | |
|
7228
873eae260c97
commit https://github.com/vim/vim/commit/b4ff518d95aa57c2f8c0568c915035bef849581b
Christian Brabandt <cb@256bit.org>
parents:
7147
diff
changeset
|
15 setlocal indentkeys=!^F,o,O,0#,0},0],<:>,0- |
| 3996 | 16 setlocal nosmartindent |
| 17 | |
| 18 let b:undo_indent = 'setlocal indentexpr< indentkeys< smartindent<' | |
| 19 | |
| 20 " Only define the function once. | |
| 21 if exists('*GetYAMLIndent') | |
| 22 finish | |
| 23 endif | |
| 24 | |
| 23737 | 25 let s:save_cpo = &cpo |
| 26 set cpo&vim | |
| 27 | |
| 3996 | 28 function s:FindPrevLessIndentedLine(lnum, ...) |
| 29 let prevlnum = prevnonblank(a:lnum-1) | |
| 30 let curindent = a:0 ? a:1 : indent(a:lnum) | |
| 31 while prevlnum | |
| 32 \&& indent(prevlnum) >= curindent | |
| 18343 | 33 \&& getline(prevlnum) !~# '^\s*#' |
| 3996 | 34 let prevlnum = prevnonblank(prevlnum-1) |
| 35 endwhile | |
| 36 return prevlnum | |
| 37 endfunction | |
| 38 | |
| 39 function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex) | |
| 40 let plilnum = s:FindPrevLessIndentedLine(a:lnum, indent(a:lnum)+1) | |
| 41 while plilnum && getline(plilnum) !~# a:regex | |
| 42 let plilnum = s:FindPrevLessIndentedLine(plilnum) | |
| 43 endwhile | |
| 44 return plilnum | |
| 45 endfunction | |
| 46 | |
|
9887
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
47 let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
48 \ '|\"%([^"\\]|\\.)*\"'. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
49 \ '|%(%(\:\ )@!.)*)\:%(\ |$)' |
| 3996 | 50 let s:liststartregex='\v^\s*%(\-%(\ |$))' |
| 51 | |
|
9887
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
52 let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
53 let s:c_ns_anchor_name = s:c_ns_anchor_char.'+' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
54 let s:c_ns_anchor_property = '\v\&'.s:c_ns_anchor_name |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
55 |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
56 let s:ns_word_char = '\v[[:alnum:]_\-]' |
| 20753 | 57 let s:ns_tag_char = '\v%('.s:ns_word_char.'|[#/;?:@&=+$.~*''()])' |
|
9887
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
58 let s:c_named_tag_handle = '\v\!'.s:ns_word_char.'+\!' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
59 let s:c_secondary_tag_handle = '\v\!\!' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
60 let s:c_primary_tag_handle = '\v\!' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
61 let s:c_tag_handle = '\v%('.s:c_named_tag_handle. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
62 \ '|'.s:c_secondary_tag_handle. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
63 \ '|'.s:c_primary_tag_handle.')' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
64 let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
65 let s:c_non_specific_tag = '\v\!' |
| 20753 | 66 let s:ns_uri_char = '\v%('.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])' |
|
9887
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
67 let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
68 let s:c_ns_tag_property = '\v'.s:c_verbatim_tag. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
69 \ '\v|'.s:c_ns_shorthand_tag. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
70 \ '\v|'.s:c_non_specific_tag |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
71 |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
72 let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?' |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
73 |
| 3996 | 74 function GetYAMLIndent(lnum) |
| 75 if a:lnum == 1 || !prevnonblank(a:lnum-1) | |
| 76 return 0 | |
| 77 endif | |
| 78 | |
| 79 let prevlnum = prevnonblank(a:lnum-1) | |
| 80 let previndent = indent(prevlnum) | |
| 81 | |
| 82 let line = getline(a:lnum) | |
| 83 if line =~# '^\s*#' && getline(a:lnum-1) =~# '^\s*#' | |
| 84 " Comment blocks should have identical indent | |
| 85 return previndent | |
| 86 elseif line =~# '^\s*[\]}]' | |
| 87 " Lines containing only closing braces should have previous indent | |
| 88 return indent(s:FindPrevLessIndentedLine(a:lnum)) | |
| 89 endif | |
| 90 | |
| 91 " Ignore comment lines when calculating indent | |
| 92 while getline(prevlnum) =~# '^\s*#' | |
| 93 let prevlnum = prevnonblank(prevlnum-1) | |
| 94 if !prevlnum | |
| 95 return previndent | |
| 96 endif | |
| 97 endwhile | |
| 98 | |
| 99 let prevline = getline(prevlnum) | |
| 100 let previndent = indent(prevlnum) | |
| 101 | |
| 102 " Any examples below assume that shiftwidth=2 | |
| 103 if prevline =~# '\v[{[:]$|[:-]\ [|>][+\-]?%(\s+\#.*|\s*)$' | |
| 104 " Mapping key: | |
| 105 " nested mapping: ... | |
| 106 " | |
| 107 " - { | |
| 108 " key: [ | |
| 109 " list value | |
| 110 " ] | |
| 111 " } | |
| 112 " | |
| 113 " - |- | |
| 114 " Block scalar without indentation indicator | |
| 11518 | 115 return previndent+shiftwidth() |
| 3996 | 116 elseif prevline =~# '\v[:-]\ [|>]%(\d+[+\-]?|[+\-]?\d+)%(\#.*|\s*)$' |
| 117 " - |+2 | |
| 118 " block scalar with indentation indicator | |
| 119 "#^^ indent+2, not indent+shiftwidth | |
| 120 return previndent + str2nr(matchstr(prevline, | |
| 121 \'\v([:-]\ [|>])@<=[+\-]?\d+%([+\-]?%(\s+\#.*|\s*)$)@=')) | |
| 122 elseif prevline =~# '\v\"%([^"\\]|\\.)*\\$' | |
| 123 " "Multiline string \ | |
| 124 " with escaped end" | |
| 125 let qidx = match(prevline, '\v\"%([^"\\]|\\.)*\\') | |
| 126 return virtcol([prevlnum, qidx+1]) | |
| 127 elseif line =~# s:liststartregex | |
| 128 " List line should have indent equal to previous list line unless it was | |
| 129 " caught by one of the previous rules | |
| 130 return indent(s:FindPrevLEIndentedLineMatchingRegex(a:lnum, | |
| 131 \ s:liststartregex)) | |
| 132 elseif line =~# s:mapkeyregex | |
| 133 " Same for line containing mapping key | |
|
7147
c590de398af9
commit https://github.com/vim/vim/commit/ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
Christian Brabandt <cb@256bit.org>
parents:
3996
diff
changeset
|
134 let prevmapline = s:FindPrevLEIndentedLineMatchingRegex(a:lnum, |
|
c590de398af9
commit https://github.com/vim/vim/commit/ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
Christian Brabandt <cb@256bit.org>
parents:
3996
diff
changeset
|
135 \ s:mapkeyregex) |
|
c590de398af9
commit https://github.com/vim/vim/commit/ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
Christian Brabandt <cb@256bit.org>
parents:
3996
diff
changeset
|
136 if getline(prevmapline) =~# '^\s*- ' |
|
c590de398af9
commit https://github.com/vim/vim/commit/ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
Christian Brabandt <cb@256bit.org>
parents:
3996
diff
changeset
|
137 return indent(prevmapline) + 2 |
|
c590de398af9
commit https://github.com/vim/vim/commit/ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
Christian Brabandt <cb@256bit.org>
parents:
3996
diff
changeset
|
138 else |
|
c590de398af9
commit https://github.com/vim/vim/commit/ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
Christian Brabandt <cb@256bit.org>
parents:
3996
diff
changeset
|
139 return indent(prevmapline) |
|
c590de398af9
commit https://github.com/vim/vim/commit/ca63501fbcd1cf9c8aa9ff12c093c95b62a89ed7
Christian Brabandt <cb@256bit.org>
parents:
3996
diff
changeset
|
140 endif |
| 3996 | 141 elseif prevline =~# '^\s*- ' |
| 142 " - List with | |
| 143 " multiline scalar | |
| 144 return previndent+2 | |
|
9887
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
145 elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
146 \ '\v|'.s:c_ns_anchor_property. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
147 \ '\v|'.s:block_scalar_header. |
|
b4da19b7539f
commit https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
Christian Brabandt <cb@256bit.org>
parents:
7228
diff
changeset
|
148 \ '\v)%(\s+|\s*%(\#.*)?$))*' |
| 3996 | 149 " Mapping with: value |
| 150 " that is multiline scalar | |
| 11518 | 151 return previndent+shiftwidth() |
| 3996 | 152 endif |
| 153 return previndent | |
| 154 endfunction | |
| 155 | |
| 156 let &cpo = s:save_cpo |