Skip to content

Commit 944b34f

Browse files
author
Arthur Ozga
committed
move commas to end of line
1 parent ac7fc8f commit 944b34f

4 files changed

Lines changed: 132 additions & 134 deletions

File tree

‎src/compiler/checker.ts‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2210,13 +2210,13 @@ namespace ts {
22102210
// TODO: how should we clone members/modifiers?
22112211
// TODO: check initializer accessibility correctly.
22122212
const parameterNode = createParameter(
2213-
parameterDeclaration.decorators && parameterDeclaration.decorators.map(getSynthesizedDeepClone)
2214-
, parameterDeclaration.modifiers && parameterDeclaration.modifiers.map(getSynthesizedDeepClone)
2215-
, parameterDeclaration.dotDotDotToken && createToken(SyntaxKind.DotDotDotToken)
2216-
, getSynthesizedDeepClone(parameterDeclaration.name)
2217-
, parameterDeclaration.questionToken && createToken(SyntaxKind.QuestionToken)
2218-
, parameterTypeNode
2219-
, parameterDeclaration.initializer && getSynthesizedDeepClone(parameterDeclaration.initializer));
2213+
parameterDeclaration.decorators && parameterDeclaration.decorators.map(getSynthesizedDeepClone),
2214+
parameterDeclaration.modifiers && parameterDeclaration.modifiers.map(getSynthesizedDeepClone),
2215+
parameterDeclaration.dotDotDotToken && createToken(SyntaxKind.DotDotDotToken),
2216+
getSynthesizedDeepClone(parameterDeclaration.name),
2217+
parameterDeclaration.questionToken && createToken(SyntaxKind.QuestionToken),
2218+
parameterTypeNode,
2219+
parameterDeclaration.initializer && getSynthesizedDeepClone(parameterDeclaration.initializer));
22202220
return parameterNode;
22212221
}
22222222

@@ -2558,10 +2558,10 @@ namespace ts {
25582558
}
25592559
else {
25602560
typeElements.push(createPropertySignature(
2561-
propertyName
2562-
, optionalToken
2563-
, createTypeNodeWorker(propertyType)
2564-
, /*initializer*/undefined));
2561+
propertyName,
2562+
optionalToken,
2563+
createTypeNodeWorker(propertyType),
2564+
/*initializer*/undefined));
25652565
}
25662566
}
25672567
return typeElements.length ? typeElements : undefined;
@@ -2636,19 +2636,19 @@ namespace ts {
26362636

26372637
const name = getNameFromIndexInfo(indexInfo);
26382638
const indexingParameter = createParameter(
2639-
/*decorators*/ undefined
2640-
, /*modifiers*/ undefined
2641-
, /*dotDotDotToken*/ undefined
2642-
, name
2643-
, /*questionToken*/ undefined
2644-
, indexerTypeNode
2645-
, /*initializer*/ undefined);
2639+
/*decorators*/ undefined,
2640+
/*modifiers*/ undefined,
2641+
/*dotDotDotToken*/ undefined,
2642+
name,
2643+
/*questionToken*/ undefined,
2644+
indexerTypeNode,
2645+
/*initializer*/ undefined);
26462646
const typeNode = createTypeNode(indexInfo.type, enclosingDeclaration);
26472647
return createIndexSignatureDeclaration(
2648-
[indexingParameter]
2649-
, typeNode
2650-
, /*decorators*/ undefined
2651-
, indexInfo.isReadonly ? [createToken(SyntaxKind.ReadonlyKeyword)] : undefined);
2648+
[indexingParameter],
2649+
typeNode,
2650+
/*decorators*/ undefined,
2651+
indexInfo.isReadonly ? [createToken(SyntaxKind.ReadonlyKeyword)] : undefined);
26522652
}
26532653

