Skip to content

Improved checking of destructuring with literal initializers #4598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahejlsberg merged 17 commits into from
Sep 11, 2015
Merged

Improved checking of destructuring with literal initializers #4598

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e78478b
More flexible rules when destructuring have literal initializers
ahejlsberg Sep 1, 2015
c436736
Adding a few comments
ahejlsberg Sep 1, 2015
f28e424
Adding tests
ahejlsberg Sep 1, 2015
66e3aba
Accepting new baselines
ahejlsberg Sep 1, 2015
dc8ad6e
Store binding pattern in contextual type
ahejlsberg Sep 5, 2015
e40b86f
Accepting new baselines
ahejlsberg Sep 5, 2015
bb81797
Check for excess properties
ahejlsberg Sep 5, 2015
a0ddd43
Modifying tests
ahejlsberg Sep 5, 2015
f801420
Accepting new baselines
ahejlsberg Sep 5, 2015
31f8a81
Adding test for excess/missing properties
ahejlsberg Sep 5, 2015
546da60
Correct propagation of includePatternInType flag
ahejlsberg Sep 6, 2015
27380f4
Adding test
ahejlsberg Sep 6, 2015
055363c
Accepting new baselines
ahejlsberg Sep 6, 2015
d5ff9ee
Error when binding element has no value in initializer and no default
ahejlsberg Sep 10, 2015
a95c423
Revising test
ahejlsberg Sep 10, 2015
273b9ff
Accepting new baselines
ahejlsberg Sep 10, 2015
262f122
Adding "." to error message
ahejlsberg Sep 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correct propagation of includePatternInType flag
  • Loading branch information
@ahejlsberg
ahejlsberg committed Sep 6, 2015
commit 546da60a2a9321d50856e28c10bee8be3264c0e2
8 changes: 4 additions & 4 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2416,12 +2416,12 @@ namespace ts {
// Return the type implied by a binding pattern element. This is the type of the initializer of the element if
// one is present. Otherwise, if the element is itself a binding pattern, it is the type implied by the binding
// pattern. Otherwise, it is the type any.
function getTypeFromBindingElement(element: BindingElement): Type {
function getTypeFromBindingElement(element: BindingElement, includePatternInType?: boolean): Type {
if (element.initializer) {
return getWidenedType(checkExpressionCached(element.initializer));
}
if (isBindingPattern(element.name)) {
return getTypeFromBindingPattern(<BindingPattern>element.name, /*includePatternInType*/ false);
return getTypeFromBindingPattern(<BindingPattern>element.name, includePatternInType);
}
return anyType;
}
Expand All @@ -2433,7 +2433,7 @@ namespace ts {
let flags = SymbolFlags.Property | SymbolFlags.Transient | (e.initializer ? SymbolFlags.Optional : 0);
let name = e.propertyName || <Identifier>e.name;
let symbol = <TransientSymbol>createSymbol(flags, name.text);
symbol.type = getTypeFromBindingElement(e);
symbol.type = getTypeFromBindingElement(e, includePatternInType);
members[symbol.name] = symbol;
});
let result = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined);
Expand All @@ -2450,7 +2450,7 @@ namespace ts {
return languageVersion >= ScriptTarget.ES6 ? createIterableType(anyType) : anyArrayType;
}
// If the pattern has at least one element, and no rest element, then it should imply a tuple type.
let elementTypes = map(elements, e => e.kind === SyntaxKind.OmittedExpression ? anyType : getTypeFromBindingElement(e));
let elementTypes = map(elements, e => e.kind === SyntaxKind.OmittedExpression ? anyType : getTypeFromBindingElement(e, includePatternInType));
let result = createTupleType(elementTypes);
if (includePatternInType) {
result = clone(result);
Expand Down