microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-30 01:04:49 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'master' into convert-to-named-parameters

Browse Source
This commit is contained in:
Gabriela Araujo Britto
2019-02-25 10:54:58 -08:00
parent f571866f47 c37254e509
commit 365967d484
60 changed files with 294 additions and 1061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,7 +156,7 @@ namespace ts.codefix {
isIdentifier(arg) ? arg.text :
isPropertyAccessExpression(arg) ? arg.name.text : undefined);
const contextualType = checker.getContextualType(call);
const returnType = inJs ? undefined : contextualType && checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker) || createKeywordTypeNode(SyntaxKind.AnyKeyword);
const returnType = (inJs || !contextualType) ? undefined : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
return createMethod(
/*decorators*/ undefined,
/*modifiers*/ makeStatic ? [createToken(SyntaxKind.StaticKeyword)] : undefined,