Fixup generate-diagnostics to generate a module

Author: weswigham

scripts/processDiagnosticMessages.ts

@@ -62,20 +62,20 @@ function buildInfoFileOutput(messageTable: InputDiagnosticMessageTable, inputFil
     let result =
         "// <auto-generated />\r\n" +
         "// generated from '" + inputFilePathRel + "' by '" + thisFilePathRel.replace(/\\/g, "/") + "'\r\n" +
-        "/* @internal */\r\n" +
-        "namespace ts {\r\n" +
-        "    function diag(code: number, category: DiagnosticCategory, key: string, message: string, reportsUnnecessary?: {}, elidedInCompatabilityPyramid?: boolean): DiagnosticMessage {\r\n" +
-        "        return { code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid };\r\n" +
-        "    }\r\n" +
-        "    export const Diagnostics = {\r\n";
+        "\r\n" +
+        "import { DiagnosticCategory, DiagnosticMessage } from \"./ts\";\r\n" +
+        "function diag(code: number, category: DiagnosticCategory, key: string, message: string, reportsUnnecessary?: {}, elidedInCompatabilityPyramid?: boolean): DiagnosticMessage {\r\n" +
+        "    return { code, category, key, message, reportsUnnecessary, elidedInCompatabilityPyramid };\r\n" +
+        "}\r\n" +
+        "export const Diagnostics = {\r\n";
     messageTable.forEach(({ code, category, reportsUnnecessary, elidedInCompatabilityPyramid }, name) => {
         const propName = convertPropertyName(name);
         const argReportsUnnecessary = reportsUnnecessary ? `, /*reportsUnnecessary*/ ${reportsUnnecessary}` : "";
         const argElidedInCompatabilityPyramid = elidedInCompatabilityPyramid ? `${!reportsUnnecessary ? ", /*reportsUnnecessary*/ undefined" : ""}, /*elidedInCompatabilityPyramid*/ ${elidedInCompatabilityPyramid}` : "";
-        result += `        ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}),\r\n`;
+        result += `    ${propName}: diag(${code}, DiagnosticCategory.${category}, "${createKey(propName, code)}", ${JSON.stringify(name)}${argReportsUnnecessary}${argElidedInCompatabilityPyramid}),\r\n`;
     });
 
-    result += "    };\r\n}";
+    result += "};";
 
     return result;
 }