annotate runtime/indent/ruby.vim @ 25773:11b656e74444

Update runtime files Commit: https://github.com/vim/vim/commit/6c391a74fe90190796ca0b0c010112948a6e75d7 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Sep 9 21:55:11 2021 +0200 Update runtime files
author Bram Moolenaar <Bram@vim.org>
date Thu, 09 Sep 2021 22:00:10 +0200
parents 43593a5d873f
children e3d6184b89fa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 " Vim indent file
843
9f279ebda751 updated for version 7.0f01
vimboss
parents: 557
diff changeset
2 " Language: Ruby
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
3 " Maintainer: Andrew Radev <andrey.radev@gmail.com>
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
4 " Previous Maintainer: Nikolai Weibull <now at bitwi.se>
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
5 " URL: https://github.com/vim-ruby/vim-ruby
843
9f279ebda751 updated for version 7.0f01
vimboss
parents: 557
diff changeset
6 " Release Coordinator: Doug Kearns <dougkearns@gmail.com>
25056
43593a5d873f Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 23931
diff changeset
7 " Last Change: 2021 Feb 03
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
8
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
9 " 0. Initialization {{{1
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
10 " =================
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 " Only load this indent file when no other was loaded.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 if exists("b:did_indent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 let b:did_indent = 1
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
18 if !exists('g:ruby_indent_access_modifier_style')
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
19 " Possible values: "normal", "indent", "outdent"
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
20 let g:ruby_indent_access_modifier_style = 'normal'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
21 endif
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
22
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
23 if !exists('g:ruby_indent_assignment_style')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
24 " Possible values: "variable", "hanging"
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
25 let g:ruby_indent_assignment_style = 'hanging'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
26 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
27
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
28 if !exists('g:ruby_indent_block_style')
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
29 " Possible values: "expression", "do"
23931
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
30 let g:ruby_indent_block_style = 'do'
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
31 endif
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
32
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
33 if !exists('g:ruby_indent_hanging_elements')
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
34 " Non-zero means hanging indents are enabled, zero means disabled
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
35 let g:ruby_indent_hanging_elements = 1
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
36 endif
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
37
843
9f279ebda751 updated for version 7.0f01
vimboss
parents: 557
diff changeset
38 setlocal nosmartindent
9f279ebda751 updated for version 7.0f01
vimboss
parents: 557
diff changeset
39
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
40 " Now, set up our indentation expression and keys that trigger it.
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
41 setlocal indentexpr=GetRubyIndent(v:lnum)
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
42 setlocal indentkeys=0{,0},0),0],!^F,o,O,e,:,.
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
43 setlocal indentkeys+==end,=else,=elsif,=when,=ensure,=rescue,==begin,==end
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
44 setlocal indentkeys+==private,=protected,=public
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
45
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
46 " Only define the function once.
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
47 if exists("*GetRubyIndent")
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
48 finish
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
49 endif
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
50
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
51 let s:cpo_save = &cpo
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
52 set cpo&vim
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
53
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
54 " 1. Variables {{{1
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
55 " ============
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
56
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
57 " Syntax group names that are strings.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
58 let s:syng_string =
18857
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
59 \ ['String', 'Interpolation', 'InterpolationDelimiter', 'StringEscape']
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
60
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
61 " Syntax group names that are strings or documentation.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
62 let s:syng_stringdoc = s:syng_string + ['Documentation']
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
63
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
64 " Syntax group names that are or delimit strings/symbols/regexes or are comments.
18857
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
65 let s:syng_strcom = s:syng_stringdoc + [
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
66 \ 'Character',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
67 \ 'Comment',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
68 \ 'HeredocDelimiter',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
69 \ 'PercentRegexpDelimiter',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
70 \ 'PercentStringDelimiter',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
71 \ 'PercentSymbolDelimiter',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
72 \ 'Regexp',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
73 \ 'RegexpCharClass',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
74 \ 'RegexpDelimiter',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
75 \ 'RegexpEscape',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
76 \ 'StringDelimiter',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
77 \ 'Symbol',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
78 \ 'SymbolDelimiter',
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
79 \ ]
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
80
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
81 " Expression used to check whether we should skip a match with searchpair().
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
82 let s:skip_expr =
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
83 \ 'index(map('.string(s:syng_strcom).',"hlID(''ruby''.v:val)"), synID(line("."),col("."),1)) >= 0'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
84
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
85 " Regex used for words that, at the start of a line, add a level of indent.
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
86 let s:ruby_indent_keywords =
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
87 \ '^\s*\zs\<\%(module\|class\|if\|for' .
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
88 \ '\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure\|rescue' .
18857
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
89 \ '\|\%(\K\k*[!?]\?\s\+\)\=def\):\@!\>' .
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
90 \ '\|\%([=,*/%+-]\|<<\|>>\|:\s\)\s*\zs' .
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
91 \ '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
92
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
93 " Regex used for words that, at the start of a line, remove a level of indent.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
94 let s:ruby_deindent_keywords =
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
95 \ '^\s*\zs\<\%(ensure\|else\|rescue\|elsif\|when\|end\):\@!\>'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
96
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
97 " Regex that defines the start-match for the 'end' keyword.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
98 "let s:end_start_regex = '\%(^\|[^.]\)\<\%(module\|class\|def\|if\|for\|while\|until\|case\|unless\|begin\|do\)\>'
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
99 " TODO: the do here should be restricted somewhat (only at end of line)?
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
100 let s:end_start_regex =
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
101 \ '\C\%(^\s*\|[=,*/%+\-|;{]\|<<\|>>\|:\s\)\s*\zs' .
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
102 \ '\<\%(module\|class\|if\|for\|while\|until\|case\|unless\|begin' .
18857
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
103 \ '\|\%(\K\k*[!?]\?\s\+\)\=def\):\@!\>' .
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
104 \ '\|\%(^\|[^.:@$]\)\@<=\<do:\@!\>'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
105
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
106 " Regex that defines the middle-match for the 'end' keyword.
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
107 let s:end_middle_regex = '\<\%(ensure\|else\|\%(\%(^\|;\)\s*\)\@<=\<rescue:\@!\>\|when\|elsif\):\@!\>'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
108
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
109 " Regex that defines the end-match for the 'end' keyword.
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
110 let s:end_end_regex = '\%(^\|[^.:@$]\)\@<=\<end:\@!\>'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
111
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
112 " Expression used for searchpair() call for finding match for 'end' keyword.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
113 let s:end_skip_expr = s:skip_expr .
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
114 \ ' || (expand("<cword>") == "do"' .
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
115 \ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\):\\@!\\>")'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
116
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
117 " Regex that defines continuation lines, not including (, {, or [.
10272
57b2b8268d3a commit https://github.com/vim/vim/commit/4575876dc865d4160f20d61bd822fbe7cafbec41
Christian Brabandt <cb@256bit.org>
parents: 10048
diff changeset
118 let s:non_bracket_continuation_regex =
57b2b8268d3a commit https://github.com/vim/vim/commit/4575876dc865d4160f20d61bd822fbe7cafbec41
Christian Brabandt <cb@256bit.org>
parents: 10048
diff changeset
119 \ '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
120
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
121 " Regex that defines continuation lines.
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
122 let s:continuation_regex =
10272
57b2b8268d3a commit https://github.com/vim/vim/commit/4575876dc865d4160f20d61bd822fbe7cafbec41
Christian Brabandt <cb@256bit.org>
parents: 10048
diff changeset
123 \ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
124
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
125 " Regex that defines continuable keywords
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
126 let s:continuable_regex =
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
127 \ '\C\%(^\s*\|[=,*/%+\-|;{]\|<<\|>>\|:\s\)\s*\zs' .
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
128 \ '\<\%(if\|for\|while\|until\|unless\):\@!\>'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
129
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
130 " Regex that defines bracket continuations
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
131 let s:bracket_continuation_regex = '%\@<!\%([({[]\)\s*\%(#.*\)\=$'
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
132
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
133 " Regex that defines dot continuations
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
134 let s:dot_continuation_regex = '%\@<!\.\s*\%(#.*\)\=$'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
135
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
136 " Regex that defines backslash continuations
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
137 let s:backslash_continuation_regex = '%\@<!\\\s*$'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
138
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
139 " Regex that defines end of bracket continuation followed by another continuation
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
140 let s:bracket_switch_continuation_regex = '^\([^(]\+\zs).\+\)\+'.s:continuation_regex
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
141
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
142 " Regex that defines the first part of a splat pattern
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
143 let s:splat_regex = '[[,(]\s*\*\s*\%(#.*\)\=$'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
144
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
145 " Regex that describes all indent access modifiers
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
146 let s:access_modifier_regex = '\C^\s*\%(public\|protected\|private\)\s*\%(#.*\)\=$'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
147
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
148 " Regex that describes the indent access modifiers (excludes public)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
149 let s:indent_access_modifier_regex = '\C^\s*\%(protected\|private\)\s*\%(#.*\)\=$'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
150
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
151 " Regex that defines blocks.
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
152 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
153 " Note that there's a slight problem with this regex and s:continuation_regex.
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
154 " Code like this will be matched by both:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
155 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
156 " method_call do |(a, b)|
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
157 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
158 " The reason is that the pipe matches a hanging "|" operator.
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
159 "
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
160 let s:block_regex =
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
161 \ '\%(\<do:\@!\>\|%\@<!{\)\s*\%(|[^|]*|\)\=\s*\%(#.*\)\=$'
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
162
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
163 let s:block_continuation_regex = '^\s*[^])}\t ].*'.s:block_regex
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
164
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
165 " Regex that describes a leading operator (only a method call's dot for now)
18857
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
166 let s:leading_operator_regex = '^\s*\%(&\=\.\)'
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
167
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
168 " 2. GetRubyIndent Function {{{1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
169 " =========================
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
170
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
171 function! GetRubyIndent(...) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
172 " 2.1. Setup {{{2
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
173 " ----------
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
174
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
175 let indent_info = {}
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
176
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
177 " The value of a single shift-width
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
178 if exists('*shiftwidth')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
179 let indent_info.sw = shiftwidth()
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
180 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
181 let indent_info.sw = &sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
182 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
183
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
184 " For the current line, use the first argument if given, else v:lnum
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
185 let indent_info.clnum = a:0 ? a:1 : v:lnum
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
186 let indent_info.cline = getline(indent_info.clnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
187
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
188 " Set up variables for restoring position in file. Could use clnum here.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
189 let indent_info.col = col('.')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
190
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
191 " 2.2. Work on the current line {{{2
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
192 " -----------------------------
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
193 let indent_callback_names = [
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
194 \ 's:AccessModifier',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
195 \ 's:ClosingBracketOnEmptyLine',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
196 \ 's:BlockComment',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
197 \ 's:DeindentingKeyword',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
198 \ 's:MultilineStringOrLineComment',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
199 \ 's:ClosingHeredocDelimiter',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
200 \ 's:LeadingOperator',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
201 \ ]
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
202
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
203 for callback_name in indent_callback_names
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
204 " Decho "Running: ".callback_name
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
205 let indent = call(function(callback_name), [indent_info])
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
206
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
207 if indent >= 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
208 " Decho "Match: ".callback_name." indent=".indent." info=".string(indent_info)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
209 return indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
210 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
211 endfor
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
212
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
213 " 2.3. Work on the previous line. {{{2
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
214 " -------------------------------
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
215
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
216 " Special case: we don't need the real s:PrevNonBlankNonString for an empty
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
217 " line inside a string. And that call can be quite expensive in that
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
218 " particular situation.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
219 let indent_callback_names = [
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
220 \ 's:EmptyInsideString',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
221 \ ]
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
222
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
223 for callback_name in indent_callback_names
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
224 " Decho "Running: ".callback_name
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
225 let indent = call(function(callback_name), [indent_info])
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
226
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
227 if indent >= 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
228 " Decho "Match: ".callback_name." indent=".indent." info=".string(indent_info)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
229 return indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
230 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
231 endfor
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
232
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
233 " Previous line number
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
234 let indent_info.plnum = s:PrevNonBlankNonString(indent_info.clnum - 1)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
235 let indent_info.pline = getline(indent_info.plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
236
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
237 let indent_callback_names = [
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
238 \ 's:StartOfFile',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
239 \ 's:AfterAccessModifier',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
240 \ 's:ContinuedLine',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
241 \ 's:AfterBlockOpening',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
242 \ 's:AfterHangingSplat',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
243 \ 's:AfterUnbalancedBracket',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
244 \ 's:AfterLeadingOperator',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
245 \ 's:AfterEndKeyword',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
246 \ 's:AfterIndentKeyword',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
247 \ ]
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
248
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
249 for callback_name in indent_callback_names
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
250 " Decho "Running: ".callback_name
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
251 let indent = call(function(callback_name), [indent_info])
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
252
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
253 if indent >= 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
254 " Decho "Match: ".callback_name." indent=".indent." info=".string(indent_info)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
255 return indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
256 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
257 endfor
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
258
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
259 " 2.4. Work on the MSL line. {{{2
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
260 " --------------------------
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
261 let indent_callback_names = [
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
262 \ 's:PreviousNotMSL',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
263 \ 's:IndentingKeywordInMSL',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
264 \ 's:ContinuedHangingOperator',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
265 \ ]
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
266
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
267 " Most Significant line based on the previous one -- in case it's a
25773
11b656e74444 Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 25056
diff changeset
268 " continuation of something above
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
269 let indent_info.plnum_msl = s:GetMSL(indent_info.plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
270
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
271 for callback_name in indent_callback_names
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
272 " Decho "Running: ".callback_name
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
273 let indent = call(function(callback_name), [indent_info])
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
274
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
275 if indent >= 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
276 " Decho "Match: ".callback_name." indent=".indent." info=".string(indent_info)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
277 return indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
278 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
279 endfor
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
280
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
281 " }}}2
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
282
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
283 " By default, just return the previous line's indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
284 " Decho "Default case matched"
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
285 return indent(indent_info.plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
286 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
287
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
288 " 3. Indenting Logic Callbacks {{{1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
289 " ============================
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
290
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
291 function! s:AccessModifier(cline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
292 let info = a:cline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
293
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
294 " If this line is an access modifier keyword, align according to the closest
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
295 " class declaration.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
296 if g:ruby_indent_access_modifier_style == 'indent'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
297 if s:Match(info.clnum, s:access_modifier_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
298 let class_lnum = s:FindContainingClass()
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
299 if class_lnum > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
300 return indent(class_lnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
301 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
302 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
303 elseif g:ruby_indent_access_modifier_style == 'outdent'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
304 if s:Match(info.clnum, s:access_modifier_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
305 let class_lnum = s:FindContainingClass()
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
306 if class_lnum > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
307 return indent(class_lnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
308 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
309 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
310 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
311
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
312 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
313 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
314
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
315 function! s:ClosingBracketOnEmptyLine(cline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
316 let info = a:cline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
317
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
318 " If we got a closing bracket on an empty line, find its match and indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
319 " according to it. For parentheses we indent to its column - 1, for the
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
320 " others we indent to the containing line's MSL's level. Return -1 if fail.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
321 let col = matchend(info.cline, '^\s*[]})]')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
322
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
323 if col > 0 && !s:IsInStringOrComment(info.clnum, col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
324 call cursor(info.clnum, col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
325 let closing_bracket = info.cline[col - 1]
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
326 let bracket_pair = strpart('(){}[]', stridx(')}]', closing_bracket) * 2, 2)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
327
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
328 if searchpair(escape(bracket_pair[0], '\['), '', bracket_pair[1], 'bW', s:skip_expr) > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
329 if closing_bracket == ')' && col('.') != col('$') - 1
23931
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
330 if g:ruby_indent_hanging_elements
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
331 let ind = virtcol('.') - 1
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
332 else
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
333 let ind = indent(line('.'))
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
334 end
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
335 elseif g:ruby_indent_block_style == 'do'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
336 let ind = indent(line('.'))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
337 else " g:ruby_indent_block_style == 'expression'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
338 let ind = indent(s:GetMSL(line('.')))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
339 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
340 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
341
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
342 return ind
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
343 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
344
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
345 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
346 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
347
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
348 function! s:BlockComment(cline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
349 " If we have a =begin or =end set indent to first column.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
350 if match(a:cline_info.cline, '^\s*\%(=begin\|=end\)$') != -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
351 return 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
352 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
353 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
354 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
355
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
356 function! s:DeindentingKeyword(cline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
357 let info = a:cline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
358
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
359 " If we have a deindenting keyword, find its match and indent to its level.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
360 " TODO: this is messy
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
361 if s:Match(info.clnum, s:ruby_deindent_keywords)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
362 call cursor(info.clnum, 1)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
363
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
364 if searchpair(s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'bW',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
365 \ s:end_skip_expr) > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
366 let msl = s:GetMSL(line('.'))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
367 let line = getline(line('.'))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
368
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
369 if s:IsAssignment(line, col('.')) &&
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
370 \ strpart(line, col('.') - 1, 2) !~ 'do'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
371 " assignment to case/begin/etc, on the same line
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
372 if g:ruby_indent_assignment_style == 'hanging'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
373 " hanging indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
374 let ind = virtcol('.') - 1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
375 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
376 " align with variable
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
377 let ind = indent(line('.'))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
378 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
379 elseif g:ruby_indent_block_style == 'do'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
380 " align to line of the "do", not to the MSL
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
381 let ind = indent(line('.'))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
382 elseif getline(msl) =~ '=\s*\(#.*\)\=$'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
383 " in the case of assignment to the MSL, align to the starting line,
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
384 " not to the MSL
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
385 let ind = indent(line('.'))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
386 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
387 " align to the MSL
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
388 let ind = indent(msl)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
389 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
390 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
391 return ind
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
392 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
393
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
394 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
395 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
396
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
397 function! s:MultilineStringOrLineComment(cline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
398 let info = a:cline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
399
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
400 " If we are in a multi-line string or line-comment, don't do anything to it.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
401 if s:IsInStringOrDocumentation(info.clnum, matchend(info.cline, '^\s*') + 1)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
402 return indent(info.clnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
403 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
404 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
405 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
406
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
407 function! s:ClosingHeredocDelimiter(cline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
408 let info = a:cline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
409
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
410 " If we are at the closing delimiter of a "<<" heredoc-style string, set the
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
411 " indent to 0.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
412 if info.cline =~ '^\k\+\s*$'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
413 \ && s:IsInStringDelimiter(info.clnum, 1)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
414 \ && search('\V<<'.info.cline, 'nbW') > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
415 return 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
416 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
417
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
418 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
419 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
420
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
421 function! s:LeadingOperator(cline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
422 " If the current line starts with a leading operator, add a level of indent.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
423 if s:Match(a:cline_info.clnum, s:leading_operator_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
424 return indent(s:GetMSL(a:cline_info.clnum)) + a:cline_info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
425 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
426 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
427 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
428
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
429 function! s:EmptyInsideString(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
430 " If the line is empty and inside a string (the previous line is a string,
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
431 " too), use the previous line's indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
432 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
433
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
434 let plnum = prevnonblank(info.clnum - 1)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
435 let pline = getline(plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
436
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
437 if info.cline =~ '^\s*$'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
438 \ && s:IsInStringOrComment(plnum, 1)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
439 \ && s:IsInStringOrComment(plnum, strlen(pline))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
440 return indent(plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
441 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
442 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
443 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
444
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
445 function! s:StartOfFile(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
446 " At the start of the file use zero indent.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
447 if a:pline_info.plnum == 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
448 return 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
449 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
450 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
451 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
452
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
453 function! s:AfterAccessModifier(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
454 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
455
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
456 if g:ruby_indent_access_modifier_style == 'indent'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
457 " If the previous line was a private/protected keyword, add a
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
458 " level of indent.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
459 if s:Match(info.plnum, s:indent_access_modifier_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
460 return indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
461 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
462 elseif g:ruby_indent_access_modifier_style == 'outdent'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
463 " If the previous line was a private/protected/public keyword, add
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
464 " a level of indent, since the keyword has been out-dented.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
465 if s:Match(info.plnum, s:access_modifier_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
466 return indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
467 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
468 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
469 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
470 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
471
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
472 " Example:
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
473 "
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
474 " if foo || bar ||
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
475 " baz || bing
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
476 " puts "foo"
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
477 " end
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
478 "
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
479 function! s:ContinuedLine(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
480 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
481
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
482 let col = s:Match(info.plnum, s:ruby_indent_keywords)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
483 if s:Match(info.plnum, s:continuable_regex) &&
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
484 \ s:Match(info.plnum, s:continuation_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
485 if col > 0 && s:IsAssignment(info.pline, col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
486 if g:ruby_indent_assignment_style == 'hanging'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
487 " hanging indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
488 let ind = col - 1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
489 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
490 " align with variable
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
491 let ind = indent(info.plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
492 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
493 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
494 let ind = indent(s:GetMSL(info.plnum))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
495 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
496 return ind + info.sw + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
497 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
498 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
499 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
500
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
501 function! s:AfterBlockOpening(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
502 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
503
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
504 " If the previous line ended with a block opening, add a level of indent.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
505 if s:Match(info.plnum, s:block_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
506 if g:ruby_indent_block_style == 'do'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
507 " don't align to the msl, align to the "do"
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
508 let ind = indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
509 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
510 let plnum_msl = s:GetMSL(info.plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
511
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
512 if getline(plnum_msl) =~ '=\s*\(#.*\)\=$'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
513 " in the case of assignment to the msl, align to the starting line,
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
514 " not to the msl
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
515 let ind = indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
516 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
517 let ind = indent(plnum_msl) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
518 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
519 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
520
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
521 return ind
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
522 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
523
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
524 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
525 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
526
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
527 function! s:AfterLeadingOperator(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
528 " If the previous line started with a leading operator, use its MSL's level
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
529 " of indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
530 if s:Match(a:pline_info.plnum, s:leading_operator_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
531 return indent(s:GetMSL(a:pline_info.plnum))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
532 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
533 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
534 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
535
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
536 function! s:AfterHangingSplat(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
537 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
538
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
539 " If the previous line ended with the "*" of a splat, add a level of indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
540 if info.pline =~ s:splat_regex
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
541 return indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
542 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
543 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
544 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
545
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
546 function! s:AfterUnbalancedBracket(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
547 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
548
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
549 " If the previous line contained unclosed opening brackets and we are still
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
550 " in them, find the rightmost one and add indent depending on the bracket
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
551 " type.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
552 "
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
553 " If it contained hanging closing brackets, find the rightmost one, find its
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
554 " match and indent according to that.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
555 if info.pline =~ '[[({]' || info.pline =~ '[])}]\s*\%(#.*\)\=$'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
556 let [opening, closing] = s:ExtraBrackets(info.plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
557
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
558 if opening.pos != -1
23931
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
559 if !g:ruby_indent_hanging_elements
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
560 return indent(info.plnum) + info.sw
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
561 elseif opening.type == '(' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
562 if col('.') + 1 == col('$')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
563 return indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
564 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
565 return virtcol('.')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
566 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
567 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
568 let nonspace = matchend(info.pline, '\S', opening.pos + 1) - 1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
569 return nonspace > 0 ? nonspace : indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
570 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
571 elseif closing.pos != -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
572 call cursor(info.plnum, closing.pos + 1)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
573 normal! %
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
574
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
575 if s:Match(line('.'), s:ruby_indent_keywords)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
576 return indent('.') + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
577 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
578 return indent(s:GetMSL(line('.')))
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
579 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
580 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
581 call cursor(info.clnum, info.col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
582 end
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
583 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
584
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
585 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
586 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
587
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
588 function! s:AfterEndKeyword(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
589 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
590 " If the previous line ended with an "end", match that "end"s beginning's
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
591 " indent.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
592 let col = s:Match(info.plnum, '\%(^\|[^.:@$]\)\<end\>\s*\%(#.*\)\=$')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
593 if col > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
594 call cursor(info.plnum, col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
595 if searchpair(s:end_start_regex, '', s:end_end_regex, 'bW',
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
596 \ s:end_skip_expr) > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
597 let n = line('.')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
598 let ind = indent('.')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
599 let msl = s:GetMSL(n)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
600 if msl != n
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
601 let ind = indent(msl)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
602 end
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
603 return ind
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
604 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
605 end
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
606 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
607 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
608
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
609 function! s:AfterIndentKeyword(pline_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
610 let info = a:pline_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
611 let col = s:Match(info.plnum, s:ruby_indent_keywords)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
612
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
613 if col > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
614 call cursor(info.plnum, col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
615 let ind = virtcol('.') - 1 + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
616 " TODO: make this better (we need to count them) (or, if a searchpair
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
617 " fails, we know that something is lacking an end and thus we indent a
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
618 " level
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
619 if s:Match(info.plnum, s:end_end_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
620 let ind = indent('.')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
621 elseif s:IsAssignment(info.pline, col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
622 if g:ruby_indent_assignment_style == 'hanging'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
623 " hanging indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
624 let ind = col + info.sw - 1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
625 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
626 " align with variable
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
627 let ind = indent(info.plnum) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
628 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
629 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
630 return ind
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
631 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
632
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
633 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
634 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
635
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
636 function! s:PreviousNotMSL(msl_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
637 let info = a:msl_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
638
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
639 " If the previous line wasn't a MSL
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
640 if info.plnum != info.plnum_msl
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
641 " If previous line ends bracket and begins non-bracket continuation decrease indent by 1.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
642 if s:Match(info.plnum, s:bracket_switch_continuation_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
643 " TODO (2016-10-07) Wrong/unused? How could it be "1"?
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
644 return indent(info.plnum) - 1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
645 " If previous line is a continuation return its indent.
23931
5b37a0bf7e3a Update runtime files
Bram Moolenaar <Bram@vim.org>
parents: 18857
diff changeset
646 elseif s:Match(info.plnum, s:non_bracket_continuation_regex)
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
647 return indent(info.plnum)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
648 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
649 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
650
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
651 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
652 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
653
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
654 function! s:IndentingKeywordInMSL(msl_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
655 let info = a:msl_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
656 " If the MSL line had an indenting keyword in it, add a level of indent.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
657 " TODO: this does not take into account contrived things such as
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
658 " module Foo; class Bar; end
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
659 let col = s:Match(info.plnum_msl, s:ruby_indent_keywords)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
660 if col > 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
661 let ind = indent(info.plnum_msl) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
662 if s:Match(info.plnum_msl, s:end_end_regex)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
663 let ind = ind - info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
664 elseif s:IsAssignment(getline(info.plnum_msl), col)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
665 if g:ruby_indent_assignment_style == 'hanging'
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
666 " hanging indent
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
667 let ind = col + info.sw - 1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
668 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
669 " align with variable
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
670 let ind = indent(info.plnum_msl) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
671 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
672 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
673 return ind
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
674 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
675 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
676 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
677
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
678 function! s:ContinuedHangingOperator(msl_info) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
679 let info = a:msl_info
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
680
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
681 " If the previous line ended with [*+/.,-=], but wasn't a block ending or a
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
682 " closing bracket, indent one extra level.
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
683 if s:Match(info.plnum_msl, s:non_bracket_continuation_regex) && !s:Match(info.plnum_msl, '^\s*\([\])}]\|end\)')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
684 if info.plnum_msl == info.plnum
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
685 let ind = indent(info.plnum_msl) + info.sw
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
686 else
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
687 let ind = indent(info.plnum_msl)
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
688 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
689 return ind
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
690 endif
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
691
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
692 return -1
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
693 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
694
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
695 " 4. Auxiliary Functions {{{1
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
696 " ======================
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
697
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
698 function! s:IsInRubyGroup(groups, lnum, col) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
699 let ids = map(copy(a:groups), 'hlID("ruby".v:val)')
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
700 return index(ids, synID(a:lnum, a:col, 1)) >= 0
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
701 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
702
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
703 " Check if the character at lnum:col is inside a string, comment, or is ascii.
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
704 function! s:IsInStringOrComment(lnum, col) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
705 return s:IsInRubyGroup(s:syng_strcom, a:lnum, a:col)
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
706 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
707
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
708 " Check if the character at lnum:col is inside a string.
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
709 function! s:IsInString(lnum, col) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
710 return s:IsInRubyGroup(s:syng_string, a:lnum, a:col)
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
711 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
712
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
713 " Check if the character at lnum:col is inside a string or documentation.
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
714 function! s:IsInStringOrDocumentation(lnum, col) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
715 return s:IsInRubyGroup(s:syng_stringdoc, a:lnum, a:col)
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
716 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
717
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
718 " Check if the character at lnum:col is inside a string delimiter
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
719 function! s:IsInStringDelimiter(lnum, col) abort
18857
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
720 return s:IsInRubyGroup(
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
721 \ ['HeredocDelimiter', 'PercentStringDelimiter', 'StringDelimiter'],
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
722 \ a:lnum, a:col
70ce979e76bc Update a few runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 15512
diff changeset
723 \ )
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
724 endfunction
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
725
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
726 function! s:IsAssignment(str, pos) abort
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
727 return strpart(a:str, 0, a:pos - 1) =~ '=\s*$'
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
728 endfunction
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
729
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
730 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
731 function! s:PrevNonBlankNonString(lnum) abort
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
732 let in_block = 0
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
733 let lnum = prevnonblank(a:lnum)
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
734 while lnum > 0
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
735 " Go in and out of blocks comments as necessary.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
736 " If the line isn't empty (with opt. comment) or in a string, end search.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
737 let line = getline(lnum)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
738 if line =~ '^=begin'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
739 if in_block
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
740 let in_block = 0
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
741 else
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
742 break
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
743 endif
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
744 elseif !in_block && line =~ '^=end'
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
745 let in_block = 1
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
746 elseif !in_block && line !~ '^\s*#.*$' && !(s:IsInStringOrComment(lnum, 1)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
747 \ && s:IsInStringOrComment(lnum, strlen(line)))
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
748 break
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
749 endif
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
750 let lnum = prevnonblank(lnum - 1)
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
751 endwhile
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
752 return lnum
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
753 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
754
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
755 " Find line above 'lnum' that started the continuation 'lnum' may be part of.
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
756 function! s:GetMSL(lnum) abort
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
757 " Start on the line we're at and use its indent.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
758 let msl = a:lnum
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
759 let lnum = s:PrevNonBlankNonString(a:lnum - 1)
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
760 while lnum > 0
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
761 " If we have a continuation line, or we're in a string, use line as MSL.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
762 " Otherwise, terminate search as we have found our MSL already.
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
763 let line = getline(lnum)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
764
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
765 if !s:Match(msl, s:backslash_continuation_regex) &&
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
766 \ s:Match(lnum, s:backslash_continuation_regex)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
767 " If the current line doesn't end in a backslash, but the previous one
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
768 " does, look for that line's msl
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
769 "
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
770 " Example:
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
771 " foo = "bar" \
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
772 " "baz"
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
773 "
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
774 let msl = lnum
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
775 elseif s:Match(msl, s:leading_operator_regex)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
776 " If the current line starts with a leading operator, keep its indent
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
777 " and keep looking for an MSL.
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
778 let msl = lnum
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
779 elseif s:Match(lnum, s:splat_regex)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
780 " If the above line looks like the "*" of a splat, use the current one's
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
781 " indentation.
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
782 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
783 " Example:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
784 " Hash[*
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
785 " method_call do
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
786 " something
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
787 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
788 return msl
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
789 elseif s:Match(lnum, s:non_bracket_continuation_regex) &&
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
790 \ s:Match(msl, s:non_bracket_continuation_regex)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
791 " If the current line is a non-bracket continuation and so is the
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
792 " previous one, keep its indent and continue looking for an MSL.
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
793 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
794 " Example:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
795 " method_call one,
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
796 " two,
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
797 " three
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
798 "
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
799 let msl = lnum
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
800 elseif s:Match(lnum, s:dot_continuation_regex) &&
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
801 \ (s:Match(msl, s:bracket_continuation_regex) || s:Match(msl, s:block_continuation_regex))
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
802 " If the current line is a bracket continuation or a block-starter, but
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
803 " the previous is a dot, keep going to see if the previous line is the
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
804 " start of another continuation.
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
805 "
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
806 " Example:
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
807 " parent.
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
808 " method_call {
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
809 " three
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
810 "
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
811 let msl = lnum
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
812 elseif s:Match(lnum, s:non_bracket_continuation_regex) &&
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
813 \ (s:Match(msl, s:bracket_continuation_regex) || s:Match(msl, s:block_continuation_regex))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
814 " If the current line is a bracket continuation or a block-starter, but
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
815 " the previous is a non-bracket one, respect the previous' indentation,
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
816 " and stop here.
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
817 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
818 " Example:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
819 " method_call one,
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
820 " two {
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
821 " three
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
822 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
823 return lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
824 elseif s:Match(lnum, s:bracket_continuation_regex) &&
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
825 \ (s:Match(msl, s:bracket_continuation_regex) || s:Match(msl, s:block_continuation_regex))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
826 " If both lines are bracket continuations (the current may also be a
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
827 " block-starter), use the current one's and stop here
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
828 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
829 " Example:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
830 " method_call(
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
831 " other_method_call(
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
832 " foo
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
833 return msl
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
834 elseif s:Match(lnum, s:block_regex) &&
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
835 \ !s:Match(msl, s:continuation_regex) &&
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
836 \ !s:Match(msl, s:block_continuation_regex)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
837 " If the previous line is a block-starter and the current one is
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
838 " mostly ordinary, use the current one as the MSL.
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
839 "
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
840 " Example:
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
841 " method_call do
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
842 " something
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
843 " something_else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
844 return msl
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
845 else
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
846 let col = match(line, s:continuation_regex) + 1
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
847 if (col > 0 && !s:IsInStringOrComment(lnum, col))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
848 \ || s:IsInString(lnum, strlen(line))
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
849 let msl = lnum
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
850 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
851 break
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
852 endif
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
853 endif
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
854
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
855 let lnum = s:PrevNonBlankNonString(lnum - 1)
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
856 endwhile
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
857 return msl
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
858 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
859
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
860 " Check if line 'lnum' has more opening brackets than closing ones.
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
861 function! s:ExtraBrackets(lnum) abort
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
862 let opening = {'parentheses': [], 'braces': [], 'brackets': []}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
863 let closing = {'parentheses': [], 'braces': [], 'brackets': []}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
864
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
865 let line = getline(a:lnum)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
866 let pos = match(line, '[][(){}]', 0)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
867
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
868 " Save any encountered opening brackets, and remove them once a matching
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
869 " closing one has been found. If a closing bracket shows up that doesn't
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
870 " close anything, save it for later.
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
871 while pos != -1
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
872 if !s:IsInStringOrComment(a:lnum, pos + 1)
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
873 if line[pos] == '('
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
874 call add(opening.parentheses, {'type': '(', 'pos': pos})
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
875 elseif line[pos] == ')'
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
876 if empty(opening.parentheses)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
877 call add(closing.parentheses, {'type': ')', 'pos': pos})
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
878 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
879 let opening.parentheses = opening.parentheses[0:-2]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
880 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
881 elseif line[pos] == '{'
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
882 call add(opening.braces, {'type': '{', 'pos': pos})
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
883 elseif line[pos] == '}'
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
884 if empty(opening.braces)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
885 call add(closing.braces, {'type': '}', 'pos': pos})
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
886 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
887 let opening.braces = opening.braces[0:-2]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
888 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
889 elseif line[pos] == '['
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
890 call add(opening.brackets, {'type': '[', 'pos': pos})
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
891 elseif line[pos] == ']'
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
892 if empty(opening.brackets)
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
893 call add(closing.brackets, {'type': ']', 'pos': pos})
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
894 else
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
895 let opening.brackets = opening.brackets[0:-2]
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
896 endif
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
897 endif
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
898 endif
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
899
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
900 let pos = match(line, '[][(){}]', pos + 1)
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
901 endwhile
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
902
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
903 " Find the rightmost brackets, since they're the ones that are important in
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
904 " both opening and closing cases
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
905 let rightmost_opening = {'type': '(', 'pos': -1}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
906 let rightmost_closing = {'type': ')', 'pos': -1}
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
907
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
908 for opening in opening.parentheses + opening.braces + opening.brackets
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
909 if opening.pos > rightmost_opening.pos
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
910 let rightmost_opening = opening
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
911 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
912 endfor
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
913
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
914 for closing in closing.parentheses + closing.braces + closing.brackets
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
915 if closing.pos > rightmost_closing.pos
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
916 let rightmost_closing = closing
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
917 endif
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
918 endfor
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
919
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
920 return [rightmost_opening, rightmost_closing]
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
921 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
922
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
923 function! s:Match(lnum, regex) abort
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
924 let line = getline(a:lnum)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
925 let offset = match(line, '\C'.a:regex)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
926 let col = offset + 1
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
927
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
928 while offset > -1 && s:IsInStringOrComment(a:lnum, col)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
929 let offset = match(line, '\C'.a:regex, offset + 1)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
930 let col = offset + 1
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
931 endwhile
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
932
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
933 if offset > -1
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
934 return col
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
935 else
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
936 return 0
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
937 endif
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
938 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
939
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
940 " Locates the containing class/module's definition line, ignoring nested classes
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
941 " along the way.
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
942 "
15512
f0f06837a699 Update runtime files.
Bram Moolenaar <Bram@vim.org>
parents: 11518
diff changeset
943 function! s:FindContainingClass() abort
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
944 let saved_position = getpos('.')
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
945
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
946 while searchpair(s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'bW',
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
947 \ s:end_skip_expr) > 0
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
948 if expand('<cword>') =~# '\<class\|module\>'
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
949 let found_lnum = line('.')
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
950 call setpos('.', saved_position)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
951 return found_lnum
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
952 endif
10272
57b2b8268d3a commit https://github.com/vim/vim/commit/4575876dc865d4160f20d61bd822fbe7cafbec41
Christian Brabandt <cb@256bit.org>
parents: 10048
diff changeset
953 endwhile
10048
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
954
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
955 call setpos('.', saved_position)
43efa4f5a8ea commit https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
Christian Brabandt <cb@256bit.org>
parents: 4869
diff changeset
956 return 0
530
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
957 endfunction
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
958
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
959 " }}}1
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
960
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
961 let &cpo = s:cpo_save
339999b511a0 updated for version 7.0148
vimboss
parents: 7
diff changeset
962 unlet s:cpo_save
1121
e63691e7c504 updated for version 7.1a
vimboss
parents: 843
diff changeset
963
4869
a5352e73dc00 Update runtime files.
Bram Moolenaar <bram@vim.org>
parents: 2225
diff changeset
964 " vim:set sw=2 sts=2 ts=8 et: