Merge branch 'master' into jsdoc-dotdotdot-binds-tighter-than-postfix

Author: sandersn

.mailmap

@@ -17,6 +17,8 @@ Andy Hanson <[email protected]> Andy <[email protected]>
 Anil Anar <[email protected]>
 Anton Tolmachev <[email protected]>
 Anubha Mathur  <[email protected]> anubmat  <[email protected]>
+Armando Aguirre  <[email protected]>
+Arnaud Tournier  <[email protected]>
 Arnavion <[email protected]> # Arnav Singh
 Arthur Ozga <[email protected]> Arthur Ozga <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]> Arthur Ozga  <[email protected]>
 Asad Saeeduddin <[email protected]>
@@ -26,6 +28,7 @@ Bill Ticehurst <[email protected]> Bill Ticehurst <[email protected]>
 Ben Duffield <[email protected]>
 Ben Mosher  <[email protected]>
 Benjamin Bock  <[email protected]>
+Benjamin Lichtman  <[email protected]> uniqueiniquity  <[email protected]>
 Blake Embrey <[email protected]>
 Bowden Kelly <[email protected]>
 Brett Mayen <[email protected]>
@@ -59,6 +62,7 @@ Evan Sebastian <[email protected]>
 Eyas <[email protected]> # Eyas Sharaiha
 Fabian Cook  <[email protected]>
 falsandtru <[email protected]> # @falsandtru
+Filipe Silva  <[email protected]>
 flowmemo  <[email protected]> # @flowmemo
 Frank Wallis <[email protected]>
 František Žiacik <[email protected]> František Žiacik <[email protected]>
@@ -192,7 +196,7 @@ TruongSinh Tran-Nguyen <[email protected]>
 vilicvane <[email protected]> # Vilic Vane
 Vladimir Matveev <[email protected]> vladima <[email protected]> v2m <[email protected]>
 Vadi Taslim  <[email protected]>
-Wesley Wigham <[email protected]> Wesley Wigham <[email protected]>
+Wesley Wigham <[email protected]> Wesley Wigham <[email protected]> Wesley Wigham  <[email protected]>
 York Yao <[email protected]> york yao <[email protected]> yaoyao <[email protected]>
 Yuichi Nukiyama <[email protected]> YuichiNukiyama <[email protected]>
 Zev Spitz <[email protected]>
@@ -267,4 +271,9 @@ Reiner Dolp  <[email protected]>
 t_  <[email protected]> # @t_
 TravCav  <[email protected]> # @TravCav
 Vladimir Kurchatkin  <[email protected]>
-William Orr  <[email protected]>
+William Orr  <[email protected]>
+Francois Wouts  <[email protected]>
+Jan Melcher  <[email protected]> Jan Melcher  <[email protected]>
+Matt Mitchell  <[email protected]>
+Maxwell Paul Brickner  <[email protected]>
+Tycho Grouwstra  <[email protected]>

AUTHORS.md

@@ -25,6 +25,8 @@ TypeScript is authored by:
 * Anton Khlynovskiy 
 * Anton Tolmachev
 * Anubha Mathur 
+* Armando Aguirre 
+* Arnaud Tournier 
 * Arnav Singh
 * Arthur Ozga
 * Asad Saeeduddin
@@ -33,6 +35,7 @@ TypeScript is authored by:
 * Ben Duffield
 * Ben Mosher 
 * Benjamin Bock 
+* Benjamin Lichtman 
 * Benny Neugebauer 
 * Bill Ticehurst
 * Blaine Bublitz 
@@ -85,7 +88,9 @@ TypeScript is authored by:
 * Eyas Sharaiha
 * Fabian Cook 
 * @falsandtru
+* Filipe Silva 
 * @flowmemo
+* Francois Wouts 
 * Frank Wallis
 * Franklin Tse
 * František Žiacik
@@ -112,6 +117,7 @@ TypeScript is authored by:
 * Jakub Młokosiewicz 
 * James Henry 
 * James Whitney
+* Jan Melcher 
 * Jason Freeman
 * Jason Jarrett 
 * Jason Killian
@@ -162,9 +168,11 @@ TypeScript is authored by:
 * Masahiro Wakame
 * Matt Bierner 
 * Matt McCutchen
+* Matt Mitchell 
 * Mattias Buelens
 * Mattias Buelens 
 * Max Deepfield
