Added auto-exclude logic specifically for typeshed so stdlib stubs that are not "in scope" for the current python version are auto-excluded from the project. This applies only if the typeshedPath is set to .. This addresses python/typeshed#10258.

Author: msfterictraut

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

@@ -425,6 +425,33 @@ export class ImportResolver {
         return this._cachedPythonSearchPaths.paths;
     }
 
+    getTypeshedStdlibExcludeList(execEnv: ExecutionEnvironment): string[] {
+        const typeshedStdlibPath = this.getTypeshedStdLibPath(execEnv);
+        const excludes: string[] = [];
+
+        if (!typeshedStdlibPath) {
+            return excludes;
+        }
+
+        if (!this._cachedTypeshedStdLibModuleVersions) {
+            this._cachedTypeshedStdLibModuleVersions = this._readTypeshedStdLibVersions(execEnv, []);
+        }
+
+        this._cachedTypeshedStdLibModuleVersions.forEach((versionRange, moduleName) => {
+            if (versionRange.max !== undefined && execEnv.pythonVersion > versionRange.max) {
+                // Add excludes for both the ".pyi" file and the directory that contains it
+                // (in case it's using a "__init__.pyi" file).
+                const moduleDirPath = combinePaths(typeshedStdlibPath, ...moduleName.split('.'));
+                excludes.push(moduleDirPath);
+
+                const moduleFilePath = moduleDirPath + '.pyi';
+                excludes.push(moduleFilePath);
+            }
+        });
+
+        return excludes;
+    }
+
     protected readdirEntriesCached(path: string): Dirent[] {
         const cachedValue = this._cachedEntriesForPath.get(path);
         if (cachedValue) {

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

@@ -681,6 +681,19 @@ export class AnalyzerService {
             configOptions.applyDiagnosticOverrides(commandLineOptions.diagnosticSeverityOverrides);
         }
 
+        // If the caller specified that "typeshedPath" is the root of the project,
+        // then we're presumably running in the typeshed project itself. Auto-exclude
+        // stdlib packages that don't match the current Python version.
+        if (configOptions.typeshedPath === projectRoot && configOptions.defaultPythonVersion !== undefined) {
+            const excludeList = this.getImportResolver().getTypeshedStdlibExcludeList(
+                configOptions.getDefaultExecEnvironment()
+            );
+
+            excludeList.forEach((exclude) => {
+                configOptions.exclude.push(getFileSpec(this.fs, commandLineOptions.executionRoot, exclude));
+            });
+        }
+
         // Override the analyzeUnannotatedFunctions setting based on the command-line setting.
         if (commandLineOptions.analyzeUnannotatedFunctions !== undefined) {
             configOptions.diagnosticRuleSet.analyzeUnannotatedFunctions =