merge

Author: steveluc

.editorconfig

@@ -0,0 +1,10 @@
+
+root = true
+
+[{src,scripts}/**.{ts,json,js}]
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+indent_size = 4

README.md

@@ -1,6 +1,8 @@
 [![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
 [![Issue Stats](http://issuestats.com/github/Microsoft/TypeScript/badge/pr)](http://issuestats.com/github/microsoft/typescript)
 [![Issue Stats](http://issuestats.com/github/Microsoft/TypeScript/badge/issue)](http://issuestats.com/github/microsoft/typescript)
+[![npm version](https://badge.fury.io/js/typescript.svg)](http://badge.fury.io/js/typescript)
+[![Downloads](http://img.shields.io/npm/dm/TypeScript.svg)](https://npmjs.org/package/typescript)
 
 # TypeScript
 

scripts/VSDevMode.ps1

@@ -37,12 +37,38 @@ if(!(Test-Path $tsRegKey)){
 }
 
 if($tsScript -ne ""){
-    if(!(Test-Path $tsScript)){
-        Throw "Could not locate the TypeScript language service script at ${tsScript}"
+    $tsScriptServices =  "${tsScript}\typescriptServices.js"
+    $tsScriptlib = "${tsScript}\lib.d.ts"
+    $tsES6Scriptlib = "${tsScript}\lib.es6.d.ts"
+    
+    if(!(Test-Path $tsScriptServices)){
+        Throw "Could not locate the TypeScript language service script at ${tsScriptServices}"
+    }
+    else {
+        $path = resolve-path ${tsScriptServices}
+        Set-ItemProperty -path $tsRegKey -name CustomTypeScriptServicesFileLocation -value "${path}"
+        Write-Host "Enabled custom TypeScript language service at ${path} for Dev${vsVersion}"
+    }
+
+    if(!(Test-Path $tsScriptlib)){
+        Throw "Could not locate the TypeScript default library at ${tsScriptlib}"
+    }
+    else {
+        $path = resolve-path ${tsScriptlib}
+        Set-ItemProperty -path $tsRegKey -name CustomDefaultLibraryLocation -value "${path}"
+        Write-Host "Enabled custom TypeScript default library at ${path} for Dev${vsVersion}"
+    }
+
+    if(!(Test-Path $tsES6Scriptlib)){
+        Throw "Could not locate the TypeScript default ES6 library at ${tsES6Scriptlib}"
+    }
+    else {
+        $path = resolve-path ${tsES6Scriptlib}
+        Set-ItemProperty -path $tsRegKey -name CustomDefaultES6LibraryLocation -value "${path}"
+        Write-Host "Enabled custom TypeScript default ES6 library at ${path} for Dev${vsVersion}"
     }
-    Set-ItemProperty -path $tsRegKey -name CustomTypeScriptServicesFileLocation -value "${tsScript}"
-    Write-Host "Enabled custom TypeScript language service at ${tsScript} for Dev${vsVersion}"
 }
+
 if($enableDevMode){
     Set-ItemProperty -path $tsRegKey -name EnableDevMode -value 1
     Write-Host "Enabled developer mode for Dev${vsVersion}"

src/compiler/binder.ts

@@ -67,7 +67,8 @@ module ts {
 
         if (!file.locals) {
             file.locals = {};
-            container = blockScopeContainer = file;
+            container = file;
+            setBlockScopeContainer(file, /*cleanLocals*/ false);
             bind(file);
             file.symbolCount = symbolCount;
         }
@@ -77,6 +78,13 @@ module ts {
             return new Symbol(flags, name);
         }
 
+        function setBlockScopeContainer(node: Node, cleanLocals: boolean) {
+            blockScopeContainer = node;
+            if (cleanLocals) {
+                blockScopeContainer.locals = undefined;
+            }
+        }
+
         function addDeclarationToSymbol(symbol: Symbol, node: Declaration, symbolKind: SymbolFlags) {
             symbol.flags |= symbolKind;
             if (!symbol.declarations) symbol.declarations = [];
@@ -236,7 +244,13 @@ module ts {
             }
 
             if (isBlockScopeContainer) {
-                blockScopeContainer = node;
+                // in incremental scenarios we might reuse nodes that already have locals being allocated
+                // during the bind step these locals should be dropped to prevent using stale data.
+                // locals should always be dropped unless they were previously initialized by the binder
+                // these cases are:
+                // - node has locals (symbolKind & HasLocals) !== 0
+                // - node is a source file
+                setBlockScopeContainer(node, /*cleanLocals*/  (symbolKind & SymbolFlags.HasLocals) === 0 && node.kind !== SyntaxKind.SourceFile);
             }
 
             forEachChild(node, bind);
@@ -342,14 +356,7 @@ module ts {
         }
 
         function bindCatchVariableDeclaration(node: CatchClause) {
-            var symbol = createSymbol(SymbolFlags.FunctionScopedVariable, node.name.text || "__missing");
-            addDeclarationToSymbol(symbol, node, SymbolFlags.FunctionScopedVariable);
-            var saveParent = parent;
-            var savedBlockScopeContainer = blockScopeContainer;
-            parent = blockScopeContainer = node;
-            forEachChild(node, bind);
-            parent = saveParent;
-            blockScopeContainer = savedBlockScopeContainer;
+            bindChildren(node, /*symbolKind:*/ 0, /*isBlockScopeContainer:*/ true);
         }
 
         function bindBlockScopedVariableDeclaration(node: Declaration) {
@@ -377,6 +384,7 @@ module ts {
 
         function bind(node: Node) {
             node.parent = parent;
+            
             switch (node.kind) {
                 case SyntaxKind.TypeParameter:
                     bindDeclaration(<Declaration>node, SymbolFlags.TypeParameter, SymbolFlags.TypeParameterExcludes, /*isBlockScopeContainer*/ false);
@@ -389,7 +397,7 @@ module ts {
                     if (isBindingPattern((<Declaration>node).name)) {
                         bindChildren(node, 0, /*isBlockScopeContainer*/ false);
                     }
-                    else if (getCombinedNodeFlags(node) & NodeFlags.BlockScoped) {
+                    else if (isBlockOrCatchScoped(<Declaration>node)) {
                         bindBlockScopedVariableDeclaration(<Declaration>node);
                     }
                     else {