Merge branch 'master' into diagnosticCleanup2

CyrusNajmabadi · CyrusNajmabadi · commit febe320b6256 · 2015-06-18T09:36:37.000-07:00
Conflicts:
	src/services/services.ts
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1792,11 +1792,6 @@ namespace ts {
             sourceFile.moduleName = moduleName;
         }
 
-        // Store syntactic diagnostics
-        if (diagnostics && sourceFile.parseDiagnostics) {
-            diagnostics.push(...sourceFile.parseDiagnostics);
-        }
-
         let newLine = getNewLineCharacter(options);
 
         // Output
@@ -1818,9 +1813,8 @@ namespace ts {
 
         var program = createProgram([inputFileName], options, compilerHost);
 
-        if (diagnostics) {
-            diagnostics.push(...program.getOptionsDiagnostics());
-        }
+        addRange(/*to*/ diagnostics, /*from*/ sourceFile.parseDiagnostics);
+        addRange(/*to*/ diagnostics, /*from*/ program.getOptionsDiagnostics());
 
         // Emit
         program.emit();
@@ -4191,7 +4185,7 @@ namespace ts {
                 var result: DefinitionInfo[] = [];
                 forEach((<UnionType>type).types, t => {
                     if (t.symbol) {
-                        result.push(...getDefinitionFromSymbol(t.symbol, node));
+                        addRange(/*to*/ result, /*from*/ getDefinitionFromSymbol(t.symbol, node));
                     }
                 });
                 return result;
