From 3521b9c54692ee6147b778c861e25127eca25ef6 Mon Sep 17 00:00:00 2001
From: Ron Buckton <ron.buckton@microsoft.com>
Date: Thu, 11 May 2017 16:22:54 -0700
Subject: [PATCH] if a JSSpecialPropertyDeclaration has a JSDoc type, use it

---
 src/compiler/checker.ts                       | 28 ++++++++++++-------
 .../baselines/reference/checkJsFiles7.symbols | 20 +++++++++++++
 tests/baselines/reference/checkJsFiles7.types | 25 +++++++++++++++++
 tests/cases/compiler/checkJsFiles7.ts         | 12 ++++++++
 4 files changed, 75 insertions(+), 10 deletions(-)
 create mode 100644 tests/baselines/reference/checkJsFiles7.symbols
 create mode 100644 tests/baselines/reference/checkJsFiles7.types
 create mode 100644 tests/cases/compiler/checkJsFiles7.ts

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index dde60c19f4e..64a4095162b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -4158,6 +4158,7 @@ namespace ts {
             const types: Type[] = [];
             let definedInConstructor = false;
             let definedInMethod = false;
+            let jsDocType: Type;
             for (const declaration of symbol.declarations) {
                 const expression = declaration.kind === SyntaxKind.BinaryExpression ? <BinaryExpression>declaration :
                     declaration.kind === SyntaxKind.PropertyAccessExpression ? <BinaryExpression>getAncestor(declaration, SyntaxKind.BinaryExpression) :
@@ -4176,19 +4177,26 @@ namespace ts {
                     }
                 }
 
-                if (expression.flags & NodeFlags.JavaScriptFile) {
-                    // If there is a JSDoc type, use it
-                    const type = getTypeForDeclarationFromJSDocComment(expression.parent);
-                    if (type && type !== unknownType) {
-                        types.push(getWidenedType(type));
-                        continue;
+                // If there is a JSDoc type, use it
+                const type = getTypeForDeclarationFromJSDocComment(expression.parent);
+                if (type) {
+                    const declarationType = getWidenedType(type);
+                    if (!jsDocType) {
+                        jsDocType = declarationType;
+                    }
+                    else if (jsDocType !== unknownType && declarationType !== unknownType && !isTypeIdenticalTo(jsDocType, declarationType)) {
+                        const name = getNameOfDeclaration(declaration);
+                        error(name, Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2, declarationNameToString(name), typeToString(jsDocType), typeToString(declarationType));
                     }
                 }
-
-                types.push(getWidenedLiteralType(checkExpressionCached(expression.right)));
+                else if (!jsDocType) {
+                    // If we don't have an explicit JSDoc type, get the type from the expression.
+                    types.push(getWidenedLiteralType(checkExpressionCached(expression.right)));
+                }
             }
 
-            return getWidenedType(addOptionality(getUnionType(types, /*subtypeReduction*/ true), definedInMethod && !definedInConstructor));
+            const type = jsDocType || getUnionType(types, /*subtypeReduction*/ true);
+            return getWidenedType(addOptionality(type, definedInMethod && !definedInConstructor));
         }
 
         // Return the type implied by a binding pattern element. This is the type of the initializer of the element if
@@ -13229,7 +13237,7 @@ namespace ts {
                 }
                 return result;
             }
-       }
+        }
 
         function isValidSpreadType(type: Type): boolean {
             return !!(type.flags & (TypeFlags.Any | TypeFlags.Null | TypeFlags.Undefined | TypeFlags.NonPrimitive) ||
diff --git a/tests/baselines/reference/checkJsFiles7.symbols b/tests/baselines/reference/checkJsFiles7.symbols
new file mode 100644
index 00000000000..a8214483b86
--- /dev/null
+++ b/tests/baselines/reference/checkJsFiles7.symbols
@@ -0,0 +1,20 @@
+=== tests/cases/compiler/a.js ===
+class C {
+>C : Symbol(C, Decl(a.js, 0, 0))
+
+	constructor() {
+		/** @type {boolean} */
+		this.a = true;
+>this.a : Symbol(C.a, Decl(a.js, 1, 16), Decl(a.js, 3, 16))
+>this : Symbol(C, Decl(a.js, 0, 0))
+>a : Symbol(C.a, Decl(a.js, 1, 16), Decl(a.js, 3, 16))
+
+		this.a = !!this.a;
+>this.a : Symbol(C.a, Decl(a.js, 1, 16), Decl(a.js, 3, 16))
+>this : Symbol(C, Decl(a.js, 0, 0))
+>a : Symbol(C.a, Decl(a.js, 1, 16), Decl(a.js, 3, 16))
+>this.a : Symbol(C.a, Decl(a.js, 1, 16), Decl(a.js, 3, 16))
+>this : Symbol(C, Decl(a.js, 0, 0))
+>a : Symbol(C.a, Decl(a.js, 1, 16), Decl(a.js, 3, 16))
+	}
+}
diff --git a/tests/baselines/reference/checkJsFiles7.types b/tests/baselines/reference/checkJsFiles7.types
new file mode 100644
index 00000000000..a86767b5e44
--- /dev/null
+++ b/tests/baselines/reference/checkJsFiles7.types
@@ -0,0 +1,25 @@
+=== tests/cases/compiler/a.js ===
+class C {
+>C : C
+
+	constructor() {
+		/** @type {boolean} */
+		this.a = true;
+>this.a = true : true
+>this.a : boolean
+>this : this
+>a : boolean
+>true : true
+
+		this.a = !!this.a;
+>this.a = !!this.a : boolean
+>this.a : boolean
+>this : this
+>a : boolean
+>!!this.a : boolean
+>!this.a : boolean
+>this.a : true
+>this : this
+>a : true
+	}
+}
diff --git a/tests/cases/compiler/checkJsFiles7.ts b/tests/cases/compiler/checkJsFiles7.ts
new file mode 100644
index 00000000000..2c3d528da00
--- /dev/null
+++ b/tests/cases/compiler/checkJsFiles7.ts
@@ -0,0 +1,12 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @noImplicitAny: true
+// @fileName: a.js
+class C {
+	constructor() {
+		/** @type {boolean} */
+		this.a = true;
+		this.a = !!this.a;
+	}
+}
\ No newline at end of file