From c8c0a9325407c487fd702eca39d987d67123c98b Mon Sep 17 00:00:00 2001
From: Derek Sifford <dereksifford@gmail.com>
Date: Mon, 21 Oct 2019 10:38:18 -0400
Subject: [PATCH] fix: move back to "typescriptreact" from "typescript.tsx"
 filetype (#153)

* fix: move back to "typescriptreact" from "typescript.tsx" filetype

This change is in accordance to the now official filetype defined by vim itself.

See: https://github.com/vim/vim/commit/92852cee3fcff1dc6ce12387b234634e73267b22

* add typescriptreact to should_abort call in typescript ftplugin
---
 after/syntax/typescript.vim                   | 8 ++++++--
 after/syntax/{tsx.vim => typescriptreact.vim} | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)
 rename after/syntax/{tsx.vim => typescriptreact.vim} (82%)

diff --git a/after/syntax/typescript.vim b/after/syntax/typescript.vim
index 0aa18c1..ee0466e 100644
--- a/after/syntax/typescript.vim
+++ b/after/syntax/typescript.vim
@@ -1,7 +1,9 @@
-if dracula#should_abort('typescript')
+if dracula#should_abort('typescript', 'typescriptreact')
     finish
 endif
 
+" HerringtonDarkholme/yats.vim {{{
+
 hi! link typescriptAliasDeclaration       Type
 hi! link typescriptArrayMethod            Function
 hi! link typescriptArrowFunc              Operator
@@ -47,7 +49,9 @@ hi! link typescriptRestOrSpread           Operator
 hi! link typescriptTernaryOp              Operator
 hi! link typescriptTypeAnnotation         Special
 hi! link typescriptTypeCast               Operator
-hi! link typescriptTypeReference          Type
 hi! link typescriptTypeParameter          DraculaOrangeItalic
+hi! link typescriptTypeReference          Type
 hi! link typescriptUnaryOp                Operator
 hi! link typescriptVariable               Keyword
+
+" }}}
diff --git a/after/syntax/tsx.vim b/after/syntax/typescriptreact.vim
similarity index 82%
rename from after/syntax/tsx.vim
rename to after/syntax/typescriptreact.vim
index fc974aa..911b9bf 100644
--- a/after/syntax/tsx.vim
+++ b/after/syntax/typescriptreact.vim
@@ -1,4 +1,4 @@
-if dracula#should_abort('typescript.tsx')
+if dracula#should_abort('typescriptreact')
     finish
 endif