microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-16 15:44:16 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'master' into sourceFileUpdate

Browse Source 
Conflicts:
	src/services/services.ts
	tests/cases/unittests/incrementalParser.ts
This commit is contained in:
Cyrus Najmabadi 2014-12-10 13:12:57 -08:00
commit 26927b4ba2
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/compiler/parser.ts
View File

@ -1021,12 +1021,17 @@ module ts {
// walk over the nodes and set parent references
var parent: Node = sourceFile;
function walk(n: Node): void {
n.parent = parent;
// walk down setting parents that differ from the parent we think it should be. This
// allows us to quickly bail out of setting parents for subtrees during incremental
// parsing
if (n.parent !== parent) {
n.parent = parent;
var saveParent = parent;
parent = n;
forEachChild(n, walk);
parent = saveParent;
var saveParent = parent;
parent = n;
forEachChild(n, walk);
parent = saveParent;
}
}
forEachChild(sourceFile, walk);