summaryrefslogtreecommitdiff
path: root/runtime/syntax
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-05-26 21:20:45 +0200
committerBram Moolenaar <Bram@vim.org>2020-05-26 21:20:45 +0200
commit388a5d4f20b4b64341d1604aa238cab85827b892 (patch)
tree9b6f90c08120369741136623a70307bb6da1b6a8 /runtime/syntax
parentfcb0b61d15f66f0e9116a6bc56d9d8105bb913cf (diff)
downloadvim-git-388a5d4f20b4b64341d1604aa238cab85827b892.tar.gz
Update runtime files
Diffstat (limited to 'runtime/syntax')
-rw-r--r--runtime/syntax/groovy.vim10
-rw-r--r--runtime/syntax/javascript.vim8
-rw-r--r--runtime/syntax/spec.vim5
-rw-r--r--runtime/syntax/tex.vim5
-rw-r--r--runtime/syntax/vim.vim13
5 files changed, 23 insertions, 18 deletions
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 2245b79d0..9bc1bd6d8 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -1,10 +1,10 @@
" Vim syntax file
" Language: Groovy
-" Original Author: Alessio Pace <billy.corgan@tiscali.it>
-" Maintainer: Tobias Rapp <yahuxo@gmx.de>
-" Version: 0.1.16
+" Original Author: Alessio Pace <billy.corgan AT tiscali.it>
+" Maintainer: Tobias Rapp <yahuxo+vim AT mailbox.org>
+" Version: 0.1.17
" URL: http://www.vim.org/scripts/script.php?script_id=945
-" Last Change: 2016 May 23
+" Last Change: 2020 May 26
" THE ORIGINAL AUTHOR'S NOTES:
"
@@ -253,7 +253,7 @@ if exists("groovy_regex_strings")
endif
" syn region groovyELExpr start=+${+ end=+}+ keepend contained
syn match groovyELExpr /\${.\{-}}/ contained
-syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained
+syn match groovyELExpr /\$[a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE_][a-zA-Z\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u00FF\u0100-\uFFFE0-9_.]*/ contained
hi def link groovyELExpr Identifier
" TODO: better matching. I am waiting to understand how it really works in groovy
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index 5c6439f9e..8a5e10b26 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -7,7 +7,7 @@
" (ss) repaired several quoting and grouping glitches
" (ss) fixed regex parsing issue with multiple qualifiers [gi]
" (ss) additional factoring of keywords, globals, and members
-" Last Change: 2019 Sep 27
+" Last Change: 2020 May 14
" 2013 Jun 12: adjusted javaScriptRegexpString (Kevin Locke)
" 2018 Apr 14: adjusted javaScriptRegexpString (LongJohnCoder)
@@ -77,10 +77,10 @@ else
syn match javaScriptParens "[()]"
endif
-syn sync fromstart
-syn sync maxlines=100
-
if main_syntax == "javascript"
+ syn sync fromstart
+ syn sync maxlines=100
+
syn sync ccomment javaScriptComment
endif
diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
index 4df549e67..d7d587794 100644
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -3,7 +3,7 @@
" Language: SPEC: Build/install scripts for Linux RPM packages
" Maintainer: Igor Gnatenko i.gnatenko.brain@gmail.com
" Former Maintainer: Donovan Rebbechi elflord@panix.com (until March 2014)
-" Last Change: 2020 Feb 07
+" Last Change: 2020 May 25
" quit when a syntax file was already loaded
if exists("b:current_syntax")
@@ -128,6 +128,8 @@ syn case match
"sh-like comment stile, only valid in script part
syn match shComment contained '#.*$'
+syn region dnlComment matchgroup=specComment start=+%dnl+ end=+$+
+
syn region shQuote1 contained matchgroup=shQuoteDelim start=+'+ skip=+\\'+ end=+'+ contains=specMacroIdentifier
syn region shQuote2 contained matchgroup=shQuoteDelim start=+"+ skip=+\\"+ end=+"+ contains=specVariables,specMacroIdentifier
@@ -173,6 +175,7 @@ endif
"sh colors
hi def link shComment Comment
+hi def link dnlComment Comment
hi def link shIf Statement
hi def link shOperator Special
hi def link shQuote1 String
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index 83f6f8254..22b43aa38 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
" Vim syntax file
" Language: TeX
" Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
-" Last Change: Jan 24, 2020
-" Version: 116
+" Last Change: May 19, 2020
+" Version: 117
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
"
" Notes: {{{1
@@ -1057,6 +1057,7 @@ if has("conceal") && &enc == 'utf-8'
call s:SuperSub('texSuperscript','\^','R','ᴿ')
call s:SuperSub('texSuperscript','\^','T','ᵀ')
call s:SuperSub('texSuperscript','\^','U','ᵁ')
+ call s:SuperSub('texSuperscript','\^','V','ⱽ')
call s:SuperSub('texSuperscript','\^','W','ᵂ')
call s:SuperSub('texSuperscript','\^',',','︐')
call s:SuperSub('texSuperscript','\^',':','︓')
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 22947bff1..1eef42811 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -1,8 +1,8 @@
" Vim syntax file
" Language: Vim 8.0 script
-" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Apr 15, 2020
-" Version: 8.0-33
+" Maintainer: Charles E. Campbell <NcampObell@SdrPchip.AorgM-NOSPAM>
+" Last Change: May 26, 2020
+" Version: 8.0-35
" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_VIM
" Automatically generated keyword lists: {{{1
@@ -228,7 +228,7 @@ syn cluster vimOperGroup contains=vimEnvvar,vimFunc,vimFuncVar,vimOper,vimOperPa
syn match vimOper "\%#=1\(==\|!=\|>=\|<=\|=\~\|!\~\|>\|<\|=\)[?#]\{0,2}" skipwhite nextgroup=vimString,vimSpecFile
syn match vimOper "\(\<is\|\<isnot\)[?#]\{0,2}\>" skipwhite nextgroup=vimString,vimSpecFile
syn match vimOper "||\|&&\|[-+.!]" skipwhite nextgroup=vimString,vimSpecFile
-syn region vimOperParen matchgroup=vimParenSep start="(" end=")" contains=@vimOperGroup
+syn region vimOperParen matchgroup=vimParenSep start="(" end=")" contains=vimoperStar,@vimOperGroup
syn region vimOperParen matchgroup=vimSep start="{" end="}" contains=@vimOperGroup nextgroup=vimVar,vimFuncVar
if !exists("g:vimsyn_noerror") && !exists("g:vimsyn_noopererror")
syn match vimOperError ")"
@@ -300,7 +300,7 @@ syn match vimComment excludenl +\s#[^{].*$+lc=1 contains=@vimCommentGroup,vimCom
syn match vimComment +\<endif\s\+#[^{].*$+lc=5 contains=@vimCommentGroup,vimCommentString
syn match vimComment +\<else\s\+#[^{].*$+lc=4 contains=@vimCommentGroup,vimCommentString
" Vim9 comment inside expression
-syn match vim9Comment +\s\zs#[^{].*$+ contains=@vimCommentGroup,vimCommentString
+syn match vim9Comment +\s\zs#[^{].*$+ms=s+1 contains=@vimCommentGroup,vimCommentString
" Environment Variables: {{{2
" =====================
@@ -321,7 +321,7 @@ syn region vimString oneline keepend start=+[^a-zA-Z>!\\@]"+lc=1 skip=+\\\\\|\\"
syn region vimString oneline keepend start=+[^a-zA-Z>!\\@]'+lc=1 end=+'+
syn region vimString oneline start=+=!+lc=1 skip=+\\\\\|\\!+ end=+!+ contains=@vimStringGroup
syn region vimString oneline start="=+"lc=1 skip="\\\\\|\\+" end="+" contains=@vimStringGroup
-syn region vimString oneline start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/" contains=@vimStringGroup
+"syn region vimString oneline start="\s/\s*\A"lc=1 skip="\\\\\|\\+" end="/" contains=@vimStringGroup
syn match vimString contained +"[^"]*\\$+ skipnl nextgroup=vimStringCont
syn match vimStringCont contained +\(\\\\\|.\)\{-}[^\\]"+
@@ -932,6 +932,7 @@ if !exists("skip_vim_syntax_inits")
hi def link vimNumber Number
hi def link vimOperError Error
hi def link vimOper Operator
+ hi def link vimOperStar vimOper
hi def link vimOption PreProc
hi def link vimParenSep Delimiter
hi def link vimPatSepErr vimError