Fix the ambiguity of typescript and jsx syntax (#115)

MaxMEllon · Dec 19, 2019 · b2ace0c · b2ace0c
1 parent 0d07dc8
commit b2ace0c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim
@@ -46,9 +46,11 @@ if !hlexists('typescriptTypeCast')
         \ fold
 endif
 
-syntax cluster typescriptExpression add=jsxRegion,typescriptParens
-
 runtime syntax/jsx_pretty.vim
+syntax cluster typescriptExpression add=jsxRegion,typescriptParens,tsCast
+" Fix type casting ambiguity with JSX syntax
+syntax match typescriptTypeBrackets +[<>]+ contained
+syntax match typescriptTypeCast +<\([_$A-Za-z0-9]\+\)>\%(\s*\%([_$A-Za-z0-9]\+\s*;\?\|(\)\%(\_[^<]*</\1>\)\@!\)\@=+ contains=typescriptTypeBrackets,@typescriptType
 
 let b:current_syntax = 'typescript.tsx'
 

diff --git a/test.tsx b/test.tsx
@@ -2,6 +2,10 @@ import React from 'react';
 
 const head = <T>(arr: T[]): T => arr[0]
 
+const foo = <string>bar;
+const foo = <string>bar;
+</string>
+
 function test() {
   const a = 1;
   let foo;