{"patch":"diff --git a\/compiler\/forget\/src\/HIR\/BuildHIR.ts b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\nindex 1925068d69..ea14dbbf0b 100644\n--- a\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/BuildHIR.ts\n@@ -7,7 +7,6 @@\n \n import { NodePath, Scope } from \"@babel\/traverse\";\n import * as t from \"@babel\/types\";\n-import invariant from \"invariant\";\n import { CompilerError, ErrorSeverity } from \"..\/CompilerError\";\n import { Err, Ok, Result } from \"..\/lib\/Result\";\n import { assertExhaustive } from \"..\/Utils\/utils\";\n@@ -25,7 +24,7 @@ import {\n Place,\n ReturnTerminal,\n SourceLocation,\n- ThrowTerminal\n+ ThrowTerminal,\n } from \".\/HIR\";\n import HIRBuilder, { Environment } from \".\/HIRBuilder\";\n \n@@ -52,11 +51,8 @@ export function lower(\n const env = new Environment();\n const builder = new HIRBuilder(env);\n \n- \/\/ Internal babel is on an older version that does not have hasNode (v7.17)\n- \/\/ See https:\/\/github.com\/babel\/babel\/pull\/13940\/files for impl\n- \/\/ TODO: write helper function for NodePath.node != null\n const id =\n- func.isFunctionDeclaration() && (func.get(\"id\").node != null)\n+ func.isFunctionDeclaration() && func.get(\"id\").hasNode()\n ? builder.resolveIdentifier(func.get(\"id\") as NodePath)\n : null;\n \n@@ -136,8 +132,8 @@ function lowerStatement(\n case \"ReturnStatement\": {\n const stmt = stmtPath as NodePath;\n const argument = stmt.get(\"argument\");\n- const value = (argument.node != null)\n- ? lowerExpressionToPlace(builder, argument as NodePath)\n+ const value = argument.hasNode()\n+ ? lowerExpressionToPlace(builder, argument)\n : null;\n const fallthrough = builder.reserve();\n const terminal: ReturnTerminal = {\n@@ -166,9 +162,9 @@ function lowerStatement(\n \/\/ Block for the alternate (if the test is not truthy)\n let alternateBlock: BlockId;\n const alternate = stmt.get(\"alternate\");\n- if (alternate.node != null) {\n+ if (alternate.hasNode()) {\n alternateBlock = builder.enter(\"block\", (blockId) => {\n- lowerStatement(builder, alternate as NodePath);\n+ lowerStatement(builder, alternate);\n return {\n kind: \"goto\",\n block: continuationBlock.id,\n@@ -351,7 +347,7 @@ function lowerStatement(\n \n const updateBlock = builder.enter(\"value\", (blockId) => {\n const update = stmt.get(\"update\");\n- if (!(update.node != null)) {\n+ if (!update.hasNode()) {\n builder.pushError({\n reason: \"Handle empty for updater\",\n severity: ErrorSeverity.Todo,\n@@ -359,7 +355,7 @@ function lowerStatement(\n });\n return { kind: \"unsupported\", id: makeInstructionId(0) };\n }\n- lowerExpressionToVoid(builder, update as NodePath);\n+ lowerExpressionToVoid(builder, update);\n return {\n kind: \"goto\",\n block: testBlock.id,\n@@ -395,7 +391,7 @@ function lowerStatement(\n );\n \n const test = stmt.get(\"test\");\n- if (!(test.node != null)) {\n+ if (!test.hasNode()) {\n builder.pushError({\n reason: \"ForStatement without test\",\n severity: ErrorSeverity.Todo,\n@@ -406,7 +402,7 @@ function lowerStatement(\n \"value\",\n {\n kind: \"if\",\n- test: lowerExpressionToPlace(builder, test as NodePath),\n+ test: lowerExpressionToPlace(builder, test),\n consequent: bodyBlock,\n alternate: continuationBlock.id,\n fallthrough: continuationBlock.id,\n@@ -574,7 +570,7 @@ function lowerStatement(\n for (let ii = stmt.get(\"cases\").length - 1; ii >= 0; ii--) {\n const case_: NodePath = stmt.get(\"cases\")[ii];\n const test = case_.get(\"test\");\n- if (!(test.node != null)) {\n+ if (!test.hasNode()) {\n if (hasDefault) {\n builder.pushError({\n reason:\n@@ -604,7 +600,7 @@ function lowerStatement(\n });\n });\n cases.push({\n- test: (test.node != null) ? lowerExpressionToPlace(builder, test as NodePath) : null,\n+ test: test.hasNode() ? lowerExpressionToPlace(builder, test) : null,\n block,\n });\n fallthrough = block;\n@@ -646,13 +642,13 @@ function lowerStatement(\n *\/\n lowerStatement(builder, stmt.get(\"block\"));\n const handler = stmt.get(\"handler\");\n- if (handler.node != null) {\n+ if (handler.hasNode()) {\n \/\/ TODO: consider whether we need to track the param\n- lowerStatement(builder, handler.get(\"body\") as NodePath);\n+ lowerStatement(builder, handler.get(\"body\"));\n }\n const finalizer = stmt.get(\"finalizer\");\n- if (finalizer.node != null) {\n- lowerStatement(builder, finalizer as NodePath);\n+ if (finalizer.hasNode()) {\n+ lowerStatement(builder, finalizer);\n }\n return;\n }\n@@ -674,8 +670,8 @@ function lowerStatement(\n const id = declaration.get(\"id\");\n const init = declaration.get(\"init\");\n let value: InstructionValue;\n- if (init.node != null) {\n- value = lowerExpression(builder, init as NodePath);\n+ if (init.hasNode()) {\n+ value = lowerExpression(builder, init);\n } else {\n value = {\n kind: \"Primitive\",\n@@ -860,7 +856,7 @@ function lowerExpression(\n let hasError = false;\n let elements: Place[] = [];\n for (const element of expr.get(\"elements\")) {\n- if (!(element.node != null) || !element.isExpression()) {\n+ if (!element.hasNode() || !element.isExpression()) {\n builder.pushError({\n reason: \"Handle non-expression array elements\",\n severity: ErrorSeverity.Todo,\n@@ -869,7 +865,7 @@ function lowerExpression(\n hasError = true;\n continue;\n }\n- elements.push(lowerExpressionToPlace(builder, element as NodePath));\n+ elements.push(lowerExpressionToPlace(builder, element));\n }\n return hasError\n ? { kind: \"UnsupportedNode\", node: exprNode, loc: exprLoc }\n@@ -1774,7 +1770,7 @@ function lowerAssignment(\n let hasError = false;\n for (let i = 0; i < elements.length; i++) {\n const element = elements[i];\n- if (!(element.node != null)) {\n+ if (!element.hasNode()) {\n continue;\n }\n if (element.node.type === \"RestElement\") {\n@@ -1806,7 +1802,7 @@ function lowerAssignment(\n object: { ...arrayPlace },\n property,\n };\n- lowerAssignment(builder, loc, kind, element as NodePath, value);\n+ lowerAssignment(builder, loc, kind, element, value);\n }\n return hasError\n ? { kind: \"UnsupportedNode\", node: lvalueNode, loc }\n","body":"reverts \/ redos #1055 \n\n(accidentally merged changes from another PR in #1055)","commit":{"shortRevision":"16169bec07","authorName":"mofeiZ","authorEmail":"34200447+mofeiZ@users.noreply.github.com","revision":"16169bec079682708e01bbb2bf20af760cdb6b8a","subject":"Redo patch prettier","authoredAt":"2023-01-23T16:03:49-05:00"},"parents":["07cda62430b103d9e1580fbb915b6c603ad1d2a2"],"files":[{"path":"compiler\/forget\/src\/HIR\/BuildHIR.ts","status":"M"}]}

dillon1000/react

Files changed