fix checking for errrors in executionEnvironments because it now ge…

…ts loaded somewhere else

packages/pyright-internal/src/common/configOptions.ts

@@ -1380,7 +1380,11 @@ export class ConfigOptions {
         const errors: string[] = [];
 
         // we initialize it with `extends` because this option gets read before this function gets called
-        const unusedConfigDetector = new UnusedConfigDetector<Record<string, object>>(configObj, ['extends']);
+        // 'executionEnvironments' also gets read elsewhere
+        const unusedConfigDetector = new UnusedConfigDetector<Record<string, object>>(configObj, [
+            'extends',
+            'executionEnvironments',
+        ]);
         configObj = unusedConfigDetector.proxy;
 
         // Read the entries that should be an array of relative file paths

packages/pyright-internal/src/tests/config.test.ts

@@ -215,7 +215,7 @@ test('PythonPlatform', () => {
 
     const configOptions = service.test_getConfigOptions(commandLineOptions);
     assert.ok(configOptions.executionEnvironments[0]);
-    assert.equal(configOptions.executionEnvironments[0].pythonPlatform, 'platform');
+    assert.equal(configOptions.executionEnvironments[0].pythonPlatform, 'Linux');
 });
 
 describe('invalid config', () => {
@@ -251,27 +251,13 @@ describe('invalid config', () => {
             'Config "typeCheckingMode" entry must contain "off", "basic", "standard", "strict", or "all".',
         ]);
     });
-    test('unknown value for top-level option', () => {
-        const cwd = UriEx.file(normalizePath(process.cwd()));
-
-        const configOptions = new ConfigOptions(cwd);
-
-        const json = {
-            executionEnvironments: [
-                {
-                    root: 'foo',
-                    asdf: true,
-                },
-            ],
-        };
-
-        const fs = new TestFileSystem(/* ignoreCase */ false);
-        const nullConsole = new NullConsole();
-
-        const sp = createServiceProvider(fs, nullConsole);
-        const errors = configOptions.initializeFromJson(json, cwd, sp, new NoAccessHost());
-
-        assert.deepStrictEqual(errors, [`unknown config option in execution environment "foo": asdf`]);
+    test('unknown value in execution environments', () => {
+        const { analysisResult } = setupPyprojectToml(
+            'src/tests/samples/project_with_invalid_option_in_execution_environments'
+        );
+        assert.deepStrictEqual(analysisResult?.configParseErrors, [
+            `unknown config option in execution environment "foo": asdf`,
+        ]);
     });
 });
 

packages/pyright-internal/src/tests/samples/project_with_invalid_option_in_execution_environments/pyproject.toml

@@ -0,0 +1,2 @@
+[tool.pyright]
+executionEnvironments = [{ root = 'foo', asdf = true }]

packages/pyright-internal/src/tests/samples/project_with_pyproject_toml_platform/pyproject.toml

@@ -1,4 +1,4 @@
 [tool.pyright]
 executionEnvironments = [
-    { python = "3.7", pythonPlatform = "platform" },
-]
+    { root = ".", pythonVersion = "3.7", pythonPlatform = "Linux" },
+]