Skip to content

Commit aada547

Browse files
Copilotjakebailey
andcommitted
Improve variable names for better readability
Co-authored-by: jakebailey <[email protected]>
1 parent f006cb1 commit aada547

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

internal/printer/printer.go

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2966,16 +2966,16 @@ func (p *Printer) willEmitLeadingNewLine(node *ast.Expression) bool {
29662966

29672967
// For PartiallyEmittedExpression, recursively check the inner expression
29682968
if node.Kind == ast.KindPartiallyEmittedExpression {
2969-
pee := node.AsPartiallyEmittedExpression()
2970-
if node.Pos() != pee.Expression.Pos() {
2971-
trailingCommentRanges := scanner.GetTrailingCommentRanges(p.emitContext.Factory.AsNodeFactory(), p.currentSourceFile.Text(), pee.Expression.Pos())
2969+
partiallyEmitted := node.AsPartiallyEmittedExpression()
2970+
if node.Pos() != partiallyEmitted.Expression.Pos() {
2971+
trailingCommentRanges := scanner.GetTrailingCommentRanges(p.emitContext.Factory.AsNodeFactory(), p.currentSourceFile.Text(), partiallyEmitted.Expression.Pos())
29722972
for comment := range trailingCommentRanges {
29732973
if p.commentWillEmitNewLine(comment) {
29742974
return true
29752975
}
29762976
}
29772977
}
2978-
return p.willEmitLeadingNewLine(pee.Expression)
2978+
return p.willEmitLeadingNewLine(partiallyEmitted.Expression)
29792979
}
29802980

29812981
return false
@@ -3007,87 +3007,87 @@ func (p *Printer) parenthesizeExpressionForNoAsi(node *ast.Expression) *ast.Expr
30073007

30083008
switch node.Kind {
30093009
case ast.KindPartiallyEmittedExpression:
3010-
pee := node.AsPartiallyEmittedExpression()
3010+
partiallyEmitted := node.AsPartiallyEmittedExpression()
30113011
if p.willEmitLeadingNewLine(node) {
30123012
// !!! if there is an original parse tree node, restore it with location to preserve comments and source maps.
30133013
// Emit with parentheses precedence to force wrapping
30143014
return p.createParenthesizedExpressionForNoAsi(node)
30153015
}
30163016
// Recursively check the inner expression
3017-
innerParenthesized := p.parenthesizeExpressionForNoAsi(pee.Expression)
3018-
if innerParenthesized != pee.Expression {
3017+
innerParenthesized := p.parenthesizeExpressionForNoAsi(partiallyEmitted.Expression)
3018+
if innerParenthesized != partiallyEmitted.Expression {
30193019
// Need to create a new PartiallyEmittedExpression with the parenthesized inner expression
3020-
return p.updatePartiallyEmittedExpression(pee, innerParenthesized)
3020+
return p.updatePartiallyEmittedExpression(partiallyEmitted, innerParenthesized)
30213021
}
30223022

30233023
case ast.KindPropertyAccessExpression:
3024-
pae := node.AsPropertyAccessExpression()
3025-
exprParenthesized := p.parenthesizeExpressionForNoAsi(pae.Expression)
3026-
if exprParenthesized != pae.Expression {
3027-
return p.updatePropertyAccessExpression(pae, exprParenthesized)
3024+
propertyAccess := node.AsPropertyAccessExpression()
3025+
exprParenthesized := p.parenthesizeExpressionForNoAsi(propertyAccess.Expression)
3026+
if exprParenthesized != propertyAccess.Expression {
3027+
return p.updatePropertyAccessExpression(propertyAccess, exprParenthesized)
30283028
}
30293029

30303030
case ast.KindElementAccessExpression:
3031-
eae := node.AsElementAccessExpression()
3032-
exprParenthesized := p.parenthesizeExpressionForNoAsi(eae.Expression)
3033-
if exprParenthesized != eae.Expression {
3034-
return p.updateElementAccessExpression(eae, exprParenthesized)
3031+
elementAccess := node.AsElementAccessExpression()
3032+
exprParenthesized := p.parenthesizeExpressionForNoAsi(elementAccess.Expression)
3033+
if exprParenthesized != elementAccess.Expression {
3034+
return p.updateElementAccessExpression(elementAccess, exprParenthesized)
30353035
}
30363036

30373037
case ast.KindCallExpression:
3038-
ce := node.AsCallExpression()
3039-
exprParenthesized := p.parenthesizeExpressionForNoAsi(ce.Expression)
3040-
if exprParenthesized != ce.Expression {
3041-
return p.updateCallExpression(ce, exprParenthesized)
3038+
callExpr := node.AsCallExpression()
3039+
exprParenthesized := p.parenthesizeExpressionForNoAsi(callExpr.Expression)
3040+
if exprParenthesized != callExpr.Expression {
3041+
return p.updateCallExpression(callExpr, exprParenthesized)
30423042
}
30433043

30443044
case ast.KindTaggedTemplateExpression:
3045-
tte := node.AsTaggedTemplateExpression()
3046-
tagParenthesized := p.parenthesizeExpressionForNoAsi(tte.Tag)
3047-
if tagParenthesized != tte.Tag {
3048-
return p.updateTaggedTemplateExpression(tte, tagParenthesized)
3045+
taggedTemplate := node.AsTaggedTemplateExpression()
3046+
tagParenthesized := p.parenthesizeExpressionForNoAsi(taggedTemplate.Tag)
3047+
if tagParenthesized != taggedTemplate.Tag {
3048+
return p.updateTaggedTemplateExpression(taggedTemplate, tagParenthesized)
30493049
}
30503050

30513051
case ast.KindPostfixUnaryExpression:
3052-
pue := node.AsPostfixUnaryExpression()
3053-
operandParenthesized := p.parenthesizeExpressionForNoAsi(pue.Operand)
3054-
if operandParenthesized != pue.Operand {
3055-
return p.updatePostfixUnaryExpression(pue, operandParenthesized)
3052+
postfixUnary := node.AsPostfixUnaryExpression()
3053+
operandParenthesized := p.parenthesizeExpressionForNoAsi(postfixUnary.Operand)
3054+
if operandParenthesized != postfixUnary.Operand {
3055+
return p.updatePostfixUnaryExpression(postfixUnary, operandParenthesized)
30563056
}
30573057

30583058
case ast.KindBinaryExpression:
3059-
be := node.AsBinaryExpression()
3060-
leftParenthesized := p.parenthesizeExpressionForNoAsi(be.Left)
3061-
if leftParenthesized != be.Left {
3062-
return p.updateBinaryExpression(be, leftParenthesized)
3059+
binaryExpr := node.AsBinaryExpression()
3060+
leftParenthesized := p.parenthesizeExpressionForNoAsi(binaryExpr.Left)
3061+
if leftParenthesized != binaryExpr.Left {
3062+
return p.updateBinaryExpression(binaryExpr, leftParenthesized)
30633063
}
30643064

30653065
case ast.KindConditionalExpression:
3066-
ce := node.AsConditionalExpression()
3067-
conditionParenthesized := p.parenthesizeExpressionForNoAsi(ce.Condition)
3068-
if conditionParenthesized != ce.Condition {
3069-
return p.updateConditionalExpression(ce, conditionParenthesized)
3066+
conditionalExpr := node.AsConditionalExpression()
3067+
conditionParenthesized := p.parenthesizeExpressionForNoAsi(conditionalExpr.Condition)
3068+
if conditionParenthesized != conditionalExpr.Condition {
3069+
return p.updateConditionalExpression(conditionalExpr, conditionParenthesized)
30703070
}
30713071

30723072
case ast.KindAsExpression:
3073-
ae := node.AsAsExpression()
3074-
exprParenthesized := p.parenthesizeExpressionForNoAsi(ae.Expression)
3075-
if exprParenthesized != ae.Expression {
3076-
return p.updateAsExpression(ae, exprParenthesized)
3073+
asExpr := node.AsAsExpression()
3074+
exprParenthesized := p.parenthesizeExpressionForNoAsi(asExpr.Expression)
3075+
if exprParenthesized != asExpr.Expression {
3076+
return p.updateAsExpression(asExpr, exprParenthesized)
30773077
}
30783078

30793079
case ast.KindSatisfiesExpression:
3080-
se := node.AsSatisfiesExpression()
3081-
exprParenthesized := p.parenthesizeExpressionForNoAsi(se.Expression)
3082-
if exprParenthesized != se.Expression {
3083-
return p.updateSatisfiesExpression(se, exprParenthesized)
3080+
satisfiesExpr := node.AsSatisfiesExpression()
3081+
exprParenthesized := p.parenthesizeExpressionForNoAsi(satisfiesExpr.Expression)
3082+
if exprParenthesized != satisfiesExpr.Expression {
3083+
return p.updateSatisfiesExpression(satisfiesExpr, exprParenthesized)
30843084
}
30853085

30863086
case ast.KindNonNullExpression:
3087-
nne := node.AsNonNullExpression()
3088-
exprParenthesized := p.parenthesizeExpressionForNoAsi(nne.Expression)
3089-
if exprParenthesized != nne.Expression {
3090-
return p.updateNonNullExpression(nne, exprParenthesized)
3087+
nonNullExpr := node.AsNonNullExpression()
3088+
exprParenthesized := p.parenthesizeExpressionForNoAsi(nonNullExpr.Expression)
3089+
if exprParenthesized != nonNullExpr.Expression {
3090+
return p.updateNonNullExpression(nonNullExpr, exprParenthesized)
30913091
}
30923092
}
30933093

0 commit comments

Comments
 (0)