Merge branch 'master' into inferFromRelatedTypesOnly

sandersn · sandersn · commit 8f7a582fc583 · 2017-08-04T15:21:17.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -16987,8 +16987,13 @@ namespace ts {
             if (operandType === silentNeverType) {
                 return silentNeverType;
             }
-            if (node.operator === SyntaxKind.MinusToken && node.operand.kind === SyntaxKind.NumericLiteral) {
-                return getFreshTypeOfLiteralType(getLiteralType(-(<LiteralExpression>node.operand).text));
+            if (node.operand.kind === SyntaxKind.NumericLiteral) {
+                if (node.operator === SyntaxKind.MinusToken) {
+                    return getFreshTypeOfLiteralType(getLiteralType(-(<LiteralExpression>node.operand).text));
+                }
+                else if (node.operator === SyntaxKind.PlusToken) {
+                    return getFreshTypeOfLiteralType(getLiteralType(+(<LiteralExpression>node.operand).text));
+                }
             }
             switch (node.operator) {
                 case SyntaxKind.PlusToken:
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -922,21 +922,11 @@ namespace ts {
     }
 
     export function getContainingFunction(node: Node): FunctionLike {
-        while (true) {
-            node = node.parent;
-            if (!node || isFunctionLike(node)) {
-                return <FunctionLike>node;
-            }
-        }
+        return findAncestor(node.parent, isFunctionLike);
     }
 
     export function getContainingClass(node: Node): ClassLikeDeclaration {
-        while (true) {
-            node = node.parent;
-            if (!node || isClassLike(node)) {
-                return <ClassLikeDeclaration>node;
-            }
-        }
+        return findAncestor(node.parent, isClassLike);
     }
 
     export function getThisContainer(node: Node, includeArrowFunctions: boolean): Node {
diff --git a/tests/baselines/reference/emitExponentiationOperator3.types b/tests/baselines/reference/emitExponentiationOperator3.types
@@ -113,32 +113,32 @@ var temp = 10;
 
 (+3) ** temp++;
 >(+3) ** temp++ : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >temp++ : number
 >temp : number
 
 (+3) ** temp--;
 >(+3) ** temp-- : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >temp-- : number
 >temp : number
 
 (+3) ** ++temp;
 >(+3) ** ++temp : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >++temp : number
 >temp : number
 
 (+3) ** --temp;
 >(+3) ** --temp : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >--temp : number
 >temp : number
@@ -185,8 +185,8 @@ var temp = 10;
 
 (+3) ** temp++ ** 2;
 >(+3) ** temp++ ** 2 : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >temp++ ** 2 : number
 >temp++ : number
@@ -195,8 +195,8 @@ var temp = 10;
 
 (+3) ** temp-- ** 2;
 >(+3) ** temp-- ** 2 : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >temp-- ** 2 : number
 >temp-- : number
@@ -205,8 +205,8 @@ var temp = 10;
 
 (+3) ** ++temp ** 2;
 >(+3) ** ++temp ** 2 : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >++temp ** 2 : number
 >++temp : number
@@ -215,8 +215,8 @@ var temp = 10;
 
 (+3) ** --temp ** 2;
 >(+3) ** --temp ** 2 : number
->(+3) : number
->+3 : number
+>(+3) : 3
+>+3 : 3
 >3 : 3
 >--temp ** 2 : number
 >--temp : number
diff --git a/tests/baselines/reference/enumClassification.types b/tests/baselines/reference/enumClassification.types
@@ -131,7 +131,7 @@ enum E11 {
 
     A = +0,
 >A : E11
->+0 : number
+>+0 : 0
 >0 : 0
 
     B,
diff --git a/tests/baselines/reference/prefixedNumberLiteralAssignToNumberLiteralType.js b/tests/baselines/reference/prefixedNumberLiteralAssignToNumberLiteralType.js
@@ -0,0 +1,8 @@
+//// [prefixedNumberLiteralAssignToNumberLiteralType.ts]
+let x: 1 = +1;
+
+let y: -1 = -1;
+
+//// [prefixedNumberLiteralAssignToNumberLiteralType.js]
+var x = +1;
+var y = -1;
diff --git a/tests/baselines/reference/prefixedNumberLiteralAssignToNumberLiteralType.symbols b/tests/baselines/reference/prefixedNumberLiteralAssignToNumberLiteralType.symbols
@@ -0,0 +1,7 @@
+=== tests/cases/compiler/prefixedNumberLiteralAssignToNumberLiteralType.ts ===
+let x: 1 = +1;
+>x : Symbol(x, Decl(prefixedNumberLiteralAssignToNumberLiteralType.ts, 0, 3))
+
+let y: -1 = -1;
+>y : Symbol(y, Decl(prefixedNumberLiteralAssignToNumberLiteralType.ts, 2, 3))
+
diff --git a/tests/baselines/reference/prefixedNumberLiteralAssignToNumberLiteralType.types b/tests/baselines/reference/prefixedNumberLiteralAssignToNumberLiteralType.types
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/prefixedNumberLiteralAssignToNumberLiteralType.ts ===
+let x: 1 = +1;
+>x : 1
+>+1 : 1
+>1 : 1
+
+let y: -1 = -1;
+>y : -1
+>-1 : -1
+>1 : 1
+>-1 : -1
+>1 : 1
+
diff --git a/tests/baselines/reference/unaryPlus.types b/tests/baselines/reference/unaryPlus.types
@@ -2,7 +2,7 @@
 // allowed per spec
 var a = +1;
 >a : number
->+1 : number
+>+1 : 1
 >1 : 1
 
 var b = +(<any>"");
diff --git a/tests/cases/compiler/prefixedNumberLiteralAssignToNumberLiteralType.ts b/tests/cases/compiler/prefixedNumberLiteralAssignToNumberLiteralType.ts
@@ -0,0 +1,3 @@
+let x: 1 = +1;
+
+let y: -1 = -1;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+let x: 1 = +1;`
	`2`	`+`
	`3`	`+let y: -1 = -1;`