From 944b34fd4e96edb9dcb54313aabe0455b3ab51c6 Mon Sep 17 00:00:00 2001 From: Arthur Ozga Date: Fri, 17 Mar 2017 12:08:38 -0700 Subject: [PATCH] move commas to end of line --- src/compiler/checker.ts | 44 ++++----- src/compiler/visitor.ts | 92 +++++++++--------- src/services/codefixes/fixAddMissingMember.ts | 34 +++---- src/services/codefixes/helpers.ts | 96 +++++++++---------- 4 files changed, 132 insertions(+), 134 deletions(-) diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 58186560e8b..bb5046a8d66 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -2210,13 +2210,13 @@ namespace ts { // TODO: how should we clone members/modifiers? // TODO: check initializer accessibility correctly. const parameterNode = createParameter( - parameterDeclaration.decorators && parameterDeclaration.decorators.map(getSynthesizedDeepClone) - , parameterDeclaration.modifiers && parameterDeclaration.modifiers.map(getSynthesizedDeepClone) - , parameterDeclaration.dotDotDotToken && createToken(SyntaxKind.DotDotDotToken) - , getSynthesizedDeepClone(parameterDeclaration.name) - , parameterDeclaration.questionToken && createToken(SyntaxKind.QuestionToken) - , parameterTypeNode - , parameterDeclaration.initializer && getSynthesizedDeepClone(parameterDeclaration.initializer)); + parameterDeclaration.decorators && parameterDeclaration.decorators.map(getSynthesizedDeepClone), + parameterDeclaration.modifiers && parameterDeclaration.modifiers.map(getSynthesizedDeepClone), + parameterDeclaration.dotDotDotToken && createToken(SyntaxKind.DotDotDotToken), + getSynthesizedDeepClone(parameterDeclaration.name), + parameterDeclaration.questionToken && createToken(SyntaxKind.QuestionToken), + parameterTypeNode, + parameterDeclaration.initializer && getSynthesizedDeepClone(parameterDeclaration.initializer)); return parameterNode; } @@ -2558,10 +2558,10 @@ namespace ts { } else { typeElements.push(createPropertySignature( - propertyName - , optionalToken - , createTypeNodeWorker(propertyType) - , /*initializer*/undefined)); + propertyName, + optionalToken, + createTypeNodeWorker(propertyType), + /*initializer*/undefined)); } } return typeElements.length ? typeElements : undefined; @@ -2636,19 +2636,19 @@ namespace ts { const name = getNameFromIndexInfo(indexInfo); const indexingParameter = createParameter( - /*decorators*/ undefined - , /*modifiers*/ undefined - , /*dotDotDotToken*/ undefined - , name - , /*questionToken*/ undefined - , indexerTypeNode - , /*initializer*/ undefined); + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, + name, + /*questionToken*/ undefined, + indexerTypeNode, + /*initializer*/ undefined); const typeNode = createTypeNode(indexInfo.type, enclosingDeclaration); return createIndexSignatureDeclaration( - [indexingParameter] - , typeNode - , /*decorators*/ undefined - , indexInfo.isReadonly ? [createToken(SyntaxKind.ReadonlyKeyword)] : undefined); + [indexingParameter], + typeNode, + /*decorators*/ undefined, + indexInfo.isReadonly ? [createToken(SyntaxKind.ReadonlyKeyword)] : undefined); } function typePredicateToString(typePredicate: TypePredicate, enclosingDeclaration?: Declaration, flags?: TypeFormatFlags): string { diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts index 1410c7aaabd..44b994ce57a 100644 --- a/src/compiler/visitor.ts +++ b/src/compiler/visitor.ts @@ -2,9 +2,7 @@ /// /// -namespace ts { - - +namespace ts { export const nullTransformationContext: TransformationContext = { enableEmitNotification: noop, enableSubstitution: noop, @@ -265,25 +263,25 @@ namespace ts { case SyntaxKind.ConstructorType: case SyntaxKind.CallSignature: case SyntaxKind.ConstructSignature: - return updateSignatureDeclaration(node - , nodesVisitor((node).typeParameters, visitor, isTypeParameter) - , visitParameterList((node).parameters, visitor, context, nodesVisitor) - , visitNode((node).type, visitor, isTypeNode)); + return updateSignatureDeclaration(node, + nodesVisitor((node).typeParameters, visitor, isTypeParameter), + visitParameterList((node).parameters, visitor, context, nodesVisitor), + visitNode((node).type, visitor, isTypeNode)); case SyntaxKind.MethodSignature: - return updateSignatureDeclaration(node - , nodesVisitor((node).typeParameters, visitor, isTypeParameter) - , visitParameterList((node).parameters, visitor, context, nodesVisitor) - , visitNode((node).type, visitor, isTypeNode) - , visitNode((node).name, visitor, isPropertyName) - , visitNode((node).questionToken, visitor, isToken)); + return updateSignatureDeclaration(node, + nodesVisitor((node).typeParameters, visitor, isTypeParameter), + visitParameterList((node).parameters, visitor, context, nodesVisitor), + visitNode((node).type, visitor, isTypeNode), + visitNode((node).name, visitor, isPropertyName), + visitNode((node).questionToken, visitor, isToken)); case SyntaxKind.IndexSignature: - return updateIndexSignatureDeclaration(node - , visitParameterList((node).parameters, visitor, context, nodesVisitor) - , visitNode((node).type, visitor, isTypeNode) - , nodesVisitor((node).decorators, visitor, isDecorator) - , nodesVisitor((node).modifiers, visitor, isModifier)); + return updateIndexSignatureDeclaration(node, + visitParameterList((node).parameters, visitor, context, nodesVisitor), + visitNode((node).type, visitor, isTypeNode), + nodesVisitor((node).decorators, visitor, isDecorator), + nodesVisitor((node).modifiers, visitor, isModifier)); case SyntaxKind.Parameter: return updateParameter(node, @@ -304,9 +302,9 @@ namespace ts { case SyntaxKind.TypePredicate: throw new Error("reached unsupported type in visitor."); case SyntaxKind.TypeReference: - return updateTypeReferenceNode(node - , visitNode((node).typeName, visitor, isEntityName) - , nodesVisitor((node).typeArguments, visitor, isTypeNode)); + return updateTypeReferenceNode(node, + visitNode((node).typeName, visitor, isEntityName), + nodesVisitor((node).typeArguments, visitor, isTypeNode)); case SyntaxKind.TypeQuery: return updateTypeQueryNode((node), visitNode((node).exprName, visitor, isEntityName)); @@ -322,8 +320,8 @@ namespace ts { case SyntaxKind.UnionType: case SyntaxKind.IntersectionType: - return updateUnionOrIntersectionTypeNode(node - , nodesVisitor((node).types, visitor, isTypeNode)); + return updateUnionOrIntersectionTypeNode(node, + nodesVisitor((node).types, visitor, isTypeNode)); case SyntaxKind.ParenthesizedType: throw new Error("reached unsupported type in visitor."); @@ -332,43 +330,43 @@ namespace ts { case SyntaxKind.TypeOperator: return updateTypeOperatorNode(node, visitNode((node).type, visitor, isTypeNode)); case SyntaxKind.IndexedAccessType: - return updateIndexedAccessTypeNode((node) - , visitNode((node).objectType, visitor, isTypeNode) - , visitNode((node).indexType, visitor, isTypeNode)); + return updateIndexedAccessTypeNode((node), + visitNode((node).objectType, visitor, isTypeNode), + visitNode((node).indexType, visitor, isTypeNode)); case SyntaxKind.MappedType: - return updateMappedTypeNode((node) - , visitNode((node).readonlyToken, visitor, isToken) - , visitNode((node).typeParameter, visitor, isTypeParameter) - , visitNode((node).questionToken, visitor, isToken) - , visitNode((node).type, visitor, isTypeNode)); + return updateMappedTypeNode((node), + visitNode((node).readonlyToken, visitor, isToken), + visitNode((node).typeParameter, visitor, isTypeParameter), + visitNode((node).questionToken, visitor, isToken), + visitNode((node).type, visitor, isTypeNode)); case SyntaxKind.LiteralType: - return updateLiteralTypeNode(node - , visitNode((node).literal, visitor, isExpression)); + return updateLiteralTypeNode(node, + visitNode((node).literal, visitor, isExpression)); // Type Declarations case SyntaxKind.TypeParameter: - return updateTypeParameterDeclaration(node - , visitNode((node).name, visitor, isIdentifier) - , visitNode((node).constraint, visitor, isTypeNode) - , visitNode((node).default, visitor, isTypeNode)); + return updateTypeParameterDeclaration(node, + visitNode((node).name, visitor, isIdentifier), + visitNode((node).constraint, visitor, isTypeNode), + visitNode((node).default, visitor, isTypeNode)); // Type members case SyntaxKind.PropertySignature: - return updatePropertySignature((node) - , visitNode((node).name, visitor, isPropertyName) - , visitNode((node).questionToken, visitor, isToken) - , visitNode((node).type, visitor, isTypeNode) - , visitNode((node).initializer, visitor, isExpression)); + return updatePropertySignature((node), + visitNode((node).name, visitor, isPropertyName), + visitNode((node).questionToken, visitor, isToken), + visitNode((node).type, visitor, isTypeNode), + visitNode((node).initializer, visitor, isExpression)); case SyntaxKind.IndexSignature: - return updateIndexSignatureDeclaration(node - , visitParameterList((node).parameters, visitor, context, nodesVisitor) - , visitNode((node).type, visitor, isTypeNode) - , nodesVisitor((node).decorators, visitor, isDecorator) - , nodesVisitor((node).modifiers, visitor, isModifier)); + return updateIndexSignatureDeclaration(node, + visitParameterList((node).parameters, visitor, context, nodesVisitor), + visitNode((node).type, visitor, isTypeNode), + nodesVisitor((node).decorators, visitor, isDecorator), + nodesVisitor((node).modifiers, visitor, isModifier)); case SyntaxKind.PropertyDeclaration: return updateProperty(node, diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts index 53990927575..a67c6791ba3 100644 --- a/src/services/codefixes/fixAddMissingMember.ts +++ b/src/services/codefixes/fixAddMissingMember.ts @@ -44,29 +44,29 @@ namespace ts.codefix { const openBrace = getOpenBraceOfClassLike(classDeclaration, sourceFile); const property = createProperty( - /*decorators*/undefined - , /*modifiers*/ undefined - , token.getText(sourceFile) - , /*questionToken*/ undefined - , typeNode - , /*initializer*/ undefined); + /*decorators*/undefined, + /*modifiers*/ undefined, + token.getText(sourceFile), + /*questionToken*/ undefined, + typeNode, + /*initializer*/ undefined); const propertyChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context); propertyChangeTracker.insertNodeAfter(sourceFile, openBrace, property, { suffix: context.newLineCharacter }); const stringTypeNode = createKeywordTypeNode(SyntaxKind.StringKeyword); const indexingParameter = createParameter( - /*decorators*/ undefined - , /*modifiers*/ undefined - , /*dotDotDotToken*/ undefined - , "x" - , /*questionToken*/ undefined - , stringTypeNode - , /*initializer*/ undefined); + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, + "x", + /*questionToken*/ undefined, + stringTypeNode, + /*initializer*/ undefined); const indexSignature = createIndexSignatureDeclaration( - [indexingParameter] - , typeNode - , /*decorators*/undefined - , /*modifiers*/ undefined); + [indexingParameter], + typeNode, + /*decorators*/undefined, + /*modifiers*/ undefined); const indexSignatureChangeTracker = textChanges.ChangeTracker.fromCodeFixContext(context); indexSignatureChangeTracker.insertNodeAfter(sourceFile, openBrace, indexSignature, { suffix: context.newLineCharacter }); diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts index e642da2159a..2d1d76ac8a6 100644 --- a/src/services/codefixes/helpers.ts +++ b/src/services/codefixes/helpers.ts @@ -63,12 +63,12 @@ namespace ts.codefix { case SyntaxKind.PropertyDeclaration: const typeNode = checker.createTypeNode(type, enclosingDeclaration); const property = createProperty( - /*decorators*/undefined - , modifiers - , name - , /*questionToken*/ undefined - , typeNode - , /*initializer*/ undefined); + /*decorators*/undefined, + modifiers, + name, + /*questionToken*/ undefined, + typeNode, + /*initializer*/ undefined); return property; case SyntaxKind.MethodSignature: case SyntaxKind.MethodDeclaration: @@ -97,15 +97,15 @@ namespace ts.codefix { const signature = signatures[i]; const signatureParts = checker.createSignatureParts(signature, enclosingDeclaration); signatureDeclarations.push(createMethod( - /*decorators*/ undefined - , modifiers - , /*asteriskToken*/ undefined - , name - , optional ? createToken(SyntaxKind.QuestionToken) : undefined - , signatureParts.typeParameters - , signatureParts.parameters - , signatureParts.type - , /*body*/undefined)); + /*decorators*/ undefined, + modifiers, + /*asteriskToken*/ undefined, + name, + optional ? createToken(SyntaxKind.QuestionToken) : undefined, + signatureParts.typeParameters, + signatureParts.parameters, + signatureParts.type, + /*body*/undefined)); } if (declarations.length > signatures.length) { @@ -150,59 +150,59 @@ namespace ts.codefix { for (let i = 0; i < maxNonRestArgs; i++) { const anyType = createKeywordTypeNode(SyntaxKind.AnyKeyword); const newParameter = createParameter( - /*decorators*/ undefined - , /*modifiers*/ undefined - , /*dotDotDotToken*/ undefined - , maxArgsParameterSymbolNames[i] - , /*questionToken*/ i >= minArgumentCount ? createToken(SyntaxKind.QuestionToken) : undefined - , anyType - , /*initializer*/ undefined); + /*decorators*/ undefined, + /*modifiers*/ undefined, + /*dotDotDotToken*/ undefined, + maxArgsParameterSymbolNames[i], + /*questionToken*/ i >= minArgumentCount ? createToken(SyntaxKind.QuestionToken) : undefined, + anyType, + /*initializer*/ undefined); parameters.push(newParameter); } if (someSigHasRestParameter) { const anyArrayType = createArrayTypeNode(createKeywordTypeNode(SyntaxKind.AnyKeyword)); const restParameter = createParameter( - /*decorators*/ undefined - , /*modifiers*/ undefined - , createToken(SyntaxKind.DotDotDotToken) - , maxArgsParameterSymbolNames[maxNonRestArgs] || "rest" - , /*questionToken*/ maxNonRestArgs >= minArgumentCount ? createToken(SyntaxKind.QuestionToken) : undefined - , anyArrayType - , /*initializer*/ undefined); + /*decorators*/ undefined, + /*modifiers*/ undefined, + createToken(SyntaxKind.DotDotDotToken), + maxArgsParameterSymbolNames[maxNonRestArgs] || "rest", + /*questionToken*/ maxNonRestArgs >= minArgumentCount ? createToken(SyntaxKind.QuestionToken) : undefined, + anyArrayType, + /*initializer*/ undefined); parameters.push(restParameter); } return createStubbedMethod( - modifiers - , name - , optional - , /*typeParameters*/undefined - , parameters - , /*returnType*/ undefined); + modifiers, + name, + optional, + /*typeParameters*/undefined, + parameters, + /*returnType*/ undefined); } export function createStubbedMethod(modifiers: Modifier[], name: PropertyName, optional: boolean, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], returnType: TypeNode | undefined) { return createMethod( - /*decorators*/undefined - , modifiers - , /*asteriskToken*/undefined - , name - , optional ? createToken(SyntaxKind.QuestionToken) : undefined - , typeParameters - , parameters - , returnType - , createStubbedMethodBody()); + /*decorators*/undefined, + modifiers, + /*asteriskToken*/undefined, + name, + optional ? createToken(SyntaxKind.QuestionToken) : undefined, + typeParameters, + parameters, + returnType, + createStubbedMethodBody()); } function createStubbedMethodBody() { return createBlock( [createThrow( createNew( - createIdentifier('Error') - , /*typeArguments*/undefined - , [createLiteral('Method not implemented.')]))] - , /*multiline*/true); + createIdentifier('Error'), + /*typeArguments*/undefined, + [createLiteral('Method not implemented.')]))], + /*multiline*/true); } function createVisibilityModifier(flags: ModifierFlags) {