summaryrefslogtreecommitdiffstats
path: root/syntax/go.vim
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2016-06-26 18:03:28 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2016-06-26 18:03:28 +0200
commitc69562f864cb0ee973142a45091f6cb46ce0b1df (patch)
treef10ac7812b56cfa944367bae62f8cea0ffd54414 /syntax/go.vim
parent40c54bc12b5700f6bffed12209489e1f669f6423 (diff)
downloadvim-polyglot-c69562f864cb0ee973142a45091f6cb46ce0b1df.tar.gz
vim-polyglot-c69562f864cb0ee973142a45091f6cb46ce0b1df.zip
Updatev2.9.3
Diffstat (limited to 'syntax/go.vim')
-rw-r--r--syntax/go.vim62
1 files changed, 32 insertions, 30 deletions
diff --git a/syntax/go.vim b/syntax/go.vim
index 8fb5d137..0a49059d 100644
--- a/syntax/go.vim
+++ b/syntax/go.vim
@@ -70,7 +70,7 @@ if !exists("g:go_highlight_methods")
endif
if !exists("g:go_highlight_fields")
- let g:go_highlight_fields = 0
+ let g:go_highlight_fields = 0
endif
if !exists("g:go_highlight_structs")
@@ -338,35 +338,35 @@ hi def link goInterfaceDef Function
" Build Constraints
if g:go_highlight_build_constraints != 0
- syn match goBuildKeyword display contained "+build"
- " Highlight the known values of GOOS, GOARCH, and other +build options.
- syn keyword goBuildDirectives contained
- \ android darwin dragonfly freebsd linux nacl netbsd openbsd plan9
- \ solaris windows 386 amd64 amd64p32 arm armbe arm64 arm64be ppc64
- \ ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le ppc
- \ s390 s390x sparc sparc64 cgo ignore race
-
- " Other words in the build directive are build tags not listed above, so
- " avoid highlighting them as comments by using a matchgroup just for the
- " start of the comment.
- " The rs=s+2 option lets the \s*+build portion be part of the inner region
- " instead of the matchgroup so it will be highlighted as a goBuildKeyword.
- syn region goBuildComment matchgroup=goBuildCommentStart
- \ start="//\s*+build\s"rs=s+2 end="$"
- \ contains=goBuildKeyword,goBuildDirectives
- hi def link goBuildCommentStart Comment
- hi def link goBuildDirectives Type
- hi def link goBuildKeyword PreProc
-
- " One or more line comments that are followed immediately by a "package"
- " declaration are treated like package documentation, so these must be
- " matched as comments to avoid looking like working build constraints.
- " The he, me, and re options let the "package" itself be highlighted by
- " the usual rules.
- syn region goPackageComment start=/\v(\/\/.*\n)+\s*package/
- \ end=/\v\n\s*package/he=e-7,me=e-7,re=e-7
- \ contains=@goCommentGroup,@Spell
- hi def link goPackageComment Comment
+ syn match goBuildKeyword display contained "+build"
+ " Highlight the known values of GOOS, GOARCH, and other +build options.
+ syn keyword goBuildDirectives contained
+ \ android darwin dragonfly freebsd linux nacl netbsd openbsd plan9
+ \ solaris windows 386 amd64 amd64p32 arm armbe arm64 arm64be ppc64
+ \ ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le ppc
+ \ s390 s390x sparc sparc64 cgo ignore race
+
+ " Other words in the build directive are build tags not listed above, so
+ " avoid highlighting them as comments by using a matchgroup just for the
+ " start of the comment.
+ " The rs=s+2 option lets the \s*+build portion be part of the inner region
+ " instead of the matchgroup so it will be highlighted as a goBuildKeyword.
+ syn region goBuildComment matchgroup=goBuildCommentStart
+ \ start="//\s*+build\s"rs=s+2 end="$"
+ \ contains=goBuildKeyword,goBuildDirectives
+ hi def link goBuildCommentStart Comment
+ hi def link goBuildDirectives Type
+ hi def link goBuildKeyword PreProc
+
+ " One or more line comments that are followed immediately by a "package"
+ " declaration are treated like package documentation, so these must be
+ " matched as comments to avoid looking like working build constraints.
+ " The he, me, and re options let the "package" itself be highlighted by
+ " the usual rules.
+ syn region goPackageComment start=/\v(\/\/.*\n)+\s*package/
+ \ end=/\v\n\s*package/he=e-7,me=e-7,re=e-7
+ \ contains=@goCommentGroup,@Spell
+ hi def link goPackageComment Comment
endif
@@ -379,4 +379,6 @@ syn sync minlines=500
let b:current_syntax = "go"
+" vim: sw=2 ts=2 et
+
endif