Merge branch 'release-2.4' into release_portLSDynamicImport

.travis.yml

@@ -16,9 +16,7 @@ matrix:
 branches:
   only:
   - master
-  - release-2.1
-  - release-2.2
-  - release-2.3
+  - release-2.4
 
 install:
   - npm uninstall typescript --no-save

src/compiler/parser.ts

@@ -685,7 +685,7 @@ namespace ts {
 
             sourceFile.statements = parseList(ParsingContext.SourceElements, parseStatement);
             Debug.assert(token() === SyntaxKind.EndOfFileToken);
-            sourceFile.endOfFileToken = <EndOfFileToken>parseTokenNode();
+            sourceFile.endOfFileToken = addJSDocComment(parseTokenNode() as EndOfFileToken);
 
             setExternalModuleIndicator(sourceFile);
 

tests/baselines/reference/jsdocTypeDefAtStartOfFile.symbols

@@ -0,0 +1,12 @@
+=== tests/cases/conformance/jsdoc/dtsEquivalent.js ===
+/** @typedef {{[k: string]: any}} AnyEffect */
+No type information for this code./** @typedef {number} Third */
+No type information for this code.=== tests/cases/conformance/jsdoc/index.js ===
+/** @type {AnyEffect} */
+let b;
+>b : Symbol(b, Decl(index.js, 1, 3))
+
+/** @type {Third} */
+let c;
+>c : Symbol(c, Decl(index.js, 3, 3))
+

tests/baselines/reference/jsdocTypeDefAtStartOfFile.types

@@ -0,0 +1,12 @@
+=== tests/cases/conformance/jsdoc/dtsEquivalent.js ===
+/** @typedef {{[k: string]: any}} AnyEffect */
+No type information for this code./** @typedef {number} Third */
+No type information for this code.=== tests/cases/conformance/jsdoc/index.js ===
+/** @type {AnyEffect} */
+let b;
+>b : { [k: string]: any; }
+
+/** @type {Third} */
+let c;
+>c : number
+

tests/cases/conformance/jsdoc/jsdocTypeDefAtStartOfFile.ts

@@ -0,0 +1,11 @@
+// @allowJs: true
+// @checkJs: true
+// @noEmit: true
+// @Filename: dtsEquivalent.js
+/** @typedef {{[k: string]: any}} AnyEffect */
+/** @typedef {number} Third */
+// @Filename: index.js
+/** @type {AnyEffect} */
+let b;
+/** @type {Third} */
+let c;