diff options
Diffstat (limited to 'indent')
| -rw-r--r-- | indent/basic.vim | 15 | ||||
| -rw-r--r-- | indent/freebasic.vim | 15 | ||||
| -rw-r--r-- | indent/glsl.vim | 2 | ||||
| -rw-r--r-- | indent/markdown.vim | 18 | ||||
| -rw-r--r-- | indent/plantuml.vim | 3 | ||||
| -rw-r--r-- | indent/solidity.vim | 4 |
6 files changed, 43 insertions, 14 deletions
diff --git a/indent/basic.vim b/indent/basic.vim new file mode 100644 index 00000000..7775bc4e --- /dev/null +++ b/indent/basic.vim @@ -0,0 +1,15 @@ +if polyglot#init#is_disabled(expand('<sfile>:p'), 'basic', 'indent/basic.vim') + finish +endif + +" Vim indent file +" Language: BASIC (QuickBASIC 4.5) +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2022 Jan 24 + +" Only load this indent file when no other was loaded. +if exists("b:did_indent") + finish +endif + +runtime! indent/vb.vim diff --git a/indent/freebasic.vim b/indent/freebasic.vim new file mode 100644 index 00000000..9399b57f --- /dev/null +++ b/indent/freebasic.vim @@ -0,0 +1,15 @@ +if polyglot#init#is_disabled(expand('<sfile>:p'), 'freebasic', 'indent/freebasic.vim') + finish +endif + +" Vim indent file +" Language: FreeBASIC +" Maintainer: Doug Kearns <dougkearns@gmail.com> +" Last Change: 2022 Jan 24 + +" Only load this indent file when no other was loaded. +if exists("b:did_indent") + finish +endif + +runtime! indent/vb.vim diff --git a/indent/glsl.vim b/indent/glsl.vim index b16fec47..60459284 100644 --- a/indent/glsl.vim +++ b/indent/glsl.vim @@ -3,7 +3,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'glsl', 'indent/glsl.vim') endif " Language: OpenGL Shading Language -" Maintainer: Sergey Tikhomirov <sergey@tikhomirov.io> +" Maintainer: Sergii Tykhomyrov <sergii@tykhomyrov.net> if exists("b:did_indent") finish diff --git a/indent/markdown.vim b/indent/markdown.vim index dd8888f4..3ad1d02e 100644 --- a/indent/markdown.vim +++ b/indent/markdown.vim @@ -2,7 +2,7 @@ if polyglot#init#is_disabled(expand('<sfile>:p'), 'markdown', 'indent/markdown.v finish endif -if exists("b:did_indent") | finish | endif +if exists('b:did_indent') | finish | endif let b:did_indent = 1 setlocal indentexpr=GetMarkdownIndent() @@ -12,7 +12,7 @@ setlocal autoindent " Automatically continue blockquote on line break setlocal formatoptions+=r setlocal comments=b:> -if get(g:, "vim_markdown_auto_insert_bullets", 1) +if get(g:, 'vim_markdown_auto_insert_bullets', 1) " Do not automatically insert bullets when auto-wrapping with text-width setlocal formatoptions-=c " Accept various markers as bullets @@ -20,24 +20,24 @@ if get(g:, "vim_markdown_auto_insert_bullets", 1) endif " Only define the function once -if exists("*GetMarkdownIndent") | finish | endif +if exists('*GetMarkdownIndent') | finish | endif function! s:IsMkdCode(lnum) let name = synIDattr(synID(a:lnum, 1, 0), 'name') - return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)') + return (name =~# '^mkd\%(Code$\|Snippet\)' || name !=# '' && name !~? '^\%(mkd\|html\)') endfunction function! s:IsLiStart(line) - return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' && - \ a:line =~ '^\s*[*+-] \+' + return a:line !~# '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' && + \ a:line =~# '^\s*[*+-] \+' endfunction function! s:IsHeaderLine(line) - return a:line =~ '^\s*#' + return a:line =~# '^\s*#' endfunction function! s:IsBlankLine(line) - return a:line =~ '^$' + return a:line =~# '^$' endfunction function! s:PrevNonBlank(lnum) @@ -52,7 +52,7 @@ function GetMarkdownIndent() if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2)) return 0 endif - let list_ind = get(g:, "vim_markdown_new_list_item_indent", 4) + let list_ind = get(g:, 'vim_markdown_new_list_item_indent', 4) " Find a non-blank line above the current line. let lnum = s:PrevNonBlank(v:lnum - 1) " At the start of the file use zero indent. diff --git a/indent/plantuml.vim b/indent/plantuml.vim index 71af587c..1bf9d13e 100644 --- a/indent/plantuml.vim +++ b/indent/plantuml.vim @@ -5,7 +5,6 @@ endif scriptencoding utf-8 " Vim indent file " Language: PlantUML -" Maintainer: Anders Thøgersen <first name at bladre dot dk> " License: VIM LICENSE if exists('b:did_indent') @@ -21,7 +20,7 @@ if exists('*GetPlantUMLIndent') finish endif -let s:decIndent = '^\s*\%(end\|else\|}\)' +let s:decIndent = '^\s*\%(end\|else\|fork again\|}\)' function! GetPlantUMLIndent(...) abort "for current line, use arg if given or v:lnum otherwise diff --git a/indent/solidity.vim b/indent/solidity.vim index 7744f7a7..26cb4c14 100644 --- a/indent/solidity.vim +++ b/indent/solidity.vim @@ -19,7 +19,7 @@ setlocal nosmartindent " Now, set up our indentation expression and keys that trigger it. setlocal indentexpr=GetSolidityIndent() -setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e +setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e,0* " Only define the function once. if exists("*GetSolidityIndent") @@ -41,7 +41,7 @@ let s:syng_strcom = 'string\|regex\|comment\c' let s:syng_string = 'regex\c' " Regex of syntax group names that are strings or documentation. -let s:syng_multiline = 'comment\c' +let s:syng_multiline = 'comment\|natspecblock\c' " Regex of syntax group names that are line comment. let s:syng_linecom = 'linecomment\c' |