Merge branch 'main' into optimizeOpenProjects

microsoft · sheetalkamat · Sep 18, 2024 · Aug 15, 2024 · Aug 15, 2024 · Aug 15, 2024
commit 0bb105f9c79fe77f5162edd30b870bdad8d13df4
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -3251,13 +3251,13 @@ function shouldReportNoInputFiles(fileNames: string[], canJsonReportNoInutFiles:
 }
 
 /** @internal */
-export function isSolutionConfig(config: ParsedCommandLine) {
+export function isSolutionConfig(config: ParsedCommandLine): boolean {
     return !config.fileNames.length &&
         hasProperty(config.raw, "references");
 }
 
 /** @internal */
-export function canJsonReportNoInputFiles(raw: any) {
+export function canJsonReportNoInputFiles(raw: any): boolean {
     return !hasProperty(raw, "files") && !hasProperty(raw, "references");
 }
 
@@ -3268,7 +3268,7 @@ export function updateErrorForNoInputFiles(
     configFileSpecs: ConfigFileSpecs,
     configParseDiagnostics: Diagnostic[],
     canJsonReportNoInutFiles: boolean,
-) {
+): boolean {
     const existingErrors = configParseDiagnostics.length;
     if (shouldReportNoInputFiles(fileNames, canJsonReportNoInutFiles)) {
         configParseDiagnostics.push(getErrorForNoInputFiles(configFileSpecs, configFileName));
@@ -3979,7 +3979,7 @@ export function matchesExcludeWorker(
     useCaseSensitiveFileNames: boolean,
     currentDirectory: string,
     basePath?: string,
-) {
+): boolean {
     const excludePattern = getRegularExpressionForWildcard(excludeSpecs, combinePaths(normalizePath(currentDirectory), basePath), "exclude");
     const excludeRegex = excludePattern && getRegexFromPattern(excludePattern, useCaseSensitiveFileNames);
     if (!excludeRegex) return false;

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -747,7 +747,8 @@ export type ConfiguredProjectToAnyReloadKind = Map<
     | ConfiguredProjectLoadKind.ReloadOptimized
 >;
 
-type DefaultConfiguredProjectResult = ReturnType<ProjectService["tryFindDefaultConfiguredProjectForOpenScriptInfoOrClosedFileInfo"]>;
+/** @internal */
+export type DefaultConfiguredProjectResult = ReturnType<ProjectService["tryFindDefaultConfiguredProjectForOpenScriptInfoOrClosedFileInfo"]>;
 
 /** @internal */
 export interface FindCreateOrLoadConfiguredProjectResult {
@@ -2630,7 +2631,7 @@ export class ProjectService {
     }
 
     /** @internal */
-    findDefaultConfiguredProject(info: ScriptInfo) {
+    findDefaultConfiguredProject(info: ScriptInfo): ConfiguredProject | undefined {
         return this.findDefaultConfiguredProjectWorker(
             info,
             ConfiguredProjectLoadKind.Find,
@@ -2641,7 +2642,7 @@ export class ProjectService {
     findDefaultConfiguredProjectWorker(
         info: ScriptInfo,
         kind: ConfiguredProjectLoadKind.Find | ConfiguredProjectLoadKind.CreateReplay,
-    ) {
+    ): DefaultConfiguredProjectResult | undefined {
         return info.isScriptOpen() ?
             this.tryFindDefaultConfiguredProjectForOpenScriptInfo(
                 info,
@@ -3183,7 +3184,7 @@ export class ProjectService {
      *
      * @internal
      */
-    reloadFileNamesOfConfiguredProject(project: ConfiguredProject) {
+    reloadFileNamesOfConfiguredProject(project: ConfiguredProject): boolean {
         const config = this.reloadFileNamesOfParsedConfig(project.getConfigFilePath(), this.configFileExistenceInfoCache.get(project.canonicalConfigFilePath)!.config!);
         project.updateErrorOnNoInputFiles(config);
         this.updateNonInferredProjectFiles(
@@ -3224,7 +3225,7 @@ export class ProjectService {
         project: ConfiguredProject,
         reason: string,
         reloadedProjects: ConfiguredProjectToAnyReloadKind,
-    ) {
+    ): void {
         if (reloadedProjects.has(project)) return;
         reloadedProjects.set(project, ConfiguredProjectLoadKind.ReloadOptimized);
         if (!project.initialLoadPending) {
@@ -3237,7 +3238,7 @@ export class ProjectService {
         project: ConfiguredProject,
         reason: string,
         reloadedProjects: ConfiguredProjectToAnyReloadKind,
-    ) {
+    ): boolean {
         if (reloadedProjects.get(project) === ConfiguredProjectLoadKind.Reload) return false;
         reloadedProjects.set(project, ConfiguredProjectLoadKind.Reload);
         this.clearSemanticCache(project);
@@ -3269,7 +3270,7 @@ export class ProjectService {
      *
      * @internal
      */
-    reloadConfiguredProject(project: ConfiguredProject, reason: string) {
+    reloadConfiguredProject(project: ConfiguredProject, reason: string): void {
         project.initialLoadPending = false;
         this.setProjectForReload(project, ProgramUpdateLevel.Update);
         // Load project from the disk

diff --git a/src/server/project.ts b/src/server/project.ts
@@ -2945,7 +2945,7 @@ export class ConfiguredProject extends Project {
     }
 
     /** @internal */
-    override getParsedCommandLine(fileName: string) {
+    override getParsedCommandLine(fileName: string): ParsedCommandLine | undefined {
         const configFileName = toNormalizedPath(fileName);
         const canonicalConfigFilePath = asNormalizedPath(this.projectService.toCanonicalFileName(configFileName));
         // Ensure the config file existience info is cached
@@ -2963,7 +2963,7 @@ export class ConfiguredProject extends Project {
     }
 
     /** @internal */
-    onReleaseParsedCommandLine(fileName: string) {
+    onReleaseParsedCommandLine(fileName: string): void {
         this.releaseParsedConfig(asNormalizedPath(this.projectService.toCanonicalFileName(toNormalizedPath(fileName))));
     }
 
@@ -3038,7 +3038,7 @@ export class ConfiguredProject extends Project {
     }
 
     /** @internal */
-    setPotentialProjectReference(canonicalConfigPath: NormalizedPath) {
+    setPotentialProjectReference(canonicalConfigPath: NormalizedPath): void {
         Debug.assert(this.initialLoadPending);
         (this.potentialProjectReferences || (this.potentialProjectReferences = new Set())).add(canonicalConfigPath);
     }
@@ -3125,7 +3125,7 @@ export class ConfiguredProject extends Project {
     }
 
     /** @internal */
-    updateErrorOnNoInputFiles(parsedCommandLine: ParsedCommandLine) {
+    updateErrorOnNoInputFiles(parsedCommandLine: ParsedCommandLine): void {
         this.parsedCommandLine = parsedCommandLine;
         updateErrorForNoInputFiles(
             parsedCommandLine.fileNames,

diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
@@ -740,15 +740,15 @@ function failIfInvalidLocation(location: protocol.Location) {
 }
 
 /** @internal */
-export function scriptInfoIsContainedByBackgroundProject(info: ScriptInfo) {
+export function scriptInfoIsContainedByBackgroundProject(info: ScriptInfo): boolean {
     return some(
         info.containingProjects,
         isBackgroundProject,
     );
 }
 
 /** @internal */
-export function scriptInfoIsContainedByDeferredClosedProject(info: ScriptInfo) {
+export function scriptInfoIsContainedByDeferredClosedProject(info: ScriptInfo): boolean {
     return some(
         info.containingProjects,
         isProjectDeferredClose,