summaryrefslogtreecommitdiffstats
path: root/syntax/go.vim
diff options
context:
space:
mode:
Diffstat (limited to 'syntax/go.vim')
-rw-r--r--syntax/go.vim19
1 files changed, 8 insertions, 11 deletions
diff --git a/syntax/go.vim b/syntax/go.vim
index 203be1f2..0beaf545 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -129,12 +129,12 @@ hi def link goComplexes Type
" Predefined functions and values
syn match goBuiltins /\<\v(append|cap|close|complex|copy|delete|imag|len)\ze\(/
syn match goBuiltins /\<\v(make|new|panic|print|println|real|recover)\ze\(/
-syn keyword goPredefinedIdentifiers nil iota
syn keyword goBoolean true false
+syn keyword goPredefinedIdentifiers nil iota
hi def link goBuiltins Keyword
-hi def link goPredefinedIdentifiers Identifier
hi def link goBoolean Boolean
+hi def link goPredefinedIdentifiers goBoolean
" Comments; their contents
syn keyword goTodo contained TODO FIXME XXX BUG
@@ -304,16 +304,18 @@ if g:go_highlight_functions != 0
syn match goPointerOperator /\*/ nextgroup=goReceiverType contained skipwhite skipnl
syn match goReceiverType /\w\+/ contained
syn match goFunction /\w\+/ contained
+ syn match goFunctionCall /\w\+\ze(/ contains=GoBuiltins,goDeclaration
else
syn keyword goDeclaration func
endif
hi def link goFunction Function
+hi def link goFunctionCall Type
" Methods;
if g:go_highlight_methods != 0
- syn match goMethod /\.\w\+\ze(/hs=s+1
+ syn match goMethodCall /\.\w\+\ze(/hs=s+1
endif
-hi def link goMethod Type
+hi def link goMethodCall Type
" Fields;
if g:go_highlight_fields != 0
@@ -326,7 +328,7 @@ if g:go_highlight_types != 0
syn match goTypeConstructor /\<\w\+{/he=e-1
syn match goTypeDecl /\<type\>/ nextgroup=goTypeName skipwhite skipnl
syn match goTypeName /\w\+/ contained nextgroup=goDeclType skipwhite skipnl
- syn match goDeclType /\<interface\|struct\>/ contained skipwhite skipnl
+ syn match goDeclType /\<interface\|struct\>/ skipwhite skipnl
hi def link goReceiverType Type
else
syn keyword goDeclType struct interface
@@ -374,12 +376,7 @@ endif
hi def link goCoverageNormalText Comment
function! s:hi()
- " :GoSameIds
- if &background == 'dark'
- hi def goSameId term=bold cterm=bold ctermbg=white ctermfg=black guibg=white guifg=black
- else
- hi def goSameId term=bold cterm=bold ctermbg=14 guibg=Cyan
- endif
+ hi def link goSameId Search
" :GoCoverage commands
hi def goCoverageCovered ctermfg=green guifg=#A6E22E