Skip to content

Commit 22040ce

Browse files
sheerunsheerun
committed
Update
1 parent 7bde552 commit 22040ce

28 files changed

+272
-429
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,15 +108,15 @@ On top of all language packs from [vim repository](https://github.com/vim/vim/tr
108108
- [idris](https://github.com/idris-hackers/idris-vim) (Idris syntax highlighting for idr and lidr files)
109109
- [ion](https://github.com/vmchale/ion-vim) (Syntax highlighting for ion files)
110110
- [javascript-sql](https://github.com/statico/vim-javascript-sql)
111-
- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 17 more files)
111+
- [javascript](https://github.com/pangloss/vim-javascript) (JavaScript syntax highlighting for js, bones, cjs, es, es6 and 18 more files)
112112
- [jenkins](https://github.com/martinda/Jenkinsfile-vim-syntax) (Syntax highlighting for jenkinsfile and Jenkinsfile files)
113113
- [jq](https://github.com/vito-c/jq.vim) (JSONiq syntax highlighting for jq files)
114114
- [json5](https://github.com/GutenYe/json5.vim) (JSON5 syntax highlighting for json5 files)
115115
- [json](https://github.com/elzr/vim-json) (JSON syntax highlighting for json, avsc, geojson, gltf, har and 13 more files)
116116
- [jsonc](https://github.com/neoclide/jsonc.vim) (Syntax highlighting for cjson and jsonc files)
117117
- [jsonnet](https://github.com/google/vim-jsonnet) (Jsonnet syntax highlighting for jsonnet and libsonnet files)
118118
- [jst](https://github.com/briancollins/vim-jst) (EJS syntax highlighting for ejs, ect and jst files)
119-
- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (JSX syntax highlighting for jsx files)
119+
- [jsx](https://github.com/MaxMEllon/vim-jsx-pretty) (Syntax highlighting for jsx files)
120120
- [julia](https://github.com/JuliaEditorSupport/julia-vim) (Julia syntax highlighting for jl files)
121121
- [kotlin](https://github.com/udalov/kotlin-vim) (Kotlin syntax highlighting for kt, ktm and kts files)
122122
- [ledger](https://github.com/ledger/vim-ledger) (Syntax highlighting for ldg, ledger and journal files)

‎after/ftplugin/jsx.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ endif
1515
if exists("loaded_matchit")
1616
let b:match_ignorecase = 0
1717
let b:match_words = '(:),\[:\],{:},<:>,' .
18-
\ '<\@<=\([^/][^ \t>]*\)[^>]*\%(>\|$\):<\@<=/\1>'
18+
\ '<\@<=\([A-z0-9.]\+\):\(</\)\@<=\1'
1919
endif
2020

2121
" For andymass/vim-matchup plugin

‎after/syntax/puppet.vim

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
if polyglot#init#is_disabled(expand('<sfile>:p'), 'yard', 'after/syntax/puppet.vim')
2+
finish
3+
endif
4+
5+
" Puppet syntax extensions for highlighting YARD documentation.
6+
"
7+
" Author: Gabriel Filion <[email protected]>
8+
" URI: https://github.com/noprompt/vim-yardoc
9+
" Version: 0.0.1
10+
"
11+
" This file reuses the main yardoc syntax definitions and glues them together
12+
" with puppet syntax groups from vim-puppet
13+
14+
runtime! after/syntax/yardoc_support.vim
15+
16+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
17+
" Yard glue to puppet
18+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
19+
syn match puppetComment "\s*#.*$" contains=puppetTodo,@Spell,yardComment
20+
syn region puppetComment start="/\*" end="\*/" contains=puppetTodo,@Spell,yardComment extend fold keepend
21+
syn cluster puppetNotTop add=@yardTags,@yardDirectives,@yardTypes,@yardLists,@yardHashes
22+
23+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
24+
" Tacking on Yard to puppet syntax classes
25+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
26+
hi def link yardComment puppetComment
27+
hi def link yardGenericTag puppetKeyword
28+
hi def link yardGenericDirective puppetKeyword

‎after/syntax/ruby.vim

Lines changed: 6 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -7,125 +7,22 @@ endif
77
" Author: Joel Holdbrooks <https://github.com/noprompt>
88
" URI: https://github.com/noprompt/vim-yardoc
99
" Version: 0.0.1
10+
"
11+
" This file reuses the main yardoc syntax definitions and glues them together
12+
" with Vim's builtin ruby syntax groups
1013

11-
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
12-
" Tags
13-
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
14-
syn match yardGenericTag "@\h\+" contained
15-
syn match yardAbstract "@abstract" contained
16-
syn match yardApi "@api" contained
17-
syn match yardAttr "@attr" contained
18-
syn match yardAttrReader "@attr_reader" contained
19-
syn match yardAttrWriter "@attr_writer" contained
20-
syn match yardAuthor "@author" contained
21-
syn match yardDeprecated "@deprecated" contained
22-
syn match yardExample "@example" contained
23-
syn match yardNote "@note" contained
24-
syn match yardOption "@option" contained
25-
syn match yardOverload "@overload" contained
26-
syn match yardParam "@param" contained
27-
syn match yardParamName /@param \h\+/hs=s+7 contained contains=yardParam
28-
syn match yardPrivate "@private" contained
29-
syn match yardRaise "@raise" contained
30-
syn match yardReturn "@return" contained
31-
syn match yardSee "@see" contained
32-
syn match yardSince "@since" contained
33-
syn match yardTodo "@todo" contained
34-
syn match yardVersion "@version" contained
35-
syn match yardYield "@yield" contained
36-
syn match yardYieldParam "@yieldparam" contained
37-
syn match yardYieldReturn "@yieldreturn" contained
38-
syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardParamName,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
39-
40-
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
41-
" Directives
42-
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
43-
syn match yardGenericDirective "@!\h\+" contained
44-
syn match yardAttribute "@!attribute" contained
45-
syn match yardEndGroup "@!endgroup" contained
46-
syn match yardGroup "@!group" contained
47-
syn match yardMacro "@!macro" contained
48-
syn match yardMethod "@!method" contained
49-
syn match yardParse "@!parse" contained
50-
syn match yardScope "@!scope" contained
51-
syn match yardVisibility "@!visibility" contained
52-
53-
syn cluster yardDirectives contains=yardGenericDirective,yardAttribute,yardEndGroup,yardGroup,yardMacro,yardMethod,yardParse,yardScope,yardVisibility
54-
55-
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
56-
" Types, Lists, and Hashes
57-
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
58-
syn match yardDuckType "#\h\+" contained
59-
syn match yardType "[A-Z]\h\+" contained
60-
syn match yardLiteral "\(true\|false\|nil\|self\|void\)" contained
61-
syn match yardComma "," nextgroup=@yardTypes contained
62-
syn match yardArrow "=>" nextgroup=@yardTypes contained
63-
64-
syn region yardParametricType start="[A-Z]\+\h\+<" end=">" contains=yardType,yardOrderDependentList,yardComma skipwhite contained
65-
syn region yardOrderDependentList start="(" end=")" contains=@yardTypes,yardComma skipwhite contained
66-
syn region yardTypeList start="\[" end="]" contains=@yardTypes,yardOrderDependentList,@yardHashes skipwhite contained
67-
syn region yardHashAngle start="Hash<" end=">" contains=yardDuckType,yardType,yardLiteral,yardArrow,yardComma skipwhite contained
68-
syn region yardHashCurly start="Hash{" end="}" contains=@yardTypes,yardArrow,yardComma skipwhite contained
69-
70-
syn cluster yardTypes contains=yardDuckType,yardType,yardLiteral,yardParametricType
71-
syn cluster yardHashes contains=yardArrow,yardHashAngle,yardHashCurly
72-
syn cluster yardLists contains=yardComma,yardTypeList,yardOrderDependentList
14+
runtime! after/syntax/yardoc_support.vim
7315

7416
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
75-
" Yard
17+
" Yard glue to ruby
7618
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
77-
syn match yardComment "#\s*@!\{,1}\h\+.*" contains=@yardTags,@yardDirectives,yardTypeList
7819
syn match rubyComment "#.*" contains=rubySharpBang,rubySpaceError,rubyTodo,@Spell,yardComment
7920
syn region rubyMultilineComment start="\%(\%(^\s*#.*\n\)\@<!\%(^\s*#.*\n\)\)\%(\(^\s*#.*\n\)\{1,}\)\@=" end="\%(^\s*#.*\n\)\@<=\%(^\s*#.*\n\)\%(^\s*#\)\@!" contains=rubyComment transparent fold keepend
8021
syn cluster rubyNotTop add=@yardTags,@yardDirectives,@yardTypes,@yardLists,@yardHashes
8122

8223
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
83-
" Links
24+
" Tacking on Yard to ruby syntax classes
8425
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
8526
hi def link yardComment rubyComment
86-
" Tags
8727
hi def link yardGenericTag rubyKeyword
88-
hi def link yardAbstract yardGenericTag
89-
hi def link yardApi yardGenericTag
90-
hi def link yardAttr yardGenericTag
91-
hi def link yardAttrReader yardGenericTag
92-
hi def link yardAttrWriter yardGenericTag
93-
hi def link yardAuthor yardGenericTag
94-
hi def link yardDeprecated yardGenericTag
95-
hi def link yardExample yardGenericTag
96-
hi def link yardNote yardGenericTag
97-
hi def link yardOption yardGenericTag
98-
hi def link yardOverload yardGenericTag
99-
hi def link yardParam yardGenericTag
100-
hi def link yardPrivate yardGenericTag
101-
hi def link yardRaise yardGenericTag
102-
hi def link yardReturn yardGenericTag
103-
hi def link yardSee yardGenericTag
104-
hi def link yardSince yardGenericTag
105-
hi def link yardTodo yardGenericTag
106-
hi def link yardVersion yardGenericTag
107-
hi def link yardYield yardGenericTag
108-
hi def link yardYieldParam yardGenericTag
109-
hi def link yardYieldReturn yardGenericTag
110-
" Directives
11128
hi def link yardGenericDirective rubyKeyword
112-
hi def link yardAttribute yardGenericDirective
113-
hi def link yardEndGroup yardGenericDirective
114-
hi def link yardGroup yardGenericDirective
115-
hi def link yardMacro yardGenericDirective
116-
hi def link yardMethod yardGenericDirective
117-
hi def link yardParse yardGenericDirective
118-
hi def link yardScope yardGenericDirective
119-
hi def link yardVisibility yardGenericDirective
120-
" Types
121-
hi def link yardComma yardComment
122-
hi def link yardType yardComment
123-
hi def link yardDuckType yardComment
124-
hi def link yardLiteral yardComment
125-
" Lists
126-
hi def link yardTypeList yardComment
127-
hi def link yardParametricType yardComment
128-
" Hashes
129-
hi def link yardArrow yardComment
130-
hi def link yardHashAngle yardComment
131-
hi def link yardHashCurly yardComment

‎after/syntax/yardoc_support.vim

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
if polyglot#init#is_disabled(expand('<sfile>:p'), 'yard', 'after/syntax/yardoc_support.vim')
2+
finish
3+
endif
4+
5+
" Generic syntax extensions for highlighting YARD documentation.
6+
"
7+
" Author: Joel Holdbrooks <https://github.com/noprompt>
8+
" URI: https://github.com/noprompt/vim-yardoc
9+
" Version: 0.0.1
10+
11+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
12+
" Tags
13+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
14+
syn match yardGenericTag "@\h\+" contained
15+
syn match yardAbstract "@abstract" contained
16+
syn match yardApi "@api" contained
17+
syn match yardAttr "@attr" contained
18+
syn match yardAttrReader "@attr_reader" contained
19+
syn match yardAttrWriter "@attr_writer" contained
20+
syn match yardAuthor "@author" contained
21+
syn match yardDeprecated "@deprecated" contained
22+
syn match yardExample "@example" contained
23+
syn match yardNote "@note" contained
24+
syn match yardOption "@option" contained
25+
syn match yardOverload "@overload" contained
26+
syn match yardParam "@param" contained
27+
syn match yardParamName /@param \h\+/hs=s+7 contained contains=yardParam
28+
syn match yardPrivate "@private" contained
29+
syn match yardRaise "@raise" contained
30+
syn match yardReturn "@return" contained
31+
syn match yardSee "@see" contained
32+
syn match yardSince "@since" contained
33+
syn match yardTodo "@todo" contained
34+
syn match yardVersion "@version" contained
35+
syn match yardYield "@yield" contained
36+
syn match yardYieldParam "@yieldparam" contained
37+
syn match yardYieldReturn "@yieldreturn" contained
38+
syn cluster yardTags contains=yardGenericTag,yardAbstract,yardApi,yardAttr,yardAttrReader,yardAttrWriter,yardAuthor,yardDeprecated,yardExample,yardNote,yardOption,yardOverload,yardParam,yardParamName,yardPrivate,yardRaise,yardReturn,yardSee,yardSince,yardTodo,yardVersion,yardYield,yardYieldParam,yardYieldReturn
39+
40+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
41+
" Directives
42+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
43+
syn match yardGenericDirective "@!\h\+" contained
44+
syn match yardAttribute "@!attribute" contained
45+
syn match yardEndGroup "@!endgroup" contained
46+
syn match yardGroup "@!group" contained
47+
syn match yardMacro "@!macro" contained
48+
syn match yardMethod "@!method" contained
49+
syn match yardParse "@!parse" contained
50+
syn match yardScope "@!scope" contained
51+
syn match yardVisibility "@!visibility" contained
52+
53+
syn cluster yardDirectives contains=yardGenericDirective,yardAttribute,yardEndGroup,yardGroup,yardMacro,yardMethod,yardParse,yardScope,yardVisibility
54+
55+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
56+
" Types, Lists, and Hashes
57+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
58+
syn match yardDuckType "#\h\+" contained
59+
syn match yardType "[A-Z]\h\+" contained
60+
syn match yardLiteral "\(true\|false\|nil\|self\|void\)" contained
61+
syn match yardComma "," nextgroup=@yardTypes contained
62+
syn match yardArrow "=>" nextgroup=@yardTypes contained
63+
64+
syn region yardParametricType start="[A-Z]\+\h\+<" end=">" contains=yardType,yardOrderDependentList,yardComma skipwhite contained
65+
syn region yardOrderDependentList start="(" end=")" contains=@yardTypes,yardComma skipwhite contained
66+
syn region yardTypeList start="\[" end="]" contains=@yardTypes,yardOrderDependentList,@yardHashes skipwhite contained
67+
syn region yardHashAngle start="Hash<" end=">" contains=yardDuckType,yardType,yardLiteral,yardArrow,yardComma skipwhite contained
68+
syn region yardHashCurly start="Hash{" end="}" contains=@yardTypes,yardArrow,yardComma skipwhite contained
69+
70+
syn cluster yardTypes contains=yardDuckType,yardType,yardLiteral,yardParametricType
71+
syn cluster yardHashes contains=yardArrow,yardHashAngle,yardHashCurly
72+
syn cluster yardLists contains=yardComma,yardTypeList,yardOrderDependentList
73+
74+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
75+
" Yard
76+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
77+
syn match yardComment "#\s*@!\{,1}\h\+.*" contains=@yardTags,@yardDirectives,yardTypeList
78+
79+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
80+
" Links
81+
""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
82+
" @note The links to language syntax classes is done in each language syntax
83+
" script.
84+
"
85+
" Tags
86+
hi def link yardAbstract yardGenericTag
87+
hi def link yardApi yardGenericTag
88+
hi def link yardAttr yardGenericTag
89+
hi def link yardAttrReader yardGenericTag
90+
hi def link yardAttrWriter yardGenericTag
91+
hi def link yardAuthor yardGenericTag
92+
hi def link yardDeprecated yardGenericTag
93+
hi def link yardExample yardGenericTag
94+
hi def link yardNote yardGenericTag
95+
hi def link yardOption yardGenericTag
96+
hi def link yardOverload yardGenericTag
97+
hi def link yardParam yardGenericTag
98+
hi def link yardPrivate yardGenericTag
99+
hi def link yardRaise yardGenericTag
100+
hi def link yardReturn yardGenericTag
101+
hi def link yardSee yardGenericTag
102+
hi def link yardSince yardGenericTag
103+
hi def link yardTodo yardGenericTag
104+
hi def link yardVersion yardGenericTag
105+
hi def link yardYield yardGenericTag
106+
hi def link yardYieldParam yardGenericTag
107+
hi def link yardYieldReturn yardGenericTag
108+
" Directives
109+
hi def link yardAttribute yardGenericDirective
110+
hi def link yardEndGroup yardGenericDirective
111+
hi def link yardGroup yardGenericDirective
112+
hi def link yardMacro yardGenericDirective
113+
hi def link yardMethod yardGenericDirective
114+
hi def link yardParse yardGenericDirective
115+
hi def link yardScope yardGenericDirective
116+
hi def link yardVisibility yardGenericDirective
117+
" Types
118+
hi def link yardComma yardComment
119+
hi def link yardType yardComment
120+
hi def link yardDuckType yardComment
121+
hi def link yardLiteral yardComment
122+
" Lists
123+
hi def link yardTypeList yardComment
124+
hi def link yardParametricType yardComment
125+
" Hashes
126+
hi def link yardArrow yardComment
127+
hi def link yardHashAngle yardComment
128+
hi def link yardHashCurly yardComment

‎autoload/go/config.vim

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,13 +263,14 @@ function! go#config#SetTemplateAutocreate(value) abort
263263
let g:go_template_autocreate = a:value
264264
endfunction
265265

266+
let s:default_metalinter = 'staticcheck'
266267
function! go#config#MetalinterCommand() abort
267-
return get(g:, 'go_metalinter_command', 'golangci-lint')
268+
return get(g:, 'go_metalinter_command', s:default_metalinter)
268269
endfunction
269270

270271
function! go#config#MetalinterAutosaveEnabled() abort
271272
let l:default = []
272-
if get(g:, 'go_metalinter_command', 'golangci-lint') == 'golangci-lint'
273+
if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
273274
let l:default = ['govet', 'golint']
274275
endif
275276

@@ -278,7 +279,7 @@ endfunction
278279

279280
function! go#config#MetalinterEnabled() abort
280281
let l:default = []
281-
if get(g:, 'go_metalinter_command', 'golangci-lint') == 'golangci-lint'
282+
if get(g:, 'go_metalinter_command', s:default_metalinter) == 'golangci-lint'
282283
let l:default = ['vet', 'golint', 'errcheck']
283284
endif
284285

‎autoload/polyglot/ft.vim

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,10 @@ func polyglot#ft#FTinc()
362362
setf aspvbs
363363
elseif lines =~ "<?"
364364
setf php
365+
" Pascal supports // comments but they're vary rarely used for file
366+
" headers so assume POV-Ray
367+
elseif lines =~ '^\s*\%({\|(\*\)' || lines =~? s:ft_pascal_keywords
368+
setf pascal
365369
else
366370
call polyglot#ft#FTasmsyntax()
367371
if exists("b:asmsyntax")
@@ -408,6 +412,9 @@ func polyglot#ft#FTprogress_asm()
408412
setf progress
409413
endfunc
410414

415+
let s:ft_pascal_comments = '^\s*\%({\|(\*\|//\)'
416+
let s:ft_pascal_keywords = '^\s*\%(program\|unit\|library\|uses\|begin\|procedure\|function\|const\|type\|var\)\>'
417+
411418
func polyglot#ft#FTprogress_pascal()
412419
if exists("g:filetype_p")
413420
exe "setf " . g:filetype_p
@@ -419,8 +426,7 @@ func polyglot#ft#FTprogress_pascal()
419426
let lnum = 1
420427
while lnum <= 10 && lnum < line('$')
421428
let line = getline(lnum)
422-
if line =~ '^\s*\(program\|unit\|procedure\|function\|const\|type\|var\)\>'
423-
\ || line =~ '^\s*{' || line =~ '^\s*(\*'
429+
if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
424430
setf pascal
425431
return
426432
elseif line !~ '^\s*$' || line =~ '^/\*'
@@ -433,6 +439,19 @@ func polyglot#ft#FTprogress_pascal()
433439
setf progress
434440
endfunc
435441

442+
func polyglot#ft#FTpp()
443+
if exists("g:filetype_pp")
444+
exe "setf " . g:filetype_pp
445+
else
446+
let line = getline(nextnonblank(1))
447+
if line =~ s:ft_pascal_comments || line =~? s:ft_pascal_keywords
448+
setf pascal
449+
else
450+
setf puppet
451+
endif
452+
endif
453+
endfunc
454+
436455
func polyglot#ft#FTr()
437456
let max = line("$") > 50 ? 50 : line("$")
438457

0 commit comments

Comments
 (0)