summaryrefslogtreecommitdiffstats
path: root/syntax/go.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2014-12-09 23:09:20 +0100
committerAdam Stankiewicz <sheerun@sher.pl>2014-12-09 23:09:20 +0100
commit4071c094c69ba8ef716f8048cac8415fc7d96e26 (patch)
treeccf17bae58ed7655d62a7bce6104f31480976dc6 /syntax/go.vim
parent617b01a5b6aa3cadb25b2ff8639e330cfc6cf3c1 (diff)
downloadvim-polyglot-1.10.4.tar.gz
vim-polyglot-1.10.4.zip
Updatev1.10.4
Diffstat (limited to 'syntax/go.vim')
-rw-r--r--syntax/go.vim12
1 files changed, 8 insertions, 4 deletions
diff --git a/syntax/go.vim b/syntax/go.vim
index 59f72ed7..4ee39a71 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -10,7 +10,9 @@
" let OPTION_NAME = 0
" in your ~/.vimrc file to disable particular options. You can also write:
" let OPTION_NAME = 1
-" to enable particular options. At present, all options default to on.
+" to enable particular options.
+" At present, all options default to on, except highlight of:
+" functions, methods and structs.
"
" - go_highlight_array_whitespace_error
" Highlights white space after "[]".
@@ -107,10 +109,10 @@ syn match goDeclaration /\<func\>/
" Predefined functions and values
syn keyword goBuiltins append cap close complex copy delete imag len
syn keyword goBuiltins make new panic print println real recover
-syn keyword goConstants iota true false nil
+syn keyword goBoolean iota true false nil
hi def link goBuiltins Keyword
-hi def link goConstants Keyword
+hi def link goBoolean Boolean
" Comments; their contents
syn keyword goTodo contained TODO FIXME XXX BUG
@@ -141,9 +143,11 @@ hi def link goEscapeError Error
syn cluster goStringGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU,goEscapeError
syn region goString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=@goStringGroup
syn region goRawString start=+`+ end=+`+
+syn match goFormatSpecifier /%[#0\-\ \+\*]*[vTtbcdoqxXUeEfgGsp]/ contained containedin=goString
hi def link goString String
hi def link goRawString String
+hi def link goFormatSpecifier goSpecialString
" Characters; their contents
syn cluster goCharacterGroup contains=goEscapeOctal,goEscapeC,goEscapeX,goEscapeU,goEscapeBigU
@@ -199,7 +203,7 @@ endif
" Extra types commonly seen
if g:go_highlight_extra_types != 0
syn match goExtraType /\<bytes\.\(Buffer\)\>/
- syn match goExtraType /\<io\.\(Reader\|Writer\|ReadWriter\|ReadWriteCloser\)\>/
+ syn match goExtraType /\<io\.\(Reader\|ReadSeeker\|ReadWriter\|ReadCloser\|ReadWriteCloser\|Writer\|WriteCloser\|Seeker\)\>/
syn match goExtraType /\<reflect\.\(Kind\|Type\|Value\)\>/
syn match goExtraType /\<unsafe\.Pointer\>/
endif