Merged main, changes for pr, added test case

microsoft · navya9singh · Dec 13, 2022 · Aug 22, 2022 · Aug 22, 2022 · Aug 23, 2022
commit 5ba95f77182c936fa2eadb37e3ed35fc467c7a7f
diff --git a/src/compiler/builder.ts b/src/compiler/builder.ts
@@ -1116,6 +1116,7 @@ function getBuildInfo(state: BuilderProgramState, getCanonicalFileName: GetCanon
 
 function convertToReusableCompilerOptionValue(option: CommandLineOption | undefined, value: CompilerOptionsValue, relativeToBuildInfo: (path: string) => string) {
     if (option) {
+            Debug.assert(option.type !== "listOrElement");
         if (option.type === "list") {
             const values = value as readonly (string | number)[];
             if (option.element.isFilePath && values.length) {
@@ -1129,20 +1130,57 @@ function convertToReusableCompilerOptionValue(option: CommandLineOption | undefi
     return value;
 }
 
-    function convertToReusableCompilerOptionValue(option: CommandLineOption | undefined, value: CompilerOptionsValue, relativeToBuildInfo: (path: string) => string) {
-        if (option) {
-            Debug.assert(option.type !== "listOrElement");
-            if (option.type === "list") {
-                const values = value as readonly (string | number)[];
-                if (option.element.isFilePath && values.length) {
-                    return values.map(relativeToBuildInfo);
-                }
-            }
-            else if (option.isFilePath) {
-                return relativeToBuildInfo(value as string);
-            }
-        }
-        return value;
+function convertToReusableDiagnostics(diagnostics: readonly Diagnostic[], relativeToBuildInfo: (path: string) => string): readonly ReusableDiagnostic[] {
+    Debug.assert(!!diagnostics.length);
+    return diagnostics.map(diagnostic => {
+        const result: ReusableDiagnostic = convertToReusableDiagnosticRelatedInformation(diagnostic, relativeToBuildInfo);
+        result.reportsUnnecessary = diagnostic.reportsUnnecessary;
+        result.reportDeprecated = diagnostic.reportsDeprecated;
+        result.source = diagnostic.source;
+        result.skippedOn = diagnostic.skippedOn;
+        const { relatedInformation } = diagnostic;
+        result.relatedInformation = relatedInformation ?
+            relatedInformation.length ?
+                relatedInformation.map(r => convertToReusableDiagnosticRelatedInformation(r, relativeToBuildInfo)) :
+                [] :
+            undefined;
+        return result;
+    });
+}
+
+function convertToReusableDiagnosticRelatedInformation(diagnostic: DiagnosticRelatedInformation, relativeToBuildInfo: (path: string) => string): ReusableDiagnosticRelatedInformation {
+    const { file } = diagnostic;
+    return {
+        ...diagnostic,
+        file: file ? relativeToBuildInfo(file.resolvedPath) : undefined
+    };
+}
+
+/** @internal */
+export enum BuilderProgramKind {
+    SemanticDiagnosticsBuilderProgram,
+    EmitAndSemanticDiagnosticsBuilderProgram
+}
+
+/** @internal */
+export interface BuilderCreationParameters {
+    newProgram: Program;
+    host: BuilderProgramHost;
+    oldProgram: BuilderProgram | undefined;
+    configFileParsingDiagnostics: readonly Diagnostic[];
+}
+
+/** @internal */
+export function getBuilderCreationParameters(newProgramOrRootNames: Program | readonly string[] | undefined, hostOrOptions: BuilderProgramHost | CompilerOptions | undefined, oldProgramOrHost?: BuilderProgram | CompilerHost, configFileParsingDiagnosticsOrOldProgram?: readonly Diagno
6820
stic[] | BuilderProgram, configFileParsingDiagnostics?: readonly Diagnostic[], projectReferences?: readonly ProjectReference[]): BuilderCreationParameters {
+    let host: BuilderProgramHost;
+    let newProgram: Program;
+    let oldProgram: BuilderProgram;
+    if (newProgramOrRootNames === undefined) {
+        Debug.assert(hostOrOptions === undefined);
+        host = oldProgramOrHost as CompilerHost;
+        oldProgram = configFileParsingDiagnosticsOrOldProgram as BuilderProgram;
+        Debug.assert(!!oldProgram);
+        newProgram = oldProgram.getProgram();
     }
     else if (isArray(newProgramOrRootNames)) {
         oldProgram = configFileParsingDiagnosticsOrOldProgram as BuilderProgram;