Skip to content

Commit af18df3

Browse files
rbucktonrbuckton
committed
Simplify visitNode
1 parent 0243510 commit af18df3

6 files changed

Lines changed: 65 additions & 120 deletions

File tree

‎src/compiler/transformers/es2015.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,7 +2348,7 @@ namespace ts {
23482348
addRange(statements, convertedLoopBodyStatements);
23492349
}
23502350
else {
2351-
const statement = visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock);
2351+
const statement = visitNode(node.statement, visitor, isStatement, liftToBlock);
23522352
if (isBlock(statement)) {
23532353
addRange(statements, statement.statements);
23542354
bodyLocation = statement;
@@ -2570,7 +2570,7 @@ namespace ts {
25702570
}
25712571

25722572
startLexicalEnvironment();
2573-
let loopBody = visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock);
2573+
let loopBody = visitNode(node.statement, visitor, isStatement, liftToBlock);
25742574
const lexicalEnvironment = endLexicalEnvironment();
25752575

25762576
const currentState = convertedLoopState;

‎src/compiler/transformers/generators.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,7 +1227,7 @@ namespace ts {
12271227
case SyntaxKind.TryStatement:
12281228
return transformAndEmitTryStatement(<TryStatement>node);
12291229
default:
1230-
return emitStatement(visitNode(node, visitor, isStatement, /*optional*/ true));
1230+
return emitStatement(visitNode(node, visitor, isStatement));
12311231
}
12321232
}
12331233

@@ -1485,9 +1485,9 @@ namespace ts {
14851485
variables.length > 0
14861486
? inlineExpressions(map(variables, transformInitializedVariable))
14871487
: undefined,
1488-
visitNode(node.condition, visitor, isExpression, /*optional*/ true),
1489-
visitNode(node.incrementor, visitor, isExpression, /*optional*/ true),
1490-
visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock)
1488+
visitNode(node.condition, visitor, isExpression),
1489+
visitNode(node.incrementor, visitor, isExpression),
1490+
visitNode(node.statement, visitor, isStatement, liftToBlock)
14911491
);
14921492
}
14931493
else {
@@ -1609,7 +1609,7 @@ namespace ts {
16091609
node = updateForIn(node,
16101610
<Identifier>initializer.declarations[0].name,
16111611
visitNode(node.expression, visitor, isExpression),
1612-
visitNode(node.statement, visitor, isStatement, /*optional*/ false, liftToBlock)
1612+
visitNode(node.statement, visitor, isStatement, liftToBlock)
16131613
);
16141614
}
16151615
else {
@@ -1659,14 +1659,14 @@ namespace ts {
16591659

16601660
function transformAndEmitReturnStatement(node: ReturnStatement): void {
16611661
emitReturn(
1662-
visitNode(node.expression, visitor, isExpression, /*optional*/ true),
1662+
visitNode(node.expression, visitor, isExpression),
16631663
/*location*/ node
16641664
);
16651665
}
16661666

16671667
function visitReturnStatement(node: ReturnStatement) {
16681668
return createInlineReturn(
1669-
visitNode(node.expression, visitor, isExpression, /*optional*/ true),
1669+
visitNode(node.expression, visitor, isExpression),
16701670
/*location*/ node
16711671
);
16721672
}

‎src/compiler/transformers/module/module.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ namespace ts {
8888
append(statements, createUnderscoreUnderscoreESModule());
8989
}
9090

91-
append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
91+
append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement));
9292
addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
9393
addRange(statements, endLexicalEnvironment());
9494
addExportEqualsIfNeeded(statements, /*emitAsReturn*/ false);
@@ -380,7 +380,7 @@ namespace ts {
380380
}
381381

382382
// Visit each statement of the module body.
383-
append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true));
383+
append(statements, visitNode(currentModuleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement));
384384
addRange(statements, visitNodes(node.statements, sourceElementVisitor, isStatement, statementOffset));
385385

386386
// End the lexical environment for the module body

‎src/compiler/transformers/module/system.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ namespace ts {
245245
);
246246

247247
// Visit the synthetic external helpers import declaration if present
248-
visitNode(moduleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement, /*optional*/ true);
248+
visitNode(moduleInfo.externalHelpersImportDeclaration, sourceElementVisitor, isStatement);
249249

250250
// Visit the statements of the source file, emitting any transformations into
251251
// the `executeStatements` array. We do this *before* we fill the `setters` array
@@ -1218,8 +1218,8 @@ namespace ts {
12181218
node = updateFor(
12191219
node,
12201220
visitForInitializer(node.initializer),
1221-
visitNode(node.condition, destructuringVisitor, isExpression, /*optional*/ true),
1222-
visitNode(node.incrementor, destructuringVisitor, isExpression, /*optional*/ true),
1221+
visitNode(node.condition, destructuringVisitor, isExpression),
1222+
visitNode(node.incrementor, destructuringVisitor, isExpression),
12231223
visitNode(node.statement, nestedElementVisitor, isStatement)
12241224
);
12251225

@@ -1240,7 +1240,7 @@ namespace ts {
12401240
node,
12411241
visitForInitializer(node.initializer),
12421242
visitNode(node.expression, destructuringVisitor, isExpression),
1243-
visitNode(node.statement, nestedElementVisitor, isStatement, /*optional*/ false, liftToBlock)
1243+
visitNode(node.statement, nestedElementVisitor, isStatement, liftToBlock)
12441244
);
12451245

12461246
enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
@@ -1260,7 +1260,7 @@ namespace ts {
12601260
node,
12611261
visitForInitializer(node.initializer),
12621262
visitNode(node.expression, destructuringVisitor, isExpression),
1263-
visitNode(node.statement, nestedElementVisitor, isStatement, /*optional*/ false, liftToBlock)
1263+
visitNode(node.statement, nestedElementVisitor, isStatement, liftToBlock)
12641264
);
12651265

12661266
enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
@@ -1305,7 +1305,7 @@ namespace ts {
13051305
function visitDoStatement(node: DoStatement): VisitResult<Statement> {
13061306
return updateDo(
13071307
node,
1308-
visitNode(node.statement, nestedElementVisitor, isStatement, /*optional*/ false, liftToBlock),
1308+
visitNode(node.statement, nestedElementVisitor, isStatement, liftToBlock),
13091309
visitNode(node.expression, destructuringVisitor, isExpression)
13101310
);
13111311
}
@@ -1319,7 +1319,7 @@ namespace ts {
13191319
return updateWhile(
13201320
node,
13211321
visitNode(node.expression, destructuringVisitor, isExpression),
1322-
visitNode(node.statement, nestedElementVisitor, isStatement, /*optional*/ false, liftToBlock)
1322+
visitNode(node.statement, nestedElementVisitor, isStatement, liftToBlock)
13231323
);
13241324
}
13251325

@@ -1332,7 +1332,7 @@ namespace ts {
13321332
return updateLabel(
13331333
node,
13341334
node.label,
1335-
visitNode(node.statement, nestedElementVisitor, isStatement, /*optional*/ false, liftToBlock)
1335+
visitNode(node.statement, nestedElementVisitor, isStatement, liftToBlock)
13361336
);
13371337
}
13381338

@@ -1345,7 +1345,7 @@ namespace ts {
13451345
return updateWith(
13461346
node,
13471347
visitNode(node.expression, destructuringVisitor, isExpression),
1348-
visitNode(node.statement, nestedElementVisitor, isStatement, /*optional*/ false, liftToBlock)
1348+
visitNode(node.statement, nestedElementVisitor, isStatement, liftToBlock)
13491349
);
13501350
}
13511351

‎src/compiler/transformers/ts.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2833,7 +2833,7 @@ namespace ts {
28332833
}
28342834

28352835
// Elide the declaration if the import clause was elided.
2836-
const importClause = visitNode(node.importClause, visitImportClause, isImportClause, /*optional*/ true);
2836+
const importClause = visitNode(node.importClause, visitImportClause, isImportClause);
28372837
return importClause
28382838
? updateImportDeclaration(
28392839
node,
@@ -2852,7 +2852,7 @@ namespace ts {
28522852
function visitImportClause(node: ImportClause): VisitResult<ImportClause> {
28532853
// Elide the import clause if we elide both its name and its named bindings.
28542854
const name = resolver.isReferencedAliasDeclaration(node) ? node.name : undefined;
2855-
const namedBindings = visitNode(node.namedBindings, visitNamedImportBindings, isNamedImportBindings, /*optional*/ true);
2855+
const namedBindings = visitNode(node.namedBindings, visitNamedImportBindings, isNamedImportBindings);
28562856
return (name || namedBindings) ? updateImportClause(node, name, namedBindings) : undefined;
28572857
}
28582858

@@ -2914,7 +2914,7 @@ namespace ts {
29142914
}
29152915

29162916
// Elide the export declaration if all of its named exports are elided.
2917-
const exportClause = visitNode(node.exportClause, visitNamedExports, isNamedExports, /*optional*/ true);
2917+
const exportClause = visitNode(node.exportClause, visitNamedExports, isNamedExports);
29182918
return exportClause
29192919
? updateExportDeclaration(
29202920
node,

0 commit comments

Comments
 (0)