Merge pull request microsoft#8845 from Microsoft/Fix8834

mhegazy · mhegazy · commit b70d07954c5a · 2016-05-26T14:35:50.000-07:00
Fix microsoft#8834: exclude paramters and variables from flag checks
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -14528,6 +14528,12 @@ namespace ts {
         }
 
         function areDeclarationFlagsIdentical(left: Declaration, right: Declaration) {
+            if ((left.kind === SyntaxKind.Parameter && right.kind === SyntaxKind.VariableDeclaration) ||
+                (left.kind === SyntaxKind.VariableDeclaration && right.kind === SyntaxKind.Parameter)) {
+                // Differences in optionality between parameters and variables are allowed.
+                return true;
+            }
+
             if (hasQuestionToken(left) !== hasQuestionToken(right)) {
                 return false;
             }
diff --git a/tests/baselines/reference/optionalParamterAndVariableDeclaration.js b/tests/baselines/reference/optionalParamterAndVariableDeclaration.js
@@ -0,0 +1,15 @@
+//// [optionalParamterAndVariableDeclaration.ts]
+class C {
+    constructor(options?: number) {
+        var options = (options || 0);
+    }
+}
+
+
+//// [optionalParamterAndVariableDeclaration.js]
+var C = (function () {
+    function C(options) {
+        var options = (options || 0);
+    }
+    return C;
+}());
diff --git a/tests/baselines/reference/optionalParamterAndVariableDeclaration.symbols b/tests/baselines/reference/optionalParamterAndVariableDeclaration.symbols
@@ -0,0 +1,13 @@
+=== tests/cases/compiler/optionalParamterAndVariableDeclaration.ts ===
+class C {
+>C : Symbol(C, Decl(optionalParamterAndVariableDeclaration.ts, 0, 0))
+
+    constructor(options?: number) {
+>options : Symbol(options, Decl(optionalParamterAndVariableDeclaration.ts, 1, 16), Decl(optionalParamterAndVariableDeclaration.ts, 2, 11))
+
+        var options = (options || 0);
+>options : Symbol(options, Decl(optionalParamterAndVariableDeclaration.ts, 1, 16), Decl(optionalParamterAndVariableDeclaration.ts, 2, 11))
+>options : Symbol(options, Decl(optionalParamterAndVariableDeclaration.ts, 1, 16), Decl(optionalParamterAndVariableDeclaration.ts, 2, 11))
+    }
+}
+
diff --git a/tests/baselines/reference/optionalParamterAndVariableDeclaration.types b/tests/baselines/reference/optionalParamterAndVariableDeclaration.types
@@ -0,0 +1,16 @@
+=== tests/cases/compiler/optionalParamterAndVariableDeclaration.ts ===
+class C {
+>C : C
+
+    constructor(options?: number) {
+>options : number
+
+        var options = (options || 0);
+>options : number
+>(options || 0) : number
+>options || 0 : number
+>options : number
+>0 : number
+    }
+}
+
diff --git a/tests/baselines/reference/optionalParamterAndVariableDeclaration2.errors.txt b/tests/baselines/reference/optionalParamterAndVariableDeclaration2.errors.txt
@@ -0,0 +1,13 @@
+tests/cases/compiler/optionalParamterAndVariableDeclaration2.ts(4,13): error TS2403: Subsequent variable declarations must have the same type.  Variable 'options' must be of type 'number | undefined', but here has type 'number'.
+
+
+==== tests/cases/compiler/optionalParamterAndVariableDeclaration2.ts (1 errors) ====
+    
+    class C {
+        constructor(options?: number) {
+            var options = (options || 0);
+                ~~~~~~~
+!!! error TS2403: Subsequent variable declarations must have the same type.  Variable 'options' must be of type 'number | undefined', but here has type 'number'.
+        }
+    }
+    
diff --git a/tests/baselines/reference/optionalParamterAndVariableDeclaration2.js b/tests/baselines/reference/optionalParamterAndVariableDeclaration2.js
@@ -0,0 +1,16 @@
+//// [optionalParamterAndVariableDeclaration2.ts]
+
+class C {
+    constructor(options?: number) {
+        var options = (options || 0);
+    }
+}
+
+
+//// [optionalParamterAndVariableDeclaration2.js]
+var C = (function () {
+    function C(options) {
+        var options = (options || 0);
+    }
+    return C;
+}());
diff --git a/tests/cases/compiler/optionalParamterAndVariableDeclaration.ts b/tests/cases/compiler/optionalParamterAndVariableDeclaration.ts
@@ -0,0 +1,5 @@
+class C {
+    constructor(options?: number) {
+        var options = (options || 0);
+    }
+}
diff --git a/tests/cases/compiler/optionalParamterAndVariableDeclaration2.ts b/tests/cases/compiler/optionalParamterAndVariableDeclaration2.ts
@@ -0,0 +1,7 @@
+// @strictNullChecks: true
+
+class C {
+    constructor(options?: number) {
+        var options = (options || 0);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -14528,6 +14528,12 @@ namespace ts {`
`14528`	`14528`	`}`
`14529`	`14529`
`14530`	`14530`	`function areDeclarationFlagsIdentical(left: Declaration, right: Declaration) {`
	`14531`	`+ if ((left.kind === SyntaxKind.Parameter && right.kind === SyntaxKind.VariableDeclaration) \|\|`
	`14532`	`+ (left.kind === SyntaxKind.VariableDeclaration && right.kind === SyntaxKind.Parameter)) {`
	`14533`	`+ // Differences in optionality between parameters and variables are allowed.`
	`14534`	`+ return true;`
	`14535`	`+ }`
	`14536`	`+`
`14531`	`14537`	`if (hasQuestionToken(left) !== hasQuestionToken(right)) {`
`14532`	`14538`	`return false;`
`14533`	`14539`	`}`