From 3fb64aebbf5167c96066cf7c0803bb513e04a19d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Sat, 27 Aug 2022 13:26:40 -0400 Subject: [PATCH] Revert "fix: bail out only when they could form bitshift" This reverts commit c4136710fdd7d4112eb7fd284aae21a93f3b716e. --- .../src/plugins/typescript/index.ts | 9 ++-- .../input.ts | 1 - .../output.json | 51 ------------------- .../input.ts | 1 - .../output.json | 51 ------------------- 5 files changed, 4 insertions(+), 109 deletions(-) delete mode 100644 packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/input.ts delete mode 100644 packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/output.json delete mode 100644 packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/input.ts delete mode 100644 packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/output.json diff --git a/packages/babel-parser/src/plugins/typescript/index.ts b/packages/babel-parser/src/plugins/typescript/index.ts index 4fff24c2ba0c..1c9b801cefff 100644 --- a/packages/babel-parser/src/plugins/typescript/index.ts +++ b/packages/babel-parser/src/plugins/typescript/index.ts @@ -2506,11 +2506,10 @@ export default (superClass: ClassWithMixin) => const tokenType = this.state.type; if ( - (this.state.start === this.state.lastTokStart + 1 && - // a>c is not (a)>c, but a<(b>>c) - (tokenType === tt.gt || - // a>>c is not (a)>>c, but a<(b>>>c) - tokenType === tt.bitShiftR)) || + // a>c is not (a)>c, but a<(b>>c) + tokenType === tt.gt || + // a>>c is not (a)>>c, but a<(b>>>c) + tokenType === tt.bitShiftR || // ac is (ac (tokenType !== tt.parenL && tokenCanStartExpression(tokenType) && diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/input.ts deleted file mode 100644 index 929f46c802e9..000000000000 --- a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/input.ts +++ /dev/null @@ -1 +0,0 @@ -a > c; diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/output.json b/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/output.json deleted file mode 100644 index ab436ec84967..000000000000 --- a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-2/output.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "File", - "start":0,"end":9,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":9,"index":9}}, - "program": { - "type": "Program", - "start":0,"end":9,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":9,"index":9}}, - "sourceType": "module", - "interpreter": null, - "body": [ - { - "type": "ExpressionStatement", - "start":0,"end":9,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":9,"index":9}}, - "expression": { - "type": "BinaryExpression", - "start":0,"end":8,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":8,"index":8}}, - "left": { - "type": "TSInstantiationExpression", - "start":0,"end":4,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":4,"index":4}}, - "expression": { - "type": "Identifier", - "start":0,"end":1,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":1,"index":1},"identifierName":"a"}, - "name": "a" - }, - "typeParameters": { - "type": "TSTypeParameterInstantiation", - "start":1,"end":4,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":4,"index":4}}, - "params": [ - { - "type": "TSTypeReference", - "start":2,"end":3,"loc":{"start":{"line":1,"column":2,"index":2},"end":{"line":1,"column":3,"index":3}}, - "typeName": { - "type": "Identifier", - "start":2,"end":3,"loc":{"start":{"line":1,"column":2,"index":2},"end":{"line":1,"column":3,"index":3},"identifierName":"b"}, - "name": "b" - } - } - ] - } - }, - "operator": ">", - "right": { - "type": "Identifier", - "start":7,"end":8,"loc":{"start":{"line":1,"column":7,"index":7},"end":{"line":1,"column":8,"index":8},"identifierName":"c"}, - "name": "c" - } - } - } - ], - "directives": [] - } -} diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/input.ts b/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/input.ts deleted file mode 100644 index 5b90b10a4511..000000000000 --- a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/input.ts +++ /dev/null @@ -1 +0,0 @@ -a >> c; diff --git a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/output.json b/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/output.json deleted file mode 100644 index 2b5e51509615..000000000000 --- a/packages/babel-parser/test/fixtures/typescript/type-arguments/instantiation-expression-binary-operator-3/output.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "type": "File", - "start":0,"end":10,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":10,"index":10}}, - "program": { - "type": "Program", - "start":0,"end":10,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":10,"index":10}}, - "sourceType": "module", - "interpreter": null, - "body": [ - { - "type": "ExpressionStatement", - "start":0,"end":10,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":10,"index":10}}, - "expression": { - "type": "BinaryExpression", - "start":0,"end":9,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":9,"index":9}}, - "left": { - "type": "TSInstantiationExpression", - "start":0,"end":4,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":4,"index":4}}, - "expression": { - "type": "Identifier", - "start":0,"end":1,"loc":{"start":{"line":1,"column":0,"index":0},"end":{"line":1,"column":1,"index":1},"identifierName":"a"}, - "name": "a" - }, - "typeParameters": { - "type": "TSTypeParameterInstantiation", - "start":1,"end":4,"loc":{"start":{"line":1,"column":1,"index":1},"end":{"line":1,"column":4,"index":4}}, - "params": [ - { - "type": "TSTypeReference", - "start":2,"end":3,"loc":{"start":{"line":1,"column":2,"index":2},"end":{"line":1,"column":3,"index":3}}, - "typeName": { - "type": "Identifier", - "start":2,"end":3,"loc":{"start":{"line":1,"column":2,"index":2},"end":{"line":1,"column":3,"index":3},"identifierName":"b"}, - "name": "b" - } - } - ] - } - }, - "operator": ">>", - "right": { - "type": "Identifier", - "start":8,"end":9,"loc":{"start":{"line":1,"column":8,"index":8},"end":{"line":1,"column":9,"index":9},"identifierName":"c"}, - "name": "c" - } - } - } - ], - "directives": [] - } -}