From 4e9df2f1d0bda78d53066207525f42562fdd45f0 Mon Sep 17 00:00:00 2001 From: Federico Ciardi Date: Fri, 5 Feb 2021 17:46:31 +0100 Subject: [PATCH] fix(ts): include `asserts` in `TSTypePredicate` location --- packages/babel-parser/src/plugins/typescript/index.js | 1 + .../asserts-this-with-predicate/output.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/babel-parser/src/plugins/typescript/index.js b/packages/babel-parser/src/plugins/typescript/index.js index d11a8158fb7b..bff545f5154c 100644 --- a/packages/babel-parser/src/plugins/typescript/index.js +++ b/packages/babel-parser/src/plugins/typescript/index.js @@ -1069,6 +1069,7 @@ export default (superClass: Class): Class => node.asserts = true; thisTypePredicate = this.finishNode(node, "TSTypePredicate"); } else { + this.resetStartLocationFromNode(thisTypePredicate, node); (thisTypePredicate: N.TsTypePredicate).asserts = true; } t.typeAnnotation = thisTypePredicate; diff --git a/packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-this-with-predicate/output.json b/packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-this-with-predicate/output.json index a98a1eefa26a..8a552c9028ad 100644 --- a/packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-this-with-predicate/output.json +++ b/packages/babel-parser/test/fixtures/typescript/assert-predicate/asserts-this-with-predicate/output.json @@ -40,7 +40,7 @@ "start":21,"end":42,"loc":{"start":{"line":2,"column":9},"end":{"line":2,"column":30}}, "typeAnnotation": { "type": "TSTypePredicate", - "start":31,"end":42,"loc":{"start":{"line":2,"column":19},"end":{"line":2,"column":30}}, + "start":23,"end":42,"loc":{"start":{"line":2,"column":11},"end":{"line":2,"column":30}}, "parameterName": { "type": "TSThisType", "start":31,"end":35,"loc":{"start":{"line":2,"column":19},"end":{"line":2,"column":23}} @@ -86,7 +86,7 @@ "start":58,"end":79,"loc":{"start":{"line":3,"column":12},"end":{"line":3,"column":33}}, "typeAnnotation": { "type": "TSTypePredicate", - "start":68,"end":79,"loc":{"start":{"line":3,"column":22},"end":{"line":3,"column":33}}, + "start":60,"end":79,"loc":{"start":{"line":3,"column":14},"end":{"line":3,"column":33}}, "parameterName": { "type": "TSThisType", "start":68,"end":72,"loc":{"start":{"line":3,"column":22},"end":{"line":3,"column":26}} @@ -125,4 +125,4 @@ ], "directives": [] } -} \ No newline at end of file +}