Mercurial > vim
annotate runtime/ftplugin/j.vim @ 31778:579c846086eb v9.0.1221
patch 9.0.1221: code is indented more than necessary
Commit: https://github.com/vim/vim/commit/f97a295ccaa9803367f3714cdefce4e2283c771d
Author: Yegappan Lakshmanan <yegappan@yahoo.com>
Date: Wed Jan 18 18:17:48 2023 +0000
patch 9.0.1221: code is indented more than necessary
Problem: Code is indented more than necessary.
Solution: Use an early return where it makes sense. (Yegappan Lakshmanan,
closes #11833)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 18 Jan 2023 19:30:03 +0100 |
| parents | 90a966f5c77a |
| children | 8ae680be2a51 |
| rev | line source |
|---|---|
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
1 " Vim filetype plugin |
|
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 | |
| 29779 | 5 " Last Change: 2022-08-06 |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
6 |
| 5734 | 7 if exists('b:did_ftplugin') |
|
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_ftplugin = 1 |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
11 |
| 5815 | 12 let s:save_cpo = &cpo |
| 13 set cpo&vim | |
| 14 | |
|
7176
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
15 setlocal iskeyword=48-57,A-Z,a-z,_ |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
16 setlocal comments=:NB. |
|
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
17 setlocal commentstring=NB.\ %s |
| 5425 | 18 setlocal formatoptions-=t |
| 19 setlocal matchpairs=(:) | |
|
7176
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
20 setlocal path-=/usr/include |
|
5362
ab1508486b12
Update runtime files. Add support for J.
Bram Moolenaar <bram@vim.org>
parents:
diff
changeset
|
21 |
|
7176
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
22 " Includes. To make the shorthand form "require 'web/cgi'" work, double the |
|
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
23 " last path component. Also strip off leading folder names like "~addons/". |
|
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
24 setlocal include=\\v^\\s*(load\|require)\\s*'\\zs\\f+\\ze' |
|
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
25 setlocal includeexpr=substitute(substitute(tr(v:fname,'\\','/'),'\\v^[^~][^/.]*(/[^/.]+)$','&\\1',''),'\\v^\\~[^/]+/','','') |
|
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
26 setlocal suffixesadd=.ijs |
|
30042ddff503
commit https://github.com/vim/vim/commit/60cce2fb736c8ff6fdb9603f502d3c15f1f7a25d
Christian Brabandt <cb@256bit.org>
parents:
6741
diff
changeset
|
27 |
| 18639 | 28 let b:undo_ftplugin = 'setlocal suffixesadd< includeexpr< include< path< matchpairs< formatoptions< commentstring< comments< iskeyword<' |
| 5815 | 29 |
| 30 " Section movement with ]] ][ [[ []. The start/end patterns below are amended | |
| 31 " inside the function in order to avoid matching on the current cursor line. | |
| 29779 | 32 if !exists('no_plugin_maps') && !exists('no_j_maps') |
| 33 let s:sectionstart = '\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(:\s*0\|def\s\+0\|define\)\)\>.*' | |
| 34 let s:sectionend = '\s*)\s*' | |
| 5815 | 35 |
| 29779 | 36 function! s:SearchSection(end, backwards, visualmode) abort |
| 37 if a:visualmode !=# '' | |
| 38 normal! gv | |
| 39 endif | |
| 40 let l:flags = a:backwards ? 'bsW' : 'sW' | |
| 41 if a:end | |
| 42 call search('^' . s:sectionend . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags) | |
| 43 else | |
| 44 call search('^' . s:sectionstart . (a:backwards ? '\n\_.\{-}\%#' : '$'), l:flags) | |
| 45 endif | |
| 46 endfunction | |
| 5815 | 47 |
| 29779 | 48 noremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, '')<CR> |
| 49 xnoremap <buffer> <silent> ]] :<C-U>call <SID>SearchSection(0, 0, visualmode())<CR> | |
| 50 sunmap <buffer> ]] | |
| 51 noremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, '')<CR> | |
| 52 xnoremap <buffer> <silent> ][ :<C-U>call <SID>SearchSection(1, 0, visualmode())<CR> | |
| 53 sunmap <buffer> ][ | |
| 54 noremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, '')<CR> | |
| 55 xnoremap <buffer> <silent> [[ :<C-U>call <SID>SearchSection(0, 1, visualmode())<CR> | |
| 56 sunmap <buffer> [[ | |
| 57 noremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, '')<CR> | |
| 58 xnoremap <buffer> <silent> [] :<C-U>call <SID>SearchSection(1, 1, visualmode())<CR> | |
| 59 sunmap <buffer> [] | |
| 5815 | 60 |
| 29779 | 61 let b:undo_ftplugin .= ' | silent! execute "unmap <buffer> ]]"' |
| 62 \ . ' | silent! execute "unmap <buffer> ]["' | |
| 63 \ . ' | silent! execute "unmap <buffer> [["' | |
| 64 \ . ' | silent! execute "unmap <buffer> []"' | |
| 65 endif | |
| 5815 | 66 |
| 29779 | 67 " Browse dialog filter on Windows and GTK (see ":help browsefilter") |
| 68 if (has('gui_win32') || has('gui_gtk')) && !exists('b:browsefilter') | |
| 5815 | 69 let b:browsefilter = "J Script Files (*.ijs)\t*.ijs\n" |
| 70 \ . "All Files (*.*)\t*.*\n" | |
| 71 let b:undo_ftplugin .= ' | unlet! b:browsefilter' | |
| 72 endif | |
| 73 | |
| 74 " Enhanced "%" matching (see ":help matchit") | |
| 75 if exists('loaded_matchit') && !exists('b:match_words') | |
| 76 let b:match_ignorecase = 0 | |
| 6505 | 77 let b:match_words = '^\%(\s*Note\|.\{-}\<\%([0-4]\|13\|noun\|adverb\|conjunction\|verb\|monad\|dyad\)\s\+\%(\:\s*0\|def\s\+0\|define\)\)\>:^\s*\:\s*$:^\s*)\s*$' |
| 5815 | 78 \ . ',\<\%(for\%(_\a\k*\)\=\|if\|select\|try\|whil\%(e\|st\)\)\.:\<\%(case\|catch[dt]\=\|else\%(if\)\=\|fcase\)\.:\<end\.' |
| 79 let b:undo_ftplugin .= ' | unlet! b:match_ignorecase b:match_words' | |
| 80 endif | |
| 81 | |
| 82 let &cpo = s:save_cpo | |
| 83 unlet s:save_cpo |