microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 20:25:23 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Include index signatures in object literal types only when computed properties are present

Browse Source
This commit is contained in:
Anders Hejlsberg 2016-02-09 15:35:55 -08:00
parent 837e6dbda3
commit 040effd603
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/checker.ts
View File

@ -8288,6 +8288,7 @@ namespace ts {
const contextualTypeHasPattern = contextualType && contextualType.pattern &&
(contextualType.pattern.kind === SyntaxKind.ObjectBindingPattern || contextualType.pattern.kind === SyntaxKind.ObjectLiteralExpression);
let typeFlags: TypeFlags = 0;
let hasDynamicProperties = false;
let patternWithComputedProperties = false;
for (const memberDecl of node.properties) {
@ -8353,7 +8354,10 @@ namespace ts {
checkAccessorDeclaration(<AccessorDeclaration>memberDecl);
}
if (!hasDynamicName(memberDecl)) {
if (hasDynamicName(memberDecl)) {
hasDynamicProperties = true;
}
else {
propertiesTable[member.name] = member;
}
propertiesArray.push(member);
@ -8385,7 +8389,7 @@ namespace ts {
return result;
function getIndexInfo(kind: IndexKind) {
if (contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
if (hasDynamicProperties && contextualType && contextualTypeHasIndexSignature(contextualType, kind)) {
const propTypes: Type[] = [];
for (let i = 0; i < propertiesArray.length; i++) {
const propertyDecl = node.properties[i];