Fixed a recent regression that broke the "--threads" option in the CLI. (#10812)

Author: erictraut

packages/pyright-internal/src/analyzer/service.ts

@@ -505,6 +505,52 @@ export class AnalyzerService {
         this._backgroundAnalysisProgram.restart();
     }
 
+    // Attempts to make progress on source file enumeration if there is an active
+    // source enumerator associated with the service. Returns true if complete.
+    enumerateSourceFiles(maxSourceEnumeratorTime: number): boolean {
+        // If there is no active source enumerator, we're done.
+        if (!this._sourceEnumerator) {
+            return true;
+        }
+
+        let fileMap: Map<string, Uri>;
+
+        if (this._executionRootUri.isEmpty()) {
+            // No user files for default workspace.
+            fileMap = new Map<string, Uri>();
+        } else {
+            const enumerator = this._sourceEnumerator;
+            const enumResults = timingStats.findFilesTime.timeOperation(() =>
+                enumerator.enumerate(maxSourceEnumeratorTime)
+            );
+
+            if (!enumResults.isComplete) {
+                return false;
+            }
+
+            // Update the config options to include the auto-excluded directories.
+            const excludes = this.options.configOptions?.exclude;
+            if (enumResults.autoExcludedDirs && excludes) {
+                enumResults.autoExcludedDirs.forEach((excludedDir) => {
+                    if (!FileSpec.isInPath(excludedDir, excludes)) {
+                        excludes.push(getFileSpec(this._configOptions.projectRoot, `${excludedDir}/**`));
+                    }
+                });
+                this._backgroundAnalysisProgram.setConfigOptions(this._configOptions);
+            }
+
+            fileMap = enumResults.matches;
+
+            const fileList = this._getTrackedFileList(fileMap);
+            this._backgroundAnalysisProgram.setTrackedFiles(fileList);
+
+            // Source file enumeration is complete. Proceed with analysis.
+            this._sourceEnumerator = undefined;
+        }
+
+        return true;
+    }
+
     protected runAnalysis(token: CancellationToken) {
         // In pull diagnostics mode, the service doesn't perform analysis on its own.
         // Instead the client deliberately asks for diagnostics on a file-by-file basis.
@@ -574,52 +620,6 @@ export class AnalyzerService {
         }, timeUntilNextAnalysisInMs);
     }
 
-    // Attempts to make progress on source file enumeration if there is an active
-    // source enumerator associated with the service. Returns true if complete.
-    protected enumerateSourceFiles(maxSourceEnumeratorTime: number): boolean {
-        // If there is no active source enumerator, we're done.
-        if (!this._sourceEnumerator) {
-            return true;
-        }
-
-        let fileMap: Map<string, Uri>;
-
-        if (this._executionRootUri.isEmpty()) {
-            // No user files for default workspace.
-            fileMap = new Map<string, Uri>();
-        } else {
-            const enumerator = this._sourceEnumerator;
-            const enumResults = timingStats.findFilesTime.timeOperation(() =>
-                enumerator.enumerate(maxSourceEnumeratorTime)
-            );
-
-            if (!enumResults.isComplete) {
-                return false;
-            }
-
-            // Update the config options to include the auto-excluded directories.
-            const excludes = this.options.configOptions?.exclude;
-            if (enumResults.autoExcludedDirs && excludes) {
-                enumResults.autoExcludedDirs.forEach((excludedDir) => {
-                    if (!FileSpec.isInPath(excludedDir, excludes)) {
-                        excludes.push(getFileSpec(this._configOptions.projectRoot, `${excludedDir}/**`));
-                    }
-                });
-                this._backgroundAnalysisProgram.setConfigOptions(this._configOptions);
-            }
-
-            fileMap = enumResults.matches;
-
-            const fileList = this._getTrackedFileList(fileMap);
-            this._backgroundAnalysisProgram.setTrackedFiles(fileList);
-
-            // Source file enumeration is complete. Proceed with analysis.
-            this._sourceEnumerator = undefined;
-        }
-
-        return true;
-    }
-
     protected applyConfigOptions(host: Host) {
         // Indicate that we are about to reanalyze because of this config change.
         if (this.options.onInvalidated) {

packages/pyright-internal/src/pyright.ts

@@ -545,6 +545,7 @@ async function runSingleThreaded(
 
     // This will trigger the analyzer.
     service.setOptions(options);
+    service.enumerateSourceFiles(0);
 
     return await exitStatus.promise;
 }
@@ -568,6 +569,7 @@ async function runMultiThreaded(
 
     // This will trigger discovery of files in the project.
     service.setOptions(options);
+    service.enumerateSourceFiles(0);
     const program = service.backgroundAnalysisProgram.program;
 
     // Get the list of "tracked" source files -- those that will be type checked.