+* Maxwell Paul Brickner 
 * Micah Zoltu
 * Michael 
 * Michael Bromley
@@ -243,6 +251,7 @@ TypeScript is authored by:
 * Torben Fitschen 
 * @TravCav
 * TruongSinh Tran-Nguyen
+* Tycho Grouwstra 
 * Vadi Taslim 
 * Vidar Tonaas Fauske
 * Viktor Zozulyak

Gulpfile.ts

@@ -786,7 +786,7 @@ gulp.task("browserify", "Runs browserify on run.js to produce a file suitable fo
             const file = new Vinyl({ contents, path: bundlePath });
             console.log(`Fixing sourcemaps for ${file.path}`);
             // assumes contents is a Buffer, since that's what browserify yields
-            const maps = convertMap.fromSource(stringContent, /*largeSource*/ true).toObject();
+            const maps = convertMap.fromSource(stringContent).toObject();
             delete maps.sourceRoot;
             maps.sources = maps.sources.map(s => path.resolve(s === "_stream_0.js" ? "built/local/_stream_0.js" : s));
             // Strip browserify's inline comments away (could probably just let sorcery do this, but then we couldn't fix the paths)

Jakefile.js

@@ -143,6 +143,7 @@ var harnessSources = harnessCoreSources.concat([
     "customTransforms.ts",
     "programMissingFiles.ts",
     "symbolWalker.ts",
+    "languageService.ts",
 ].map(function (f) {
     return path.join(unittestsDirectory, f);
 })).concat([

README.md

@@ -12,13 +12,13 @@
 
 For the latest stable version:
 
-```
+```bash
 npm install -g typescript
 ```
 
 For our nightly builds:
 
-```
+```bash
 npm install -g typescript@next
 ```
 
@@ -50,19 +50,19 @@ In order to build the TypeScript compiler, ensure that you have [Git](https://gi
 
 Clone a copy of the repo:
 
-```
+```bash
 git clone https://github.com/Microsoft/TypeScript.git
 ```
 
 Change to the TypeScript directory:
 
-```
+```bash
 cd TypeScript
 ```
 
 Install Gulp tools and dev dependencies:
 
-```
+```bash
 npm install -g gulp
 npm install
 ```
@@ -88,7 +88,7 @@ gulp help             # List the above commands.
 
 ## Usage
 
-```shell
+```bash
 node built/local/tsc.js hello.ts
 ```
 

src/compiler/binder.ts

@@ -203,9 +203,11 @@ namespace ts {
             node.symbol = symbol;
 
             if (!symbol.declarations) {
-                symbol.declarations = [];
+                symbol.declarations = [node];
+            }
+            else {
+                symbol.declarations.push(node);
             }
-            symbol.declarations.push(node);
 
             if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
                 symbol.exports = createSymbolTable();
@@ -282,17 +284,8 @@ namespace ts {
                     const index = indexOf(functionType.parameters, node);
                     return "arg" + index as __String;
                 case SyntaxKind.JSDocTypedefTag:
-                    const parentNode = node.parent && node.parent.parent;
-                    let nameFromParentNode: __String;
-                    if (parentNode && parentNode.kind === SyntaxKind.VariableStatement) {
-                        if ((<VariableStatement>parentNode).declarationList.declarations.length > 0) {
-                            const nameIdentifier = (<VariableStatement>parentNode).declarationList.declarations[0].name;
-                            if (isIdentifier(nameIdentifier)) {
-                                nameFromParentNode = nameIdentifier.escapedText;
-                            }
-                        }
-                    }
-                    return nameFromParentNode;
+                    const name = getNameOfJSDocTypedef(node as JSDocTypedefTag);
+                    return typeof name !== "undefined" ? name.escapedText : undefined;
             }
         }
 
@@ -598,7 +591,7 @@ namespace ts {
             // Binding of JsDocComment should be done before the current block scope container changes.
             // because the scope of JsDocComment should not be affected by whether the current node is a
             // container or not.
-            if (node.jsDoc) {
+            if (hasJSDocNodes(node)) {
                 if (isInJavaScriptFile(node)) {
                     for (const j of node.jsDoc) {
                         bind(j);
@@ -1931,7 +1924,7 @@ namespace ts {
         }
 
         function bindJSDocTypedefTagIfAny(node: Node) {
-            if (!node.jsDoc) {
+            if (!hasJSDocNodes(node)) {
                 return;
             }