Merge branch 'master' into completionListWithLocalName

Conflicts:
	src/compiler/checker.ts

Author: Yui T

Jakefile.js

@@ -715,3 +715,9 @@ task('tsc-instrumented', [loggedIOJsPath, instrumenterJsPath, tscFile], function
     });
     ex.run();
 }, { async: true });
+
+desc("Updates the sublime plugin's tsserver");
+task("update-sublime", [serverFile], function() {
+    jake.cpR(serverFile, "../TypeScript-Sublime-Plugin/tsserver/");
+    jake.cpR(serverFile + ".map", "../TypeScript-Sublime-Plugin/tsserver/");
+});

scripts/errorCheck.ts

@@ -4,84 +4,84 @@ let async = require('async');
 let glob = require('glob');
 
 fs.readFile('src/compiler/diagnosticMessages.json', 'utf-8', (err, data) => {
-	if (err) {
-		throw err;
-	}
-	
-	let messages = JSON.parse(data);
-	let keys = Object.keys(messages);
-	console.log('Loaded ' + keys.length + ' errors');
+    if (err) {
+        throw err;
+    }
 
-	for (let k of keys) {
-		messages[k]['seen'] = false;
-	}
+    let messages = JSON.parse(data);
+    let keys = Object.keys(messages);
+    console.log('Loaded ' + keys.length + ' errors');
 
-	let errRegex = /\(\d+,\d+\): error TS([^:]+):/g;
+    for (let k of keys) {
+        messages[k]['seen'] = false;
+    }
 
-	let baseDir = 'tests/baselines/reference/';
-	fs.readdir(baseDir, (err, files) => {
-		files = files.filter(f => f.indexOf('.errors.txt') > 0);
-		let tasks: Array<(callback: () => void) => void> = [];
-		files.forEach(f => tasks.push(done => {
-			fs.readFile(baseDir + f, 'utf-8', (err, baseline) => {
-				if (err) throw err;
+    let errRegex = /\(\d+,\d+\): error TS([^:]+):/g;
 
-				let g: string[];
-				while (g = errRegex.exec(baseline)) {
-					var errCode = +g[1];
-					let msg = keys.filter(k => messages[k].code === errCode)[0];
-					messages[msg]['seen'] = true;
-				}
+    let baseDir = 'tests/baselines/reference/';
+    fs.readdir(baseDir, (err, files) => {
+        files = files.filter(f => f.indexOf('.errors.txt') > 0);
+        let tasks: Array<(callback: () => void) => void> = [];
+        files.forEach(f => tasks.push(done => {
+            fs.readFile(baseDir + f, 'utf-8', (err, baseline) => {
+                if (err) throw err;
 
-				done();
-			});
-		}));
+                let g: string[];
+                while (g = errRegex.exec(baseline)) {
+                    var errCode = +g[1];
+                    let msg = keys.filter(k => messages[k].code === errCode)[0];
+                    messages[msg]['seen'] = true;
+                }
 
-		async.parallelLimit(tasks, 25, done => {
-			console.log('== List of errors not present in baselines ==');
-			let count = 0;
-			for (let k of keys) {
-				if (messages[k]['seen'] !== true) {
-					console.log(k);
-					count++;
-				}
-			}
-			console.log(count + ' of ' + keys.length + ' errors are not in baselines');
-		});
-	});
+                done();
+            });
+        }));
+
+        async.parallelLimit(tasks, 25, done => {
+            console.log('== List of errors not present in baselines ==');
+            let count = 0;
+            for (let k of keys) {
+                if (messages[k]['seen'] !== true) {
+                    console.log(k);
+                    count++;
+                }
+            }
+            console.log(count + ' of ' + keys.length + ' errors are not in baselines');
+        });
+    });
 });
 
 fs.readFile('src/compiler/diagnosticInformationMap.generated.ts', 'utf-8', (err, data) => {
-	let errorRegexp = /\s(\w+): \{ code/g;
-	let errorNames: string[] = [];
-	let errMatch: string[];
-	while (errMatch = errorRegexp.exec(data)) {
-		errorNames.push(errMatch[1]);
-	}
+    let errorRegexp = /\s(\w+): \{ code/g;
+    let errorNames: string[] = [];
+    let errMatch: string[];
+    while (errMatch = errorRegexp.exec(data)) {
+        errorNames.push(errMatch[1]);
+    }
 
-	let allSrc: string = '';
-	glob('./src/**/*.ts', {}, (err, files) => {
-		console.log('Reading ' + files.length + ' source files');
-		for(let file of files) {
-			if (file.indexOf('diagnosticInformationMap.generated.ts') > 0) {
-				continue;
-			}
+    let allSrc: string = '';
+    glob('./src/**/*.ts', {}, (err, files) => {
+        console.log('Reading ' + files.length + ' source files');
+        for (let file of files) {
+            if (file.indexOf('diagnosticInformationMap.generated.ts') > 0) {
+                continue;
+            }
 
-			let src = fs.readFileSync(file, 'utf-8');
-			allSrc = allSrc + src;
-		}
+            let src = fs.readFileSync(file, 'utf-8');
+            allSrc = allSrc + src;
+        }
 
-		console.log('Consumed ' + allSrc.length + ' characters of source');
+        console.log('Consumed ' + allSrc.length + ' characters of source');
 
-		let count = 0;
-		console.log('== List of errors not used in source ==')
-		for(let errName of errorNames) {
-			if (allSrc.indexOf(errName) < 0) {
-				console.log(errName);
-				count++;
-			}
-		}
-		console.log(count + ' of ' + errorNames.length + ' errors are not used in source');
-	});
+        let count = 0;
+        console.log('== List of errors not used in source ==')
+        for (let errName of errorNames) {
+            if (allSrc.indexOf(errName) < 0) {
+                console.log(errName);
+                count++;
+            }
+        }
+        console.log(count + ' of ' + errorNames.length + ' errors are not used in source');
+    });
 });
 

src/compiler/binder.ts

@@ -173,6 +173,14 @@ namespace ts {
             return node.name ? declarationNameToString(node.name) : getDeclarationName(node);
         }
 
+        /**
+         * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names.
+         * @param symbolTable - The symbol table which node will be added to.
+         * @param parent - node's parent declaration.
+         * @param node - The declaration to be added to the symbol table
+         * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.)
+         * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations. 
+         */
         function declareSymbol(symbolTable: SymbolTable, parent: Symbol, node: Declaration, includes: SymbolFlags, excludes: SymbolFlags): Symbol {
             Debug.assert(!hasDynamicName(node));
 
@@ -181,10 +189,11 @@ namespace ts {
 
             let symbol: Symbol;
             if (name !== undefined) {
+
                 // Check and see if the symbol table already has a symbol with this name.  If not,
                 // create a new symbol with this name and add it to the table.  Note that we don't
                 // give the new symbol any flags *yet*.  This ensures that it will not conflict 
-                // witht he 'excludes' flags we pass in.
+                // with the 'excludes' flags we pass in.
                 //
                 // If we do get an existing symbol, see if it conflicts with the new symbol we're
                 // creating.  For example, a 'var' symbol and a 'class' symbol will conflict within
@@ -202,10 +211,10 @@ namespace ts {
                 symbol = hasProperty(symbolTable, name)
                     ? symbolTable[name]
                     : (symbolTable[name] = createSymbol(SymbolFlags.None, name));
-                
+
                 if (name && (includes & SymbolFlags.Classifiable)) {
-                    classifiableNames[name] = name;   
-                } 
+                    classifiableNames[name] = name;
+                }
 
                 if (symbol.flags & excludes) {
                     if (node.name) {
@@ -314,6 +323,7 @@ namespace ts {
 
                 addToContainerChain(container);
             }
+
             else if (containerFlags & ContainerFlags.IsBlockScopedContainer) {
                 blockScopeContainer = node;
                 blockScopeContainer.locals = undefined;