summaryrefslogtreecommitdiffstats
path: root/syntax/basic
diff options
context:
space:
mode:
authorAdam Stankiewicz <sheerun@sher.pl>2020-07-06 19:13:39 +0200
committerAdam Stankiewicz <sheerun@sher.pl>2020-07-06 19:13:39 +0200
commit8500ae8bb9f4da69273eace4d9cef54ae7f18627 (patch)
tree85acb09cdf450251a775e23a76a42db7003303d0 /syntax/basic
parentd09a56a494863afd789cba1850e123dfc1dd26cf (diff)
downloadvim-polyglot-8500ae8bb9f4da69273eace4d9cef54ae7f18627.tar.gz
vim-polyglot-8500ae8bb9f4da69273eace4d9cef54ae7f18627.zip
Update
Diffstat (limited to 'syntax/basic')
-rw-r--r--syntax/basic/symbols.vim10
-rw-r--r--syntax/basic/type.vim5
2 files changed, 10 insertions, 5 deletions
diff --git a/syntax/basic/symbols.vim b/syntax/basic/symbols.vim
index c4c025ac..2799ed39 100644
--- a/syntax/basic/symbols.vim
+++ b/syntax/basic/symbols.vim
@@ -16,10 +16,12 @@ syntax match typescriptBinaryOp contained /===\?/ nextgroup=@typescriptValue s
syntax match typescriptBinaryOp contained />\(>>=\|>>\|>=\|>\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
" 4: <<=, <<, <=, <
syntax match typescriptBinaryOp contained /<\(<=\|<\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
-" 3: ||, |=, |
-syntax match typescriptBinaryOp contained /|\(|\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
-" 3: &&, &=, &
-syntax match typescriptBinaryOp contained /&\(&\|=\)\?/ nextgroup=@typescriptValue skipwhite skipempty
+" 3: ||, |=, |, ||=
+syntax match typescriptBinaryOp contained /||\?=\?/ nextgroup=@typescriptValue skipwhite skipempty
+" 4: &&, &=, &, &&=
+syntax match typescriptBinaryOp contained /&&\?=\?/ nextgroup=@typescriptValue skipwhite skipempty
+" 2: ??, ??=
+syntax match typescriptBinaryOp contained /??=\?/ nextgroup=@typescriptValue skipwhite skipempty
" 2: *=, *
syntax match typescriptBinaryOp contained /\*=\?/ nextgroup=@typescriptValue skipwhite skipempty
" 2: %=, %
diff --git a/syntax/basic/type.vim b/syntax/basic/type.vim
index ca7374a4..616c3271 100644
--- a/syntax/basic/type.vim
+++ b/syntax/basic/type.vim
@@ -94,9 +94,12 @@ syntax cluster typescriptTypeMember contains=
\ typescriptIndexSignature,
\ @typescriptMembers
+syntax match typescriptTupleLable /\K\k*?\?:/
+ \ contained
+
syntax region typescriptTupleType matchgroup=typescriptBraces
\ start=/\[/ end=/\]/
- \ contains=@typescriptType,@typescriptComments
+ \ contains=@typescriptType,@typescriptComments,typescriptRestOrSpread,typescriptTupleLable
\ contained skipwhite
syntax cluster typescriptTypeOperator