[PausePoints] lastStatement is undefined (#5828)

darkwing · jasonLaster · commit b53644d071ec · 2018-04-04T08:43:35.000-04:00
diff --git a/src/workers/parser/pausePoints.js b/src/workers/parser/pausePoints.js
@@ -135,7 +135,9 @@ function onEnter(node: BabelNode, ancestors: SimplePath[], state) {
 
   if (t.isProgram(node)) {
     const lastStatement = node.body[node.body.length - 1];
-    addPoint(state, lastStatement.loc.end);
+    if (lastStatement) {
+      addPoint(state, lastStatement.loc.end);
+    }
   }
 }
 
diff --git a/src/workers/parser/tests/__snapshots__/pausePoints.spec.js.snap b/src/workers/parser/tests/__snapshots__/pausePoints.spec.js.snap
@@ -96,6 +96,52 @@ const /*bs 25*/obj = {
 "
 `;
 
+exports[`Parser.pausePoints html 1`] = `
+"<html>
+<head>
+	<script type=\\"text/javascript\\">
+		var /*bs 1*/globalObject = {
+			first: \\"name\\",
+			last: \\"words\\"
+		};
+		/*b 2*/function sayHello (name) {
+			/*bs 3*/return \`Hello, \${name}!\`;
+		/*bs 4*/}
+	</script>
+	<style>
+		BODY {
+			font-size: 48px;
+			color: rebeccapurple;
+		}
+	</style>
+</head>
+<body>
+	<h1>Testing Script Tags in HTML</h1>
+	<script>
+		const /*bs 5*/capitalize = /*b 6*/name => {
+			/*bs 7*/return /*bs 8*/name[0]./*bs 9*/toUpperCase() + /*bs 10*/name./*bs 11*/substring(1)
+		/*bs 12*/};
+		const greetAll = /*bs 13*/[\\"my friend\\", \\"buddy\\", \\"world\\"]
+			./*bs 14*/map(capitalize)
+			./*bs 15*/map(sayHello)
+			./*bs 16*/join(\\"\\\\n\\");
+
+		/*bs 17*/globalObject.greetings = greetAll;
+	</script>
+	<p>
+		Some arbitrary intermediate content to affect the offsets of the scripts
+	</p>
+	<script>
+		/*bs 18*/(/*b 19*/function iife() {
+			const greeting = /*bs 20*/sayHello(\\"Ryan\\");
+			/*bs 21*/console./*bs 22*/log(greeting);
+		/*bs 23*/})();/*bs 24*/
+	</script>
+</body>
+</html>
+"
+`;
+
 exports[`Parser.pausePoints jsx 1`] = `
 "const jsxElement = /*bs 1*/<h1> Hi ! I'm here ! </h1>;
 
diff --git a/src/workers/parser/tests/pausePoints.spec.js b/src/workers/parser/tests/pausePoints.spec.js
@@ -25,6 +25,7 @@ cases(
     { name: "modules", file: "modules", original: true },
     { name: "jsx", file: "jsx", original: true },
     { name: "func", file: "func", original: true },
-    { name: "decorators", file: "decorators", original: true }
+    { name: "decorators", file: "decorators", original: true },
+    { name: "html", file: "parseScriptTags", type: "html" }
   ]
 );

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,9 @@ function onEnter(node: BabelNode, ancestors: SimplePath[], state) {`
`135`	`135`
`136`	`136`	`if (t.isProgram(node)) {`
`137`	`137`	`const lastStatement = node.body[node.body.length - 1];`
`138`		`- addPoint(state, lastStatement.loc.end);`
	`138`	`+ if (lastStatement) {`
	`139`	`+ addPoint(state, lastStatement.loc.end);`
	`140`	`+ }`
`139`	`141`	`}`
`140`	`142`	`}`
`141`	`143`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ cases(`
`25`	`25`	`{ name: "modules", file: "modules", original: true },`
`26`	`26`	`{ name: "jsx", file: "jsx", original: true },`
`27`	`27`	`{ name: "func", file: "func", original: true },`
`28`		`- { name: "decorators", file: "decorators", original: true }`
	`28`	`+ { name: "decorators", file: "decorators", original: true },`
	`29`	`+ { name: "html", file: "parseScriptTags", type: "html" }`
`29`	`30`	`]`
`30`	`31`	`);`