From 8500ae8bb9f4da69273eace4d9cef54ae7f18627 Mon Sep 17 00:00:00 2001 From: Adam Stankiewicz Date: Mon, 6 Jul 2020 19:13:39 +0200 Subject: Update --- syntax/basic/symbols.vim | 10 ++++++---- syntax/basic/type.vim | 5 ++++- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'syntax/basic') 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 -- cgit v1.2.3