revert to typescriptreact filetype

ftdetect/typescriptreact.vim

@@ -0,0 +1 @@
+autocmd BufNewFile,BufRead *.tsx setlocal filetype=typescriptreact

indent/tsx.vim → indent/typescriptreact.vim

@@ -107,4 +107,4 @@ fu! GetTsxIndent()
   endif
 
   return ind
-endfu
+endfu

syntax/common.vim

@@ -7,7 +7,7 @@ command -nargs=+ HiLink hi def link <args>
 
 "Dollar sign is permitted anywhere in an identifier
 setlocal iskeyword-=$
-if main_syntax == 'typescript' || main_syntax == 'typescript.tsx'
+if main_syntax == 'typescript' || main_syntax == 'typescriptreact'
   setlocal iskeyword+=$
   " syntax cluster htmlJavaScript                 contains=TOP
 endif

syntax/tsx.vim → syntax/typescriptreact.vim

@@ -2,7 +2,7 @@ if !exists("main_syntax")
   if exists("b:current_syntax") && b:current_syntax != 'typescript'
     finish
   endif
-  let main_syntax = 'typescript.tsx'
+  let main_syntax = 'typescriptreact'
 endif
 
 syntax region tsxTag
@@ -134,7 +134,7 @@ highlight def link tsxEscJs tsxEscapeJs
 highlight def link tsxCloseTag htmlTag
 highlight def link tsxCloseString Identifier
 
-let b:current_syntax = "typescript.tsx"
-if main_syntax == 'typescript.tsx'
+let b:current_syntax = "typescriptreact"
+if main_syntax == 'typescriptreact'
   unlet main_syntax
-endif
+endif

test/tsx.indent.vader

@@ -1,4 +1,4 @@
-Given typescript.tsx (html end tags):
+Given typescriptreact (html end tags):
   <div>
   name="cat"
   value={value}
@@ -11,7 +11,7 @@ Given typescript.tsx (html end tags):
 Do (indent the block):
   gg=G
 
-Expect typescript.tsx indented block:
+Expect typescriptreact indented block:
   <div>
   	name="cat"
   	value={value}
@@ -21,7 +21,7 @@ Expect typescript.tsx indented block:
   	onremove={() => console.log('bye')}
   </div>
 
-Given typescript.tsx (badly indented component):
+Given typescriptreact (badly indented component):
   class MyComponent {
   	public render() {
   	return (
@@ -56,7 +56,7 @@ Given typescript.tsx (badly indented component):
 Do (indent the block):
   gg=G
 
-Expect typescript.tsx indented blocks:
+Expect typescriptreact indented blocks:
   class MyComponent {
   	public render() {
   		return (
@@ -88,7 +88,7 @@ Expect typescript.tsx indented blocks:
   	}
   }
 
-Given typescript.tsx (badly indented component + non tsx):
+Given typescriptreact (badly indented component + non tsx):
     interface MyComponentProps {
   first: string;
     second: boolean;
@@ -132,7 +132,7 @@ Given typescript.tsx (badly indented component + non tsx):
 Do (indent the block):
   gg=G
 
-Expect typescript.tsx indented blocks:
+Expect typescriptreact indented blocks:
   interface MyComponentProps {
   	first: string;
   	second: boolean;
@@ -171,4 +171,4 @@ Expect typescript.tsx indented blocks:
   			</Table>
   		);
   	}
-  }
+  }

test/tsx.vader

@@ -1,4 +1,4 @@
-Given typescript.tsx (basic usage):
+Given typescriptreact (basic usage):
   var a = <div></div>
   var b = 123
 
@@ -7,7 +7,7 @@ Execute:
   AssertEqual 'tsxIntrinsicTagName', SyntaxAt(1, 10)
   AssertEqual 'typescriptVariable', SyntaxAt(2, 1)
 
-Given typescript.tsx (basic void):
+Given typescriptreact (basic void):
   var a = <img/>
   var b = 123
 
@@ -16,7 +16,7 @@ Execute:
   AssertEqual 'tsxIntrinsicTagName', SyntaxAt(1, 10)
   AssertEqual 'typescriptVariable', SyntaxAt(2, 1)
 
-Given typescript.tsx (interpolation):
+Given typescriptreact (interpolation):
   var a = <Option key={item}></Option>;
   var b = 123
 
@@ -25,7 +25,7 @@ Execute:
   AssertEqual 'tsxTagName', SyntaxAt(1, 30)
   AssertEqual 'typescriptVariable', SyntaxAt(2, 1)
 
-Given typescript.tsx (custom component):
+Given typescriptreact (custom component):
   var a = <ion-gesture></ion-gesture>;
   var b = 123
 
@@ -34,7 +34,7 @@ Execute:
   AssertEqual 'tsxIntrinsicTagName', SyntaxAt(1, 30)
   AssertEqual 'typescriptVariable', SyntaxAt(2, 1)
 
-Given typescript.tsx (digit in tagname):
+Given typescriptreact (digit in tagname):
   var a = <h1></h1>;
   var b = 123
 
@@ -43,15 +43,15 @@ Execute:
   AssertEqual 'tsxIntrinsicTagName', SyntaxAt(1, 16)
   AssertEqual 'typescriptVariable', SyntaxAt(2, 1)
 
-Given typescript.tsx (paren + render props):
+Given typescriptreact (paren + render props):
   var d =  (
     <Route component={() => <Home/>}/>
   )
 
 Execute:
   AssertEqual 'tsxTagName', SyntaxAt(2, 4)
 
-Given typescript.tsx (attributes):
+Given typescriptreact (attributes):
   var d = <Route component={() => <Home/>}
     another-attribute="1"
   />
@@ -63,7 +63,7 @@ Execute:
   AssertEqual 'tsxAttrib', SyntaxAt(2, 3)
   AssertEqual 'tsxAttrib', SyntaxAt(2, 11)
 
-Given typescript.tsx (paren + attributes):
+Given typescriptreact (paren + attributes):
   var d = (
     <Route component={() => <Home/>}
       another-attribute="1"
@@ -76,7 +76,7 @@ Execute:
   AssertEqual 'tsxAttrib', SyntaxAt(3, 5)
   AssertEqual 'tsxAttrib', SyntaxAt(3, 13)
 
-Given typescript.tsx (object in jsx attribute):
+Given typescriptreact (object in jsx attribute):
   var d = <Route component={{ test: 1 }}
     another-attribute="1"
   />
@@ -85,7 +85,7 @@ Execute:
   AssertEqual 'typescriptObjectLiteral', SyntaxAt(1, 28)
   AssertEqual 'typescriptObjectLabel', SyntaxAt(1, 29)
 
-Given typescript.tsx (line comment in tsxTag):
+Given typescriptreact (line comment in tsxTag):
   const foo = () => (
     <div
       // this is a comment
@@ -97,7 +97,7 @@ Given typescript.tsx (line comment in tsxTag):
 Execute:
     AssertEqual 'tsxLineComment', SyntaxAt(3, 12)
 
-Given typescript.tsx (line comment in tsxRegion):
+Given typescriptreact (line comment in tsxRegion):
   const foo = () => (
     <div>
       { // this is a comment
@@ -110,7 +110,7 @@ Execute:
   AssertEqual 'tsxLineComment', SyntaxAt(3, 10)
   AssertEqual 'tsxLineComment', SyntaxAt(6, 42)
 
-Given typescript.tsx (block comment in tsxTag):
+Given typescriptreact (block comment in tsxTag):
   const foo = () => (
     <div
       /*
@@ -126,7 +126,7 @@ Given typescript.tsx (block comment in tsxTag):
 Execute:
   AssertEqual 'tsxBlockComment', SyntaxAt(5, 11)
 
-Given typescript.tsx (block comment in tsxRegion):
+Given typescriptreact (block comment in tsxRegion):
   const foo = () => (
     <div>
       {/* this is a comment */}
@@ -140,4 +140,4 @@ Given typescript.tsx (block comment in tsxRegion):
 Execute:
   AssertEqual 'tsxBlockComment', SyntaxAt(3, 9)
   AssertNotEqual 'tsxBlockComment', SyntaxAt(4, 0)
-  AssertEqual 'tsxBlockComment', SyntaxAt(6, 9)
+  AssertEqual 'tsxBlockComment', SyntaxAt(6, 9)