microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-14 19:16:17 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Improve readability

Browse Source
This commit is contained in:
Andy Hanson 2016-05-20 10:29:08 -07:00
parent dcbaadaa60
commit d3b4c6a93e
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler/checker.ts
View File

@ -11882,18 +11882,14 @@ namespace ts {
if (symbol.flags & SymbolFlags.Property &&
(expr.kind === SyntaxKind.PropertyAccessExpression || expr.kind === SyntaxKind.ElementAccessExpression) &&
(expr as PropertyAccessExpression | ElementAccessExpression).expression.kind === SyntaxKind.ThisKeyword) {
return !isInConstructor(getContainingFunction(expr));
function isInConstructor(func: FunctionLikeDeclaration) {
if (!func)
return false;
if (func.kind !== SyntaxKind.Constructor)
return false;
if (func.parent === symbol.valueDeclaration.parent) // If the symbol was declared in the class:
return true;
if (func === symbol.valueDeclaration.parent) // If symbolDecl is a parameter property of the constructor:
return true;
return false;
}
// Look for if this is the constructor for the class that `symbol` is a property of.
const func = getContainingFunction(expr);
if (!(func && func.kind === SyntaxKind.Constructor))
return true;
// If func.parent is a class and symbol is a (readonly) property of that class, or
// if func is a constructor and symbol is a (readonly) parameter property declared in it,
// then symbol is writeable here.
return !(func.parent === symbol.valueDeclaration.parent || func === symbol.valueDeclaration.parent);
}
return true;
}