diff options
Diffstat (limited to 'indent')
| -rw-r--r-- | indent/meson.vim | 1 | ||||
| -rw-r--r-- | indent/octave.vim | 6 | ||||
| -rw-r--r-- | indent/rst.vim | 63 | ||||
| -rw-r--r-- | indent/typescriptreact.vim (renamed from indent/tsx.vim) | 2 |
4 files changed, 68 insertions, 4 deletions
diff --git a/indent/meson.vim b/indent/meson.vim index b9b72ec6..db5610ac 100644 --- a/indent/meson.vim +++ b/indent/meson.vim @@ -2,6 +2,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'meson') == -1 " Vim indent file " Language: Meson +" License: VIM License " Maintainer: Nirbheek Chauhan <nirbheek.chauhan@gmail.com> " Original Authors: David Bustos <bustos@caltech.edu> " Bram Moolenaar <Bram@vim.org> diff --git a/indent/octave.vim b/indent/octave.vim index 3a6a2e78..e7bb4aca 100644 --- a/indent/octave.vim +++ b/indent/octave.vim @@ -1,11 +1,11 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'octave') == -1 " Vim indent file -" Language: Octave -" Maintainer: Nguyễn Gia Phong <vn.mcsinyx@gmail.com> +" Language: Octave +" Maintainer: Nguyễn Gia Phong <vn.mcsinyx@gmail.com> " Original Maintainer: Marcus Aurelius Farias <marcus.cf@bol.com.br> " First Author: Max Ischenko <mfi@ukr.net> -" Last Change: 2019-10-11 +" Last Change: 2019-10-16 " Only load this indent file when no other was loaded. if exists("b:did_indent") diff --git a/indent/rst.vim b/indent/rst.vim new file mode 100644 index 00000000..df7287ea --- /dev/null +++ b/indent/rst.vim @@ -0,0 +1,63 @@ +if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rst') == -1 + +" Vim indent file +" Language: reStructuredText Documentation Format +" Previous Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2011-08-03 + +if exists("b:did_indent") + finish +endif +let b:did_indent = 1 + +setlocal indentexpr=GetRSTIndent() +setlocal indentkeys=!^F,o,O +setlocal nosmartindent + +if exists("*GetRSTIndent") + finish +endif + +let s:itemization_pattern = '^\s*[-*+]\s' +let s:enumeration_pattern = '^\s*\%(\d\+\|#\)\.\s\+' + +function GetRSTIndent() + let lnum = prevnonblank(v:lnum - 1) + if lnum == 0 + return 0 + endif + + let ind = indent(lnum) + let line = getline(lnum) + + if line =~ s:itemization_pattern + let ind += 2 + elseif line =~ s:enumeration_pattern + let ind += matchend(line, s:enumeration_pattern) + endif + + let line = getline(v:lnum - 1) + + " Indent :FIELD: lines. Don’t match if there is no text after the field or + " if the text ends with a sent-ender. + if line =~ '^:.\+:\s\{-1,\}\S.\+[^.!?:]$' + return matchend(line, '^:.\{-1,}:\s\+') + endif + + if line =~ '^\s*$' + execute lnum + call search('^\s*\%([-*+]\s\|\%(\d\+\|#\)\.\s\|\.\.\|$\)', 'bW') + let line = getline('.') + if line =~ s:itemization_pattern + let ind -= 2 + elseif line =~ s:enumeration_pattern + let ind -= matchend(line, s:enumeration_pattern) + elseif line =~ '^\s*\.\.' + let ind -= 3 + endif + endif + + return ind +endfunction + +endif diff --git a/indent/tsx.vim b/indent/typescriptreact.vim index 3c59cc3f..65db50dc 100644 --- a/indent/tsx.vim +++ b/indent/typescriptreact.vim @@ -1,5 +1,6 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1 +exe 'runtime! indent/typescript.vim' " Save the current JavaScript indentexpr. let b:tsx_ts_indentexpr = &indentexpr @@ -110,5 +111,4 @@ fu! GetTsxIndent() return ind endfu - endif |