annotate runtime/indent/ruby.vim @ 18675:a0bd0a022bd4 v8.1.2329

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