26542654
function typePredicateToString(typePredicate: TypePredicate, enclosingDeclaration?: Declaration, flags?: TypeFormatFlags): string {

‎src/compiler/visitor.ts‎

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
/// <reference path="factory.ts" />
33
/// <reference path="utilities.ts" />
44

5-
namespace ts {
6-
7-
5+
namespace ts {
86
export const nullTransformationContext: TransformationContext = {
97
enableEmitNotification: noop,
108
enableSubstitution: noop,
@@ -265,25 +263,25 @@ namespace ts {
265263
case SyntaxKind.ConstructorType:
266264
case SyntaxKind.CallSignature:
267265
case SyntaxKind.ConstructSignature:
268-
return updateSignatureDeclaration(<SignatureDeclaration>node
269-
, nodesVisitor((<SignatureDeclaration>node).typeParameters, visitor, isTypeParameter)
270-
, visitParameterList((<SignatureDeclaration>node).parameters, visitor, context, nodesVisitor)
271-
, visitNode((<SignatureDeclaration>node).type, visitor, isTypeNode));
266+
return updateSignatureDeclaration(<SignatureDeclaration>node,
267+
nodesVisitor((<SignatureDeclaration>node).typeParameters, visitor, isTypeParameter),
268+
visitParameterList((<SignatureDeclaration>node).parameters, visitor, context, nodesVisitor),
269+
visitNode((<SignatureDeclaration>node).type, visitor, isTypeNode));
272270

273271
case SyntaxKind.MethodSignature:
274-
return updateSignatureDeclaration(<SignatureDeclaration & TypeElement>node
275-
, nodesVisitor((<SignatureDeclaration & TypeElement>node).typeParameters, visitor, isTypeParameter)
276-
, visitParameterList((<SignatureDeclaration & TypeElement>node).parameters, visitor, context, nodesVisitor)
277-
, visitNode((<SignatureDeclaration & TypeElement>node).type, visitor, isTypeNode)
278-
, visitNode((<SignatureDeclaration & TypeElement>node).name, visitor, isPropertyName)
279-
, visitNode((<SignatureDeclaration & TypeElement>node).questionToken, visitor, isToken));
272+
return updateSignatureDeclaration(<SignatureDeclaration & TypeElement>node,
273+
nodesVisitor((<SignatureDeclaration & TypeElement>node).typeParameters, visitor, isTypeParameter),
274+
visitParameterList((<SignatureDeclaration & TypeElement>node).parameters, visitor, context, nodesVisitor),
275+
visitNode((<SignatureDeclaration & TypeElement>node).type, visitor, isTypeNode),
276+
visitNode((<SignatureDeclaration & TypeElement>node).name, visitor, isPropertyName),
277+
visitNode((<SignatureDeclaration & TypeElement>node).questionToken, visitor, isToken));
280278

281279
case SyntaxKind.IndexSignature:
282-
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node
283-
, visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor)
284-
, visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode)
285-
, nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator)
286-
, nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
280+
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node,
281+
visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor),
282+
visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode),
283+
nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator),
284+
nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
287285

288286
case SyntaxKind.Parameter:
289287
return updateParameter(<ParameterDeclaration>node,
@@ -304,9 +302,9 @@ namespace ts {
304302
case SyntaxKind.TypePredicate:
305303
throw new Error("reached unsupported type in visitor.");
306304
case SyntaxKind.TypeReference:
307-
return updateTypeReferenceNode(<TypeReferenceNode>node
308-
, visitNode((<TypeReferenceNode>node).typeName, visitor, isEntityName)
309-
, nodesVisitor((<TypeReferenceNode>node).typeArguments, visitor, isTypeNode));
305+
return updateTypeReferenceNode(<TypeReferenceNode>node,
306+
visitNode((<TypeReferenceNode>node).typeName, visitor, isEntityName),
307+
nodesVisitor((<TypeReferenceNode>node).typeArguments, visitor, isTypeNode));
310308

311309
case SyntaxKind.TypeQuery:
312310
return updateTypeQueryNode((<TypeQueryNode>node), visitNode((<TypeQueryNode>node).exprName, visitor, isEntityName));
@@ -322,8 +320,8 @@ namespace ts {
322320

323321
case SyntaxKind.UnionType:
324322
case SyntaxKind.IntersectionType:
325-
return updateUnionOrIntersectionTypeNode(<UnionOrIntersectionTypeNode>node
326-
, nodesVisitor((<UnionOrIntersectionTypeNode>node).types, visitor, isTypeNode));
323+
return updateUnionOrIntersectionTypeNode(<UnionOrIntersectionTypeNode>node,
324+
nodesVisitor((<UnionOrIntersectionTypeNode>node).types, visitor, isTypeNode));
327325

328326
case SyntaxKind.ParenthesizedType:
329327
throw new Error("reached unsupported type in visitor.");
@@ -332,43 +330,43 @@ namespace ts {
332330
case SyntaxKind.TypeOperator:
333331
return updateTypeOperatorNode(<TypeOperatorNode>node, visitNode((<TypeOperatorNode>node).type, visitor, isTypeNode));
334332
case SyntaxKind.IndexedAccessType:
335-
return updateIndexedAccessTypeNode((<IndexedAccessTypeNode>node)
336-
, visitNode((<IndexedAccessTypeNode>node).objectType, visitor, isTypeNode)
337-
, visitNode((<IndexedAccessTypeNode>node).indexType, visitor, isTypeNode));
333+
return updateIndexedAccessTypeNode((<IndexedAccessTypeNode>node),
334+
visitNode((<IndexedAccessTypeNode>node).objectType, visitor, isTypeNode),
335+
visitNode((<IndexedAccessTypeNode>node).indexType, visitor, isTypeNode));
338336
case SyntaxKind.MappedType:
339-
return updateMappedTypeNode((<MappedTypeNode>node)
340-
, visitNode((<MappedTypeNode>node).readonlyToken, visitor, isToken)
341-
, visitNode((<MappedTypeNode>node).typeParameter, visitor, isTypeParameter)
342-
, visitNode((<MappedTypeNode>node).questionToken, visitor, isToken)
343-
, visitNode((<MappedTypeNode>node).type, visitor, isTypeNode));
337+
return updateMappedTypeNode((<MappedTypeNode>node),
338+
visitNode((<MappedTypeNode>node).readonlyToken, visitor, isToken),
339+
visitNode((<MappedTypeNode>node).typeParameter, visitor, isTypeParameter),
340+
visitNode((<MappedTypeNode>node).questionToken, visitor, isToken),
341+
visitNode((<MappedTypeNode>node).type, visitor, isTypeNode));
344342

345343
case SyntaxKind.LiteralType:
346-
return updateLiteralTypeNode(<LiteralTypeNode>node
347-
, visitNode((<LiteralTypeNode>node).literal, visitor, isExpression));
344+
return updateLiteralTypeNode(<LiteralTypeNode>node,
345+
visitNode((<LiteralTypeNode>node).literal, visitor, isExpression));
348346

349347
// Type Declarations
350348

351349
case SyntaxKind.TypeParameter:
352-
return updateTypeParameterDeclaration(<TypeParameterDeclaration>node
353-
, visitNode((<TypeParameterDeclaration>node).name, visitor, isIdentifier)
354-
, visitNode((<TypeParameterDeclaration>node).constraint, visitor, isTypeNode)
355-
, visitNode((<TypeParameterDeclaration>node).default, visitor, isTypeNode));
350+
return updateTypeParameterDeclaration(<TypeParameterDeclaration>node,
351+
visitNode((<TypeParameterDeclaration>node).name, visitor, isIdentifier),
352+
visitNode((<TypeParameterDeclaration>node).constraint, visitor, isTypeNode),
353+
visitNode((<TypeParameterDeclaration>node).default, visitor, isTypeNode));
356354

357355
// Type members
358356

359357
case SyntaxKind.PropertySignature:
360-
return updatePropertySignature((<PropertySignature>node)
361-
, visitNode((<PropertySignature>node).name, visitor, isPropertyName)
362-
, visitNode((<PropertySignature>node).questionToken, visitor, isToken)
363-
, visitNode((<PropertySignature>node).type, visitor, isTypeNode)
364-
, visitNode((<PropertySignature>node).initializer, visitor, isExpression));
358+
return updatePropertySignature((<PropertySignature>node),
359+
visitNode((<PropertySignature>node).name, visitor, isPropertyName),
360+
visitNode((<PropertySignature>node).questionToken, visitor, isToken),
361+
visitNode((<PropertySignature>node).type, visitor, isTypeNode),
362+
visitNode((<PropertySignature>node).initializer, visitor, isExpression));
365363

366364
case SyntaxKind.IndexSignature:
367-
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node
368-
, visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor)
369-
, visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode)
370-
, nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator)
371-
, nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
365+
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node,
366+
visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor),
367+
visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode),
368+
nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator),
369+
nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
372370

