microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-09 16:23:55 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix duplicate getTypeOfExpression function.

Browse Source
This commit is contained in:
Anders Hejlsberg
2014-08-04 11:58:32 -07:00
parent 9a5324347e
commit 6b2a970ff3
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/checker.ts
View File

@@ -3437,11 +3437,6 @@ module ts {
return unknownType;
}
function getTypeOfExpression(node: Expression): Type {
// TODO: Optimize by caching type in NodeLinks?
return checkExpression(node);
}
// Return contextual type of parameter or undefined if no contextual type is available
function getContextuallyTypedParameterType(parameter: ParameterDeclaration): Type {
var func = <FunctionDeclaration>parameter.parent;
@@ -3502,13 +3497,13 @@ module ts {
var operator = binaryExpression.operator;
if (operator >= SyntaxKind.FirstAssignment && operator <= SyntaxKind.LastAssignment) {
if (node === binaryExpression.right) {
return getTypeOfExpression(binaryExpression.left);
return checkExpression(binaryExpression.left);
}
}
else if (operator === SyntaxKind.BarBarToken) {
var type = getContextualType(binaryExpression);
if (!type && node === binaryExpression.right) {
type = getTypeOfExpression(binaryExpression.left);
type = checkExpression(binaryExpression.left);
}
return type;
}