Simplify code for getting diagnostics in the Program.

CyrusNajmabadi · CyrusNajmabadi · commit c1dfdaa436f8 · 2015-02-05T02:15:38.000-08:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -211,19 +211,27 @@ module ts {
             return hasProperty(filesByName, fileName) ? filesByName[fileName] : undefined;
         }
 
-        function getSyntacticDiagnostics(sourceFile?: SourceFile): Diagnostic[] {
+        function getDiagnosticsHelper(sourceFile: SourceFile, getDiagnostics: (sourceFile: SourceFile) => Diagnostic[]): Diagnostic[] {
             if (sourceFile) {
-                return ts.getSyntacticDiagnostics(sourceFile);
+                return getDiagnostics(sourceFile);
             }
 
             var allDiagnostics: Diagnostic[] = [];
             forEach(program.getSourceFiles(), sourceFile => {
-                addRange(allDiagnostics, ts.getSyntacticDiagnostics(sourceFile));
+                addRange(allDiagnostics, getDiagnostics(sourceFile));
             });
 
             return sortAndDeduplicateDiagnostics(allDiagnostics);
         }
 
+        function getSyntacticDiagnostics(sourceFile?: SourceFile): Diagnostic[]{
+            return getDiagnosticsHelper(sourceFile, ts.getSyntacticDiagnostics);
+        }
+
+        function getSemanticDiagnostics(sourceFile?: SourceFile): Diagnostic[]{
+            return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile);
+        }
+
         function getSemanticDiagnosticsForFile(sourceFile: SourceFile): Diagnostic[] {
             var typeChecker = getDiagnosticsProducingTypeChecker();
 
@@ -235,19 +243,6 @@ module ts {
             return bindDiagnostics.concat(checkDiagnostics).concat(programDiagnostics);
         }
 
-        function getSemanticDiagnostics(sourceFile?: SourceFile): Diagnostic[] {
-            if (sourceFile) {
-                return sortAndDeduplicateDiagnostics(getSemanticDiagnosticsForFile(sourceFile));
-            }
-
-            var allDiagnostics: Diagnostic[] = [];
-            forEach(program.getSourceFiles(), sourceFile => {
-                addRange(allDiagnostics, getSemanticDiagnosticsForFile(sourceFile));
-            });
-
-            return sortAndDeduplicateDiagnostics(allDiagnostics);
-        }
-
         function getGlobalDiagnostics(): Diagnostic[]{
             var typeChecker = getDiagnosticsProducingTypeChecker();
 
