Mercurial > vim
annotate runtime/indent/j.vim @ 19975:4e8e0ce576af v8.2.0543
patch 8.2.0543: Vim9: function with varargs does not work properly
Commit: https://github.com/vim/vim/commit/1378fbc4591b77186c90beda37bdac628add4cb6
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 11 20:50:33 2020 +0200
patch 8.2.0543: Vim9: function with varargs does not work properly
Problem: Vim9: function with varargs does not work properly.
Solution: Improve function type spec and add tests. Fix bugs.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 11 Apr 2020 21:00:04 +0200 |
| parents | cb3163d590a1 |
| children |
| rev | line source |
|---|---|
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1 " Vim indent file |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
2 " Language: J |
| 18639 | 3 " Maintainer: David Bürgin <dbuergin@gluet.ch> |
| 4 " URL: https://gitlab.com/glts/vim-j | |
| 6505 | 5 " Last Change: 2015-01-11 |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
6 |
| 5734 | 7 if exists('b:did_indent') |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
8 finish |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
9 endif |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
10 let b:did_indent = 1 |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
11 |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
12 setlocal indentexpr=GetJIndent() |
| 5815 | 13 setlocal indentkeys-=0{,0},:,0# |
| 14 setlocal indentkeys+=0),0<:>,=case.,=catch.,=catchd.,=catcht.,=do.,=else.,=elseif.,=end.,=fcase. | |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
15 |
| 5734 | 16 let b:undo_indent = 'setlocal indentkeys< indentexpr<' |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
17 |
| 5734 | 18 if exists('*GetJIndent') |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
19 finish |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
20 endif |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
21 |
| 5815 | 22 " If g:j_indent_definitions is true, the bodies of explicit definitions of |
| 23 " adverbs, conjunctions, and verbs will be indented. Default is false (0). | |
| 24 if !exists('g:j_indent_definitions') | |
| 25 let g:j_indent_definitions = 0 | |
| 26 endif | |
| 27 | |
| 28 function GetJIndent() abort | |
| 6505 | 29 let l:prevlnum = prevnonblank(v:lnum - 1) |
| 30 if l:prevlnum == 0 | |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
31 return 0 |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
32 endif |
| 6505 | 33 let l:indent = indent(l:prevlnum) |
| 34 let l:prevline = getline(l:prevlnum) | |
| 35 if l:prevline =~# '^\s*\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|fcase\|for\%(_\a\k*\)\=\|if\|select\|try\|whil\%(e\|st\)\)\.\%(\%(\<end\.\)\@!.\)*$' | |
| 5815 | 36 " Increase indentation after an initial control word that starts or |
| 37 " continues a block and is not terminated by "end." | |
| 6505 | 38 let l:indent += shiftwidth() |
| 39 elseif g:j_indent_definitions && (l:prevline =~# '\<\%([1-4]\|13\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\>' || l:prevline =~# '^\s*:\s*$') | |
| 5815 | 40 " Increase indentation in explicit definitions of adverbs, conjunctions, |
| 41 " and verbs | |
| 6505 | 42 let l:indent += shiftwidth() |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
43 endif |
| 5815 | 44 " Decrease indentation in lines that start with either control words that |
| 45 " continue or end a block, or the special items ")" and ":" | |
| 46 if getline(v:lnum) =~# '^\s*\%()\|:\|\%(case\|catch[dt]\=\|do\|else\%(if\)\=\|end\|fcase\)\.\)' | |
| 6505 | 47 let l:indent -= shiftwidth() |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
48 endif |
| 6505 | 49 return l:indent |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
50 endfunction |