Fix: Nested type arguments are not preserved (fixes #204) (#205)

eslint · Apr 1, 2017 · 1cee2e3 · 1cee2e3
1 parent 5a324a3
commit 1cee2e3
Show file tree

Hide file tree

Showing 7 changed files with 473 additions and 6 deletions.
diff --git a/lib/ast-converter.js b/lib/ast-converter.js
@@ -546,7 +546,10 @@ module.exports = function(ast, extra) {
                             typeArgument.end
                         ],
                         loc: getLocFor(typeArgumentStart, typeArgument.end, ast),
-                        id: convertChild(typeArgument.typeName || typeArgument)
+                        id: convertChild(typeArgument.typeName || typeArgument),
+                        typeParameters: (typeArgument.typeArguments)
+                            ? convertTypeArgumentsToTypeParameters(typeArgument.typeArguments)
+                            : null
                     };
                 })
             };

diff --git a/tests/fixtures/typescript/basics/class-with-implements-generic-multiple.result.js b/tests/fixtures/typescript/basics/class-with-implements-generic-multiple.result.js
@@ -153,7 +153,8 @@ module.exports = {
                                         }
                                     },
                                     "name": "S"
-                                }
+                                },
+                                "typeParameters": null
                             },
                             {
                                 "type": "GenericTypeAnnotation",
@@ -188,7 +189,8 @@ module.exports = {
                                         }
                                     },
                                     "name": "T"
-                                }
+                                },
+                                "typeParameters": null
                             }
                         ]
                     }
@@ -398,4 +400,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/typescript/basics/class-with-implements-generic.result.js b/tests/fixtures/typescript/basics/class-with-implements-generic.result.js
@@ -153,7 +153,8 @@ module.exports = {
                                         }
                                     },
                                     "name": "S"
-                                }
+                                },
+                                "typeParameters": null
                             }
                         ]
                     }
@@ -327,4 +328,4 @@ module.exports = {
             }
         }
     ]
-};
+};