Fixed inconsistency between diagnostic tracking and publishing.

Author: nojaf

server/src/incrementalCompilation.ts

@@ -653,17 +653,17 @@ async function compileContents(
 
           const fileUri = utils.pathToURI(entry.file.sourceFilePath);
 
+          // Get compiler diagnostics from main build (if any) and combine with incremental diagnostics
+          const compilerDiagnosticsForFile =
+            getCurrentCompilerDiagnosticsForFile(fileUri);
+          const allDiagnostics = [...res, ...compilerDiagnosticsForFile];
+
           // Update filesWithDiagnostics to track this file
           // entry.project.rootPath is guaranteed to match a key in projectsFiles
           // (see triggerIncrementalCompilationOfFile where the entry is created)
           const projectFile = projectsFiles.get(entry.project.rootPath);
 
           if (projectFile != null) {
-            // Get compiler diagnostics from main build (if any)
-            const compilerDiagnosticsForFile =
-              getCurrentCompilerDiagnosticsForFile(fileUri);
-            const allDiagnostics = [...res, ...compilerDiagnosticsForFile];
-
             if (allDiagnostics.length > 0) {
               projectFile.filesWithDiagnostics.add(fileUri);
             } else {
@@ -677,7 +677,7 @@ async function compileContents(
             method: "textDocument/publishDiagnostics",
             params: {
               uri: fileUri,
-              diagnostics: res,
+              diagnostics: allDiagnostics,
             },
           };
           send(notification);

server/src/lookup.ts

@@ -60,9 +60,6 @@ export const findFilePathFromProjectRoot = (
   }
 
   const parentDir = normalizePath(parentDirStr);
-  if (parentDir == null) {
-    return null;
-  }
 
   return findFilePathFromProjectRoot(parentDir, filePartialPath);
 };
@@ -153,9 +150,6 @@ export const getFilenameFromRootBsconfig = (
 ): NormalizedPath | null => {
   // Start searching from the parent directory of projDir to find the workspace root
   const parentDir = normalizePath(path.dirname(projDir));
-  if (parentDir == null) {
-    return null;
-  }
 
   let rootConfigPath = findFilePathFromProjectRoot(
     parentDir,