microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-12 04:17:34 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

move commas to end of line

Browse Source
This commit is contained in:
Arthur Ozga 2017-03-17 12:08:38 -07:00
parent ac7fc8fe75
commit 944b34fd4e
4 changed files with 132 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/compiler/checker.ts
View File

@ -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 {

92
src/compiler/visitor.ts
View File

@ -2,9 +2,7 @@
/// <reference path="factory.ts" />
/// <reference path="utilities.ts" />
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(<SignatureDeclaration>node
, nodesVisitor((<SignatureDeclaration>node).typeParameters, visitor, isTypeParameter)
, visitParameterList((<SignatureDeclaration>node).parameters, visitor, context, nodesVisitor)
, visitNode((<SignatureDeclaration>node).type, visitor, isTypeNode));
return updateSignatureDeclaration(<SignatureDeclaration>node,
nodesVisitor((<SignatureDeclaration>node).typeParameters, visitor, isTypeParameter),
visitParameterList((<SignatureDeclaration>node).parameters, visitor, context, nodesVisitor),
visitNode((<SignatureDeclaration>node).type, visitor, isTypeNode));
case SyntaxKind.MethodSignature:
return updateSignatureDeclaration(<SignatureDeclaration & TypeElement>node
, nodesVisitor((<SignatureDeclaration & TypeElement>node).typeParameters, visitor, isTypeParameter)
, visitParameterList((<SignatureDeclaration & TypeElement>node).parameters, visitor, context, nodesVisitor)
, visitNode((<SignatureDeclaration & TypeElement>node).type, visitor, isTypeNode)
, visitNode((<SignatureDeclaration & TypeElement>node).name, visitor, isPropertyName)
, visitNode((<SignatureDeclaration & TypeElement>node).questionToken, visitor, isToken));
return updateSignatureDeclaration(<SignatureDeclaration & TypeElement>node,
nodesVisitor((<SignatureDeclaration & TypeElement>node).typeParameters, visitor, isTypeParameter),
visitParameterList((<SignatureDeclaration & TypeElement>node).parameters, visitor, context, nodesVisitor),
visitNode((<SignatureDeclaration & TypeElement>node).type, visitor, isTypeNode),
visitNode((<SignatureDeclaration & TypeElement>node).name, visitor, isPropertyName),
visitNode((<SignatureDeclaration & TypeElement>node).questionToken, visitor, isToken));
case SyntaxKind.IndexSignature:
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node
, visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor)
, visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode)
, nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator)
, nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node,
visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor),
visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode),
nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator),
nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
case SyntaxKind.Parameter:
return updateParameter(<ParameterDeclaration>node,
@ -304,9 +302,9 @@ namespace ts {
case SyntaxKind.TypePredicate:
throw new Error("reached unsupported type in visitor.");
case SyntaxKind.TypeReference:
return updateTypeReferenceNode(<TypeReferenceNode>node
, visitNode((<TypeReferenceNode>node).typeName, visitor, isEntityName)
, nodesVisitor((<TypeReferenceNode>node).typeArguments, visitor, isTypeNode));
return updateTypeReferenceNode(<TypeReferenceNode>node,
visitNode((<TypeReferenceNode>node).typeName, visitor, isEntityName),
nodesVisitor((<TypeReferenceNode>node).typeArguments, visitor, isTypeNode));
case SyntaxKind.TypeQuery:
return updateTypeQueryNode((<TypeQueryNode>node), visitNode((<TypeQueryNode>node).exprName, visitor, isEntityName));
@ -322,8 +320,8 @@ namespace ts {
case SyntaxKind.UnionType:
case SyntaxKind.IntersectionType:
return updateUnionOrIntersectionTypeNode(<UnionOrIntersectionTypeNode>node
, nodesVisitor((<UnionOrIntersectionTypeNode>node).types, visitor, isTypeNode));
return updateUnionOrIntersectionTypeNode(<UnionOrIntersectionTypeNode>node,
nodesVisitor((<UnionOrIntersectionTypeNode>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(<TypeOperatorNode>node, visitNode((<TypeOperatorNode>node).type, visitor, isTypeNode));
case SyntaxKind.IndexedAccessType:
return updateIndexedAccessTypeNode((<IndexedAccessTypeNode>node)
, visitNode((<IndexedAccessTypeNode>node).objectType, visitor, isTypeNode)
, visitNode((<IndexedAccessTypeNode>node).indexType, visitor, isTypeNode));
return updateIndexedAccessTypeNode((<IndexedAccessTypeNode>node),
visitNode((<IndexedAccessTypeNode>node).objectType, visitor, isTypeNode),
visitNode((<IndexedAccessTypeNode>node).indexType, visitor, isTypeNode));
case SyntaxKind.MappedType:
return updateMappedTypeNode((<MappedTypeNode>node)
, visitNode((<MappedTypeNode>node).readonlyToken, visitor, isToken)
, visitNode((<MappedTypeNode>node).typeParameter, visitor, isTypeParameter)
, visitNode((<MappedTypeNode>node).questionToken, visitor, isToken)
, visitNode((<MappedTypeNode>node).type, visitor, isTypeNode));
return updateMappedTypeNode((<MappedTypeNode>node),
visitNode((<MappedTypeNode>node).readonlyToken, visitor, isToken),
visitNode((<MappedTypeNode>node).typeParameter, visitor, isTypeParameter),
visitNode((<MappedTypeNode>node).questionToken, visitor, isToken),
visitNode((<MappedTypeNode>node).type, visitor, isTypeNode));
case SyntaxKind.LiteralType:
return updateLiteralTypeNode(<LiteralTypeNode>node
, visitNode((<LiteralTypeNode>node).literal, visitor, isExpression));
return updateLiteralTypeNode(<LiteralTypeNode>node,
visitNode((<LiteralTypeNode>node).literal, visitor, isExpression));
// Type Declarations
case SyntaxKind.TypeParameter:
return updateTypeParameterDeclaration(<TypeParameterDeclaration>node
, visitNode((<TypeParameterDeclaration>node).name, visitor, isIdentifier)
, visitNode((<TypeParameterDeclaration>node).constraint, visitor, isTypeNode)
, visitNode((<TypeParameterDeclaration>node).default, visitor, isTypeNode));
return updateTypeParameterDeclaration(<TypeParameterDeclaration>node,
visitNode((<TypeParameterDeclaration>node).name, visitor, isIdentifier),
visitNode((<TypeParameterDeclaration>node).constraint, visitor, isTypeNode),
visitNode((<TypeParameterDeclaration>node).default, visitor, isTypeNode));
// Type members
case SyntaxKind.PropertySignature:
return updatePropertySignature((<PropertySignature>node)
, visitNode((<PropertySignature>node).name, visitor, isPropertyName)
, visitNode((<PropertySignature>node).questionToken, visitor, isToken)
, visitNode((<PropertySignature>node).type, visitor, isTypeNode)
, visitNode((<PropertySignature>node).initializer, visitor, isExpression));
return updatePropertySignature((<PropertySignature>node),
visitNode((<PropertySignature>node).name, visitor, isPropertyName),
visitNode((<PropertySignature>node).questionToken, visitor, isToken),
visitNode((<PropertySignature>node).type, visitor, isTypeNode),
visitNode((<PropertySignature>node).initializer, visitor, isExpression));
case SyntaxKind.IndexSignature:
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node
, visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor)
, visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode)
, nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator)
, nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
return updateIndexSignatureDeclaration(<IndexSignatureDeclaration>node,
visitParameterList((<IndexSignatureDeclaration>node).parameters, visitor, context, nodesVisitor),
visitNode((<IndexSignatureDeclaration>node).type, visitor, isTypeNode),
nodesVisitor((<IndexSignatureDeclaration>node).decorators, visitor, isDecorator),
nodesVisitor((<IndexSignatureDeclaration>node).modifiers, visitor, isModifier));
case SyntaxKind.PropertyDeclaration:
return updateProperty(<PropertyDeclaration>node,

34
src/services/codefixes/fixAddMissingMember.ts
View File

@ -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 });

96
src/services/codefixes/helpers.ts
View File

@ -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) {