diff options
| author | Adam Stankiewicz <sheerun@sher.pl> | 2020-01-25 16:56:10 +0100 |
|---|---|---|
| committer | Adam Stankiewicz <sheerun@sher.pl> | 2020-01-25 16:56:10 +0100 |
| commit | 35ea4d2b9072594b6c0ccf87bde7978ed9f94755 (patch) | |
| tree | e829bad239fea3150cd0963933f3e33214f069b4 /syntax/basic | |
| parent | 967486dd716de860db3ef091a9dcb9cb65023534 (diff) | |
| download | vim-polyglot-4.2.1.tar.gz vim-polyglot-4.2.1.zip | |
Updatev4.2.1
Diffstat (limited to 'syntax/basic')
| -rw-r--r-- | syntax/basic/decorator.vim | 2 | ||||
| -rw-r--r-- | syntax/basic/function.vim | 2 | ||||
| -rw-r--r-- | syntax/basic/keyword.vim | 11 | ||||
| -rw-r--r-- | syntax/basic/members.vim | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/syntax/basic/decorator.vim b/syntax/basic/decorator.vim index 1a8fc2c7..2a7a1dd1 100644 --- a/syntax/basic/decorator.vim +++ b/syntax/basic/decorator.vim @@ -1,7 +1,7 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1 syntax match typescriptDecorator /@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>/ - \ nextgroup=typescriptArgumentList,typescriptTypeArguments + \ nextgroup=typescriptFuncCallArg,typescriptTypeArguments \ contains=@_semantic,typescriptDotNotation endif diff --git a/syntax/basic/function.vim b/syntax/basic/function.vim index ac1c4a4c..5acbb55c 100644 --- a/syntax/basic/function.vim +++ b/syntax/basic/function.vim @@ -40,7 +40,7 @@ syntax match typescriptArrowFuncDef contained /\K\k*\s*=>/ \ skipwhite skipempty " TODO: optimize this pattern -syntax region typescriptArrowFuncDef contained start=/(\_[^)]*):/ end=/=>/ +syntax region typescriptArrowFuncDef contained start=/(\_[^(^)]*):/ end=/=>/ \ contains=typescriptArrowFuncArg,typescriptArrowFunc,typescriptTypeAnnotation \ nextgroup=@typescriptExpression,typescriptBlock \ skipwhite skipempty keepend diff --git a/syntax/basic/keyword.vim b/syntax/basic/keyword.vim index ff1e169a..11639c43 100644 --- a/syntax/basic/keyword.vim +++ b/syntax/basic/keyword.vim @@ -1,8 +1,17 @@ if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'typescript') == -1 "Import -syntax keyword typescriptImport from as import +syntax keyword typescriptImport from as +syntax keyword typescriptImport import + \ nextgroup=typescriptImportType + \ skipwhite +syntax keyword typescriptImportType type + \ contained syntax keyword typescriptExport export + \ nextgroup=typescriptExportType + \ skipwhite +syntax match typescriptExportType /\<type\s*{\@=/ + \ contained skipwhite skipempty skipnl syntax keyword typescriptModule namespace module "this diff --git a/syntax/basic/members.vim b/syntax/basic/members.vim index 267bd110..343559b9 100644 --- a/syntax/basic/members.vim +++ b/syntax/basic/members.vim @@ -7,7 +7,7 @@ syntax keyword typescriptConstructor contained constructor syntax cluster memberNextGroup contains=typescriptMemberOptionality,typescriptTypeAnnotation,@typescriptCallSignature -syntax match typescriptMember /\K\k*/ +syntax match typescriptMember /#\?\K\k*/ \ nextgroup=@memberNextGroup \ contained skipwhite |