remove TypeScript specific This syntax type

src/Language/TypeScript/Assignment.hs

@@ -92,6 +92,7 @@ type Syntax = '[
   , Expression.InstanceOf
   , Expression.New
   , Expression.Await
+  , Expression.This
   , Literal.Array
   , Literal.Boolean
   , Literal.Float
@@ -193,7 +194,6 @@ type Syntax = '[
   , TypeScript.Syntax.Annotation
   , TypeScript.Syntax.With
   , TypeScript.Syntax.ForOf
-  , TypeScript.Syntax.This
   , TypeScript.Syntax.Update
   , TypeScript.Syntax.ComputedPropertyName
   , TypeScript.Syntax.Decorator
@@ -317,7 +317,7 @@ yieldExpression :: Assignment Term
 yieldExpression = makeTerm <$> symbol Grammar.YieldExpression <*> children (Statement.Yield <$> term (expression <|> emptyTerm))
 
 this :: Assignment Term
-this = makeTerm <$> symbol Grammar.This <*> (TypeScript.Syntax.This <$ rawSource)
+this = makeTerm <$> symbol Grammar.This <*> (Expression.This <$ rawSource)
 
 regex :: Assignment Term
 regex = makeTerm <$> symbol Grammar.Regex <*> (Literal.Regex <$> source)

src/Language/TypeScript/Syntax/JavaScript.hs

@@ -32,14 +32,6 @@ instance Ord1 Debugger where liftCompare = genericLiftCompare
 instance Show1 Debugger where liftShowsPrec = genericLiftShowsPrec
 instance Evaluatable Debugger
 
-data This a = This
-  deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Message1, Named1, Ord, Show, ToJSONFields1, Traversable)
-
-instance Eq1 This where liftEq = genericLiftEq
-instance Ord1 This where liftCompare = genericLiftCompare
-instance Show1 This where liftShowsPrec = genericLiftShowsPrec
-instance Evaluatable This
-
 data Super a = Super
   deriving (Declarations1, Diffable, Eq, Foldable, FreeVariables1, Functor, Generic1, Hashable1, Message1, Named1, Ord, Show, ToJSONFields1, Traversable)
 

test/fixtures/typescript/corpus/import.diffB-A.txt

@@ -13,9 +13,11 @@
   {+(QualifiedAliasedImport
     {+(Identifier)+})+})+}
 {+(SideEffectImport)+}
-{+(QualifiedAliasedImport{+(Identifier)+})+}
+{+(QualifiedAliasedImport
+  {+(Identifier)+})+}
 {-(Import)-}
-{-(QualifiedAliasedImport{-(Identifier)-})-}
+{-(QualifiedAliasedImport
+  {-(Identifier)-})-}
 {-(Import)-}
 {-(Import)-}
 {-(Import)-}

test/fixtures/typescript/corpus/public-field-definition.diffA-B.txt

@@ -51,21 +51,24 @@
           (TypeIdentifier))
         (Identifier)
         (Float))
-      (PublicFieldDefinition
-      {+(Identifier)+}
-        (Empty)
-      {-(Readonly)-}
-        (Annotation
-          (TypeIdentifier))
-        (Identifier)
-        (Float))
     {+(PublicFieldDefinition
       {+(Identifier)+}
-      {+(Readonly)+}
+      {+(Empty)+}
       {+(Annotation
         {+(TypeIdentifier)+})+}
       {+(Identifier)+}
-      {+(TextElement)+})+}
+      {+(Float)+})+}
+      (PublicFieldDefinition
+      {+(Identifier)+}
+      {-(Empty)-}
+        (Readonly)
+        (Annotation
+        { (TypeIdentifier)
+        ->(TypeIdentifier) })
+      { (Identifier)
+      ->(Identifier) }
+      { (Float)
+      ->(TextElement) })
     {+(PublicFieldDefinition
       {+(Empty)+}
       {+(Empty)+}

test/fixtures/typescript/corpus/public-field-definition.diffB-A.txt

@@ -51,34 +51,40 @@
           (TypeIdentifier))
         (Identifier)
         (Float))
-      (PublicFieldDefinition
+    {+(PublicFieldDefinition
+      {+(Empty)+}
+      {+(Readonly)+}
+      {+(Annotation
+        {+(TypeIdentifier)+})+}
+      {+(Identifier)+}
+      {+(Float)+})+}
+    {+(PublicFieldDefinition
+      {+(Empty)+}
+      {+(Readonly)+}
+      {+(Annotation
+        {+(TypeIdentifier)+})+}
+      {+(Identifier)+}
+      {+(Float)+})+}
+    {+(PublicFieldDefinition
+      {+(Empty)+}
+      {+(Empty)+}
+      {+(Annotation
+        {+(TypeIdentifier)+})+}
+      {+(Identifier)+}
+      {+(Float)+})+}
+    {+(PublicFieldDefinition
+      {+(Empty)+}
+      {+(Empty)+}
+      {+(Empty)+}
+      {+(Identifier)+}
+      {+(Float)+})+}
+    {-(PublicFieldDefinition
       {-(Identifier)-}
-        (Empty)
-      {+(Readonly)+}
-        (Annotation
-          (TypeIdentifier))
-        (Identifier)
-        (Float))
-    {+(PublicFieldDefinition
-      {+(Empty)+}
-      {+(Readonly)+}
-      {+(Annotation
-        {+(TypeIdentifier)+})+}
-      {+(Identifier)+}
-      {+(Float)+})+}
-    {+(PublicFieldDefinition
-      {+(Empty)+}
-      {+(Empty)+}
-      {+(Annotation
-        {+(TypeIdentifier)+})+}
-      {+(Identifier)+}
-      {+(Float)+})+}
-    {+(PublicFieldDefinition
-      {+(Empty)+}
-      {+(Empty)+}
-      {+(Empty)+}
-      {+(Identifier)+}
-      {+(Float)+})+}
+      {-(Empty)-}
+      {-(Annotation
+        {-(TypeIdentifier)-})-}
+      {-(Identifier)-}
+      {-(Float)-})-}
     {-(PublicFieldDefinition
       {-(Identifier)-}
       {-(Readonly)-}