aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2019-09-06 18:21:12 -0700
committerJustin M. Keyes <justinkz@gmail.com>2019-09-06 18:30:35 -0700
commitc044ea09094ebd50c48f4869473e31cb67fbedb0 (patch)
tree8aff4a1092307edfacf4c25c7d4bdf978f245165
parent158b78062e9daa65203b4591dae733dd6c11ad2c (diff)
downloadrneovim-c044ea09094ebd50c48f4869473e31cb67fbedb0.tar.gz
rneovim-c044ea09094ebd50c48f4869473e31cb67fbedb0.tar.bz2
rneovim-c044ea09094ebd50c48f4869473e31cb67fbedb0.zip
vim-patch:088e8e344352
Update runtime files. https://github.com/vim/vim/commit/088e8e3443520dec91a384081e66445a104810bb
-rw-r--r--runtime/doc/cmdline.txt2
-rw-r--r--runtime/doc/eval.txt8
-rw-r--r--runtime/doc/indent.txt2
-rw-r--r--runtime/doc/quickfix.txt3
-rw-r--r--runtime/syntax/cs.vim26
-rw-r--r--runtime/syntax/vue.vim (renamed from runtime/syntax/vuejs.vim)0
6 files changed, 27 insertions, 14 deletions
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 46248899a0..ee1f76e4e4 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -660,7 +660,7 @@ commands ":write" and ":global" have the whole file (1,$) as default.
If more line specifiers are given than required for the command, the first
one(s) will be ignored.
-Line numbers may be specified with: *:range* *E14* *{address}*
+Line numbers may be specified with: *:range* *{address}*
{number} an absolute line number
. the current line *:.*
$ the last line in the file *:$*
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 93bc7f868d..5032dc16ee 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3977,12 +3977,12 @@ function({name} [, {arglist}] [, {dict}])
the Funcref and will be used when the Funcref is called.
The arguments are passed to the function in front of other
- arguments. Example: >
+ arguments, but after any argument from |method|. Example: >
func Callback(arg1, arg2, name)
...
- let Func = function('Callback', ['one', 'two'])
+ let Partial = function('Callback', ['one', 'two'])
...
- call Func('name')
+ call Partial('name')
< Invokes the function as with: >
call Callback('one', 'two', 'name')
@@ -5650,6 +5650,8 @@ map({expr1}, {expr2}) *map()*
call map(myDict, {key, val -> key . '-' . val})
< If you do not use "val" you can leave it out: >
call map(myDict, {key -> 'item: ' . key})
+< If you do not use "key" you can use a short name: >
+ call map(myDict, {_, val -> 'item: ' . val})
<
The operation is done in-place. If you want a |List| or
|Dictionary| to remain unmodified make a copy first: >
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index a99d84e969..1df0331239 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -827,7 +827,7 @@ PHP indenting can be altered in several ways by modifying the values of some
global variables:
*php-comment* *PHP_autoformatcomment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
own 'formatoptions'): >
:let g:PHP_autoformatcomment = 0
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 14a25c102d..3ae6d9461f 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -1215,6 +1215,9 @@ replaced with SOH (0x01).
Note: By default the difference between upper and lowercase is ignored. If
you want to match case, add "\C" to the pattern |/\C|.
+Vim will read lines of any length, but only the first 4095 bytes are used, the
+rest is ignored. Items can only be 1023 bytes long.
+
Basic items
diff --git a/runtime/syntax/cs.vim b/runtime/syntax/cs.vim
index 1652cb63c3..eeb990215d 100644
--- a/runtime/syntax/cs.vim
+++ b/runtime/syntax/cs.vim
@@ -3,7 +3,7 @@
" Maintainer: Nick Jensen <nickspoon@gmail.com>
" Former Maintainers: Anduin Withers <awithers@anduin.com>
" Johannes Zellner <johannes@zellner.org>
-" Last Change: 2018-11-26
+" Last Change: 2019-08-01
" Filenames: *.cs
" License: Vim (see :h license)
" Repository: https://github.com/nickspoons/vim-cs
@@ -51,9 +51,11 @@ syn region csTypeOfStatement start="typeof(" end=")" contains=csType, csTypeOf
" Punctuation
syn match csBraces "[{}\[\]]" display
syn match csParens "[()]" display
-syn match csOpSymbols "[+\-=]\{1,2}" display
-syn match csOpSymbols "[><]\{2}" display
-syn match csOpSymbols "\s\zs[><]\ze\_s" display
+syn match csOpSymbols "+\{1,2}" display
+syn match csOpSymbols "-\{1,2}" display
+syn match csOpSymbols "=\{1,2}" display
+syn match csOpSymbols ">\{1,2}" display
+syn match csOpSymbols "<\{1,2}" display
syn match csOpSymbols "[!><+\-*/]=" display
syn match csOpSymbols "[!*/^]" display
syn match csOpSymbols "=>" display
@@ -63,6 +65,9 @@ syn match csLogicSymbols "||" display
syn match csLogicSymbols "?" display
syn match csLogicSymbols ":" display
+" Generics
+syn region csGeneric matchgroup=csGenericBraces start="<" end=">" oneline contains=csType,csGeneric,csUserType,csUserIdentifier,csUserInterface,csUserMethod
+
" Comments
"
" PROVIDES: @csCommentHook
@@ -87,8 +92,8 @@ syn keyword csXmlTag contained list listheader item term description altcomplian
syn cluster xmlTagHook add=csXmlTag
-syn match csXmlCommentLeader +\/\/\/+ contained
-syn match csXmlComment +\/\/\/.*$+ contains=csXmlCommentLeader,@csXml,@Spell
+syn match csXmlCommentLeader "///" contained
+syn match csXmlComment "///.*$" contains=csXmlCommentLeader,@csXml,@Spell keepend
syn include @csXml syntax/xml.vim
hi def link xmlRegion Comment
@@ -100,7 +105,8 @@ syn region csSummary start="^\s*/// <summary" end="^\%\(\s*///\)\@!" transparent
syn region csClassType start="@\@1<!\<class\>"hs=s+6 end="[:\n{]"me=e-1 contains=csClass
-syn region csNewType start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew contains=csNewType
+" csUserType may be defined by user scripts/plugins - it should be contained in csNewType
+syn region csNewType start="@\@1<!\<new\>"hs=s+4 end="[;\n{(<\[]"me=e-1 contains=csNew,csUserType
syn region csIsType start=" is "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
syn region csIsType start=" as "hs=s+4 end="[A-Za-z0-9]\+" oneline contains=csIsAs
syn keyword csNew new contained
@@ -146,7 +152,7 @@ syn region csInterVerbString matchgroup=csQuote start=+\$@"+ end=+"+ skip=+""+ e
syn region csBracketed matchgroup=csParens start=+(+ end=+)+ contained transparent contains=@csAll,csBracketed
-syn cluster csAll contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString
+syn cluster csAll contains=csCharacter,csClassType,csComment,csContextualStatement,csEndColon,csInterpolatedString,csIsType,csLabel,csLogicSymbols,csNewType,csConstant,csNumber,csOpSymbols,csOperatorError,csParens,csPreCondit,csRegion,csString,csSummary,csType,csUnicodeNumber,csUnicodeSpecifier,csVerbatimString,csUserType,csUserIdentifier,csUserInterface,csUserMethod
" The default highlighting.
hi def link csType Type
@@ -160,7 +166,7 @@ hi def link csLabel Label
hi def link csModifier StorageClass
hi def link csConstant Constant
hi def link csException Exception
-hi def link csTypeOf Operator
+hi def link csTypeOf Keyword
hi def link csTypeOfStatement Typedef
hi def link csUnspecifiedStatement Statement
hi def link csUnsupportedStatement Statement
@@ -198,6 +204,8 @@ hi def link csInterpolationAlignDel csInterpolationDelimiter
hi def link csInterpolationFormat csInterpolationDelimiter
hi def link csInterpolationFormatDel csInterpolationDelimiter
+hi def link csGenericBraces csBraces
+
" xml markup
hi def link csXmlCommentLeader Comment
hi def link csXmlComment Comment
diff --git a/runtime/syntax/vuejs.vim b/runtime/syntax/vue.vim
index bad0e26c42..bad0e26c42 100644
--- a/runtime/syntax/vuejs.vim
+++ b/runtime/syntax/vue.vim