microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-19 20:37:00 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Improve contextual type skip in checkObjectLiteral

Browse Source 
It is still super hacky
This commit is contained in:
Nathan Shively-Sanders
2018-02-07 15:53:43 -08:00
parent 7e3fdc29fa
commit e0596ad9b8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/checker.ts
View File

@@ -14755,7 +14755,7 @@ namespace ts {
const isInJSFile = isInJavaScriptFile(node);
// TODO: Might need to skip if isDeclarationOfDefaultedJavascriptContainerExpression(node.parent.parent) instead of just checking node.properties.length > 0
// (actually, it would be better not to skip contextual typing at all, but to do that I need to avoid the checking loop another way)
const contextualType = node.properties.length > 0 && getApparentTypeOfContextualType(node);
const contextualType = (!isInJSFile || node.properties.length > 0) && getApparentTypeOfContextualType(node);
const contextualTypeHasPattern = contextualType && contextualType.pattern &&
(contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression);
const isJSObjectLiteral = !contextualType && isInJSFile;