microsoft
diff --git a/‎lib/tsc.js
Lines changed: 131 additions & 157 deletions b/‎lib/tsc.js
Lines changed: 131 additions & 157 deletions
diff --git a/‎lib/tsserver.js
Lines changed: 178 additions & 163 deletions b/‎lib/tsserver.js
Lines changed: 178 additions & 163 deletions
diff --git a/‎lib/tsserverlibrary.d.ts
Lines changed: 0 additions & 1 deletion b/‎lib/tsserverlibrary.d.ts
Lines changed: 0 additions & 1 deletion
diff --git a/‎lib/tsserverlibrary.js
Lines changed: 134 additions & 160 deletions b/‎lib/tsserverlibrary.js
Lines changed: 134 additions & 160 deletions
diff --git a/‎lib/typescript.d.ts
Lines changed: 0 additions & 1 deletion b/‎lib/typescript.d.ts
Lines changed: 0 additions & 1 deletion
diff --git a/‎lib/typescript.js
Lines changed: 152 additions & 190 deletions b/‎lib/typescript.js
Lines changed: 152 additions & 190 deletions
diff --git a/‎lib/typescriptServices.d.ts
Lines changed: 0 additions & 1 deletion b/‎lib/typescriptServices.d.ts
Lines changed: 0 additions & 1 deletion
diff --git a/‎lib/typescriptServices.js
Lines changed: 152 additions & 190 deletions b/‎lib/typescriptServices.js
Lines changed: 152 additions & 190 deletions
diff --git a/‎lib/typingsInstaller.js
Lines changed: 11 additions & 8 deletions b/‎lib/typingsInstaller.js
Lines changed: 11 additions & 8 deletions
@@ -1429,7 +1429,6 @@ declare namespace ts {
     interface JSDocTypeLiteral extends JSDocType {
         kind: SyntaxKind.JSDocTypeLiteral;
         jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;
-        jsDocTypeTag?: JSDocTypeTag;
         isArrayType?: boolean;
     }
     enum FlowFlags {
 
@@ -1472,7 +1472,6 @@ declare namespace ts {
     interface JSDocTypeLiteral extends JSDocType {
         kind: SyntaxKind.JSDocTypeLiteral;
         jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;
-        jsDocTypeTag?: JSDocTypeTag;
         /** If true, then this type literal represents an *array* of its type. */
         isArrayType?: boolean;
     }
 
@@ -1472,7 +1472,6 @@ declare namespace ts {
     interface JSDocTypeLiteral extends JSDocType {
         kind: SyntaxKind.JSDocTypeLiteral;
         jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;
-        jsDocTypeTag?: JSDocTypeTag;
         /** If true, then this type literal represents an *array* of its type. */
         isArrayType?: boolean;
     }
 
@@ -9927,9 +9927,11 @@ var ts;
                         visitNode(cbNode, node.typeExpression);
                 }
             case 285:
-                for (var _i = 0, _a = node.jsDocPropertyTags; _i < _a.length; _i++) {
-                    var tag = _a[_i];
-                    visitNode(cbNode, tag);
+                if (node.jsDocPropertyTags) {
+                    for (var _i = 0, _a = node.jsDocPropertyTags; _i < _a.length; _i++) {
+                        var tag = _a[_i];
+                        visitNode(cbNode, tag);
+                    }
                 }
                 return;
             case 288:
@@ -14300,19 +14302,18 @@ var ts;
                     if (!typeExpression || isObjectOrObjectArrayTypeReference(typeExpression.type)) {
                         var child = void 0;
                         var jsdocTypeLiteral = void 0;
-                        var alreadyHasTypeTag = false;
+                        var childTypeTag = void 0;
                         var start_3 = scanner.getStartPos();
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(0); })) {
                             if (!jsdocTypeLiteral) {
                                 jsdocTypeLiteral = createNode(285, start_3);
                             }
                             if (child.kind === 281) {
-                                if (alreadyHasTypeTag) {
+                                if (childTypeTag) {
                                     break;
                                 }
                                 else {
-                                    jsdocTypeLiteral.jsDocTypeTag = child;
-                                    alreadyHasTypeTag = true;
+                                    childTypeTag = child;
                                 }
                             }
                             else {
@@ -14326,7 +14327,9 @@ var ts;
                             if (typeExpression && typeExpression.type.kind === 164) {
                                 jsdocTypeLiteral.isArrayType = true;
                             }
-                            typedefTag.typeExpression = finishNode(jsdocTypeLiteral);
+                            typedefTag.typeExpression = childTypeTag && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
+                                childTypeTag.typeExpression :
+                                finishNode(jsdocTypeLiteral);
                         }
                     }
                     return finishNode(typedefTag);
Original file line number	Diff line number	Diff line change
`@@ -1429,7 +1429,6 @@ declare namespace ts {`
`1429`	`1429`	`interface JSDocTypeLiteral extends JSDocType {`
`1430`	`1430`	`kind: SyntaxKind.JSDocTypeLiteral;`
`1431`	`1431`	`jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;`
`1432`		`- jsDocTypeTag?: JSDocTypeTag;`
`1433`	`1432`	`isArrayType?: boolean;`
`1434`	`1433`	`}`
`1435`	`1434`	`enum FlowFlags {`
Original file line number	Diff line number	Diff line change
`@@ -1472,7 +1472,6 @@ declare namespace ts {`
`1472`	`1472`	`interface JSDocTypeLiteral extends JSDocType {`
`1473`	`1473`	`kind: SyntaxKind.JSDocTypeLiteral;`
`1474`	`1474`	`jsDocPropertyTags?: ReadonlyArray<JSDocPropertyLikeTag>;`
`1475`		`- jsDocTypeTag?: JSDocTypeTag;`
`1476`	`1475`	`/** If true, then this type literal represents an array of its type. */`
`1477`	`1476`	`isArrayType?: boolean;`
`1478`	`1477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9927,9 +9927,11 @@ var ts;`
`9927`	`9927`	`visitNode(cbNode, node.typeExpression);`
`9928`	`9928`	`}`
`9929`	`9929`	`case 285:`
`9930`		`- for (var _i = 0, _a = node.jsDocPropertyTags; _i < _a.length; _i++) {`
`9931`		`- var tag = _a[_i];`
`9932`		`- visitNode(cbNode, tag);`
	`9930`	`+ if (node.jsDocPropertyTags) {`
	`9931`	`+ for (var _i = 0, _a = node.jsDocPropertyTags; _i < _a.length; _i++) {`
	`9932`	`+ var tag = _a[_i];`
	`9933`	`+ visitNode(cbNode, tag);`
	`9934`	`+ }`
`9933`	`9935`	`}`
`9934`	`9936`	`return;`
`9935`	`9937`	`case 288:`
`@@ -14300,19 +14302,18 @@ var ts;`
`14300`	`14302`	`if (!typeExpression \|\| isObjectOrObjectArrayTypeReference(typeExpression.type)) {`
`14301`	`14303`	`var child = void 0;`
`14302`	`14304`	`var jsdocTypeLiteral = void 0;`
`14303`		`- var alreadyHasTypeTag = false;`
	`14305`	`+ var childTypeTag = void 0;`
`14304`	`14306`	`var start_3 = scanner.getStartPos();`
`14305`	`14307`	`while (child = tryParse(function () { return parseChildParameterOrPropertyTag(0); })) {`
`14306`	`14308`	`if (!jsdocTypeLiteral) {`
`14307`	`14309`	`jsdocTypeLiteral = createNode(285, start_3);`
`14308`	`14310`	`}`
`14309`	`14311`	`if (child.kind === 281) {`
`14310`		`- if (alreadyHasTypeTag) {`
	`14312`	`+ if (childTypeTag) {`
`14311`	`14313`	`break;`
`14312`	`14314`	`}`
`14313`	`14315`	`else {`
`14314`		`- jsdocTypeLiteral.jsDocTypeTag = child;`
`14315`		`- alreadyHasTypeTag = true;`
	`14316`	`+ childTypeTag = child;`
`14316`	`14317`	`}`
`14317`	`14318`	`}`
`14318`	`14319`	`else {`
`@@ -14326,7 +14327,9 @@ var ts;`
`14326`	`14327`	`if (typeExpression && typeExpression.type.kind === 164) {`
`14327`	`14328`	`jsdocTypeLiteral.isArrayType = true;`
`14328`	`14329`	`}`
`14329`		`- typedefTag.typeExpression = finishNode(jsdocTypeLiteral);`
	`14330`	`+ typedefTag.typeExpression = childTypeTag && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?`
	`14331`	`+ childTypeTag.typeExpression :`
	`14332`	`+ finishNode(jsdocTypeLiteral);`
`14330`	`14333`	`}`
`14331`	`14334`	`}`
`14332`	`14335`	`return finishNode(typedefTag);`