Merge pull request microsoft#15531 from Microsoft/moreFactoryFuncs

rbuckton · web-flow · commit 47bd4d3a8706 · 2017-05-08T12:05:05.000-07:00
More factory functions
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2390,7 +2390,7 @@ namespace ts {
                     const formattedUnionTypes = formatUnionTypes((<UnionType>type).types);
                     const unionTypeNodes = formattedUnionTypes && mapToTypeNodeArray(formattedUnionTypes);
                     if (unionTypeNodes && unionTypeNodes.length > 0) {
-                        return createUnionOrIntersectionTypeNode(SyntaxKind.UnionType, unionTypeNodes);
+                        return createUnionTypeNode(unionTypeNodes);
                     }
                     else {
                         if (!context.encounteredError && !(context.flags & NodeBuilderFlags.allowEmptyUnionOrIntersection)) {
@@ -2401,7 +2401,7 @@ namespace ts {
                 }
 
                 if (type.flags & TypeFlags.Intersection) {
-                    return createUnionOrIntersectionTypeNode(SyntaxKind.IntersectionType, mapToTypeNodeArray((type as UnionType).types));
+                    return createIntersectionTypeNode(mapToTypeNodeArray((type as IntersectionType).types));
                 }
 
                 if (objectFlags & (ObjectFlags.Anonymous | ObjectFlags.Mapped)) {
@@ -2661,7 +2661,7 @@ namespace ts {
                     indexerTypeNode,
                     /*initializer*/ undefined);
                 const typeNode = typeToTypeNodeHelper(indexInfo.type);
-                return createIndexSignatureDeclaration(
+                return createIndexSignature(
                     /*decorators*/ undefined,
                     indexInfo.isReadonly ? [createToken(SyntaxKind.ReadonlyKeyword)] : undefined,
                     [indexingParameter],
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1506,7 +1506,7 @@ namespace ts {
     //       for the same reasons we treat NewExpression as a PrimaryExpression.
     export interface MetaProperty extends PrimaryExpression {
         kind: SyntaxKind.MetaProperty;
-        keywordToken: SyntaxKind;
+        keywordToken: SyntaxKind.NewKeyword;
         name: Identifier;
     }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -3650,7 +3650,18 @@ namespace ts {
             || kind === SyntaxKind.GetAccessor
             || kind === SyntaxKind.SetAccessor
             || kind === SyntaxKind.IndexSignature
-            || kind === SyntaxKind.SemicolonClassElement;
+            || kind === SyntaxKind.SemicolonClassElement
+            || kind === SyntaxKind.MissingDeclaration;
+    }
+
+    export function isTypeElement(node: Node): node is TypeElement {
+        const kind = node.kind;
+        return kind === SyntaxKind.ConstructSignature
+            || kind === SyntaxKind.CallSignature
+            || kind === SyntaxKind.PropertySignature
+            || kind === SyntaxKind.MethodSignature
+            || kind === SyntaxKind.IndexSignature
+            || kind === SyntaxKind.MissingDeclaration;
     }
 
     export function isObjectLiteralElementLike(node: Node): node is ObjectLiteralElementLike {
diff --git a/src/compiler/visitor.ts b/src/compiler/visitor.ts
diff --git a/src/services/codefixes/fixAddMissingMember.ts b/src/services/codefixes/fixAddMissingMember.ts
@@ -110,16 +110,16 @@ namespace ts.codefix {
             if (!isStatic) {
                 const stringTypeNode = createKeywordTypeNode(SyntaxKind.StringKeyword);
                 const indexingParameter = createParameter(
-                /*decorators*/ undefined,
-                /*modifiers*/ undefined,
-                /*dotDotDotToken*/ undefined,
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
+                    /*dotDotDotToken*/ undefined,
                     "x",
-                /*questionToken*/ undefined,
+                    /*questionToken*/ undefined,
                     stringTypeNode,
-                /*initializer*/ undefined);
-                const indexSignature = createIndexSignatureDeclaration(
-                /*decorators*/ undefined,
-                /*modifiers*/ undefined,
+                    /*initializer*/ undefined);
+                const indexSignature = createIndexSignature(
+                    /*decorators*/ undefined,
+                    /*modifiers*/ undefined,
                     [indexingParameter],
                     typeNode);
 
diff --git a/src/services/codefixes/helpers.ts b/src/services/codefixes/helpers.ts
@@ -200,7 +200,7 @@ namespace ts.codefix {
     }
 
     export function createStubbedMethod(modifiers: Modifier[], name: PropertyName, optional: boolean, typeParameters: TypeParameterDeclaration[] | undefined, parameters: ParameterDeclaration[], returnType: TypeNode | undefined) {
-        return createMethodDeclaration(
+        return createMethod(
             /*decorators*/ undefined,
             modifiers,
             /*asteriskToken*/ undefined,

Original file line number	Diff line number	Diff line change
`@@ -1506,7 +1506,7 @@ namespace ts {`
`1506`	`1506`	`// for the same reasons we treat NewExpression as a PrimaryExpression.`
`1507`	`1507`	`export interface MetaProperty extends PrimaryExpression {`
`1508`	`1508`	`kind: SyntaxKind.MetaProperty;`
`1509`		`- keywordToken: SyntaxKind;`
	`1509`	`+ keywordToken: SyntaxKind.NewKeyword;`
`1510`	`1510`	`name: Identifier;`
`1511`	`1511`	`}`
`1512`	`1512`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ namespace ts.codefix {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`export function createStubbedMethod(modifiers: Modifier[], name: PropertyName, optional: boolean, typeParameters: TypeParameterDeclaration[] \| undefined, parameters: ParameterDeclaration[], returnType: TypeNode \| undefined) {`
`203`		`- return createMethodDeclaration(`
	`203`	`+ return createMethod(`
`204`	`204`	`/decorators/ undefined,`
`205`	`205`	`modifiers,`
`206`	`206`	`/asteriskToken/ undefined,`