373371
case SyntaxKind.PropertyDeclaration:
374372
return updateProperty(<PropertyDeclaration>node,

‎src/services/codefixes/fixAddMissingMember.ts‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,29 +44,29 @@ namespace ts.codefix {
4444
const openBrace = getOpenBraceOfClassLike(classDeclaration, sourceFile);
4545

4646
const property = createProperty(
47-
/*decorators*/undefined
48-
, /*modifiers*/ undefined
49-
, token.getText(sourceFile)
50-
, /*questionToken*/ undefined
51-
, typeNode
52-
, /*initializer*/ undefined);
47+
/*decorators*/undefined,
48+
/*modifiers*/ undefined,
49+
token.getText(sourceFile),
50+
/*questionToken*/ undefined,
51+
typeNode,
52+
/*initializer*/ undefined);
5353
const propertyChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
5454
propertyChangeTracker.insertNodeAfter(sourceFile, openBrace, property, { suffix: context.newLineCharacter });
5555

5656
const stringTypeNode = createKeywordTypeNode(SyntaxKind.StringKeyword);
5757
const indexingParameter = createParameter(
58-
/*decorators*/ undefined
59-
, /*modifiers*/ undefined
60-
, /*dotDotDotToken*/ undefined
61-
, "x"
62-
, /*questionToken*/ undefined
63-
, stringTypeNode
64-
, /*initializer*/ undefined);
58+
/*decorators*/ undefined,
59+
/*modifiers*/ undefined,
60+
/*dotDotDotToken*/ undefined,
61+
"x",
62+
/*questionToken*/ undefined,
63+
stringTypeNode,
64+
/*initializer*/ undefined);
6565
const indexSignature = createIndexSignatureDeclaration(
66-
[indexingParameter]
67-
, typeNode
68-
, /*decorators*/undefined
69-
, /*modifiers*/ undefined);
66+
[indexingParameter],
67+
typeNode,
68+
/*decorators*/undefined,
69+
/*modifiers*/ undefined);
7070

7171
const indexSignatureChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context);
7272
indexSignatureChangeTracker.insertNodeAfter(sourceFile, openBrace, indexSignature, { suffix: context.newLineCharacter });

0 commit comments

Comments
 (0)