Instrument: Fix insertion of tracker comments [fix]

Workaround for babel/babel#15138
overlookmotel · Nov 5, 2022 · 1b27938 · 1b27938
1 parent c67f913
commit 1b27938
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/lib/instrument/visitors/class.js b/lib/instrument/visitors/class.js
@@ -279,9 +279,6 @@ function visitClass(classNode, parent, key, className, state) {
 	externalTrail.length -= 2;
 	if (!parentIsStrict) state.isStrict = false;
 
-	// Insert tracking comment
-	insertTrackerComment(fn.id, FN_TYPE_CLASS, classNode, 'inner', state);
-
 	// Temporarily remove from AST so is not included in parent function's serialized AST
 	parent[key] = null;
 
@@ -441,19 +438,21 @@ function instrumentClass(
 	}
 
 	// Wrap with var for `super` target if `super` used in class
+	// and restore to original place in AST
 	const superVarNode = getSuperVarNode(superBlock);
-	if (superVarNode) {
-		classNode = wrapClassWithSuperTargetVar(classNode, parent, key, superBlock, superVarNode, state);
-	}
-
-	// Restore to original place in AST
-	parent[key] = classNode;
+	parent[key] = superVarNode
+		? wrapClassWithSuperTargetVar(classNode, parent, key, superBlock, superVarNode, state)
+		: classNode;
 
 	// Add tracker code + block vars to constructor
 	instrumentFunctionOrClassConstructor(
 		constructorNode, fn, constructorParamsBlock, constructorBodyBlock, astJson, state
 	);
 
+	// Insert tracking comment
+	const commentHolderNode = classNode.id || classNode.superClass || classNode.body;
+	insertTrackerComment(fn.id, FN_TYPE_CLASS, commentHolderNode, 'leading', state);
+
 	// TODO Handle prototype properties
 }
 
@@ -509,7 +508,7 @@ function wrapClassWithSuperTargetVar(classNode, parent, key, superBlock, superVa
 function getClassDeclarationReplacement(classNode, superVarNode) {
 	classNode.type = 'ClassExpression';
 	return t.variableDeclaration(
-		'let', [t.variableDeclarator(classNode.id, t.assignmentExpression('=', superVarNode, classNode))]
+		'let', [t.variableDeclarator({...classNode.id}, t.assignmentExpression('=', superVarNode, classNode))]
 	);
 }
 

diff --git a/lib/instrument/visitors/function.js b/lib/instrument/visitors/function.js
@@ -667,8 +667,9 @@ function createTrackerCall(scopes, fnInfoVarNode, state) {
  * @returns {undefined}
  */
 function insertFunctionDeclarationOrExpressionTrackerComment(fn, node, state) {
-	// Insert tracker comment after `function` keyword
-	insertTrackerComment(fn.id, getFunctionType(node), node, 'inner', state);
+	// Insert tracker comment before identifier, or before 1st param or before function body
+	const commentHolderNode = node.id || (node.params.length !== 0 ? node.params[0] : node.body);
+	insertTrackerComment(fn.id, getFunctionType(node), commentHolderNode, 'leading', state);
 }
 
 /**