From 9dc8b76fdb2112534a54031dba9eef2b0a529e80 Mon Sep 17 00:00:00 2001
From: detachhead <detachhead@users.noreply.github.com>
Date: Tue, 18 Jun 2024 10:32:30 +1000
Subject: [PATCH] fix `typeCheckingMode` not defaulting to `"all"` (was broken
 by a recent upstream change)

---
 packages/pyright-internal/src/analyzer/service.ts |  2 +-
 .../pyright-internal/src/common/configOptions.ts  |  2 +-
 .../pyright-internal/src/tests/config.test.ts     | 15 +++++++++++++++
 .../src/tests/typeEvaluatorBased.test.ts          |  6 ++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/pyright-internal/src/analyzer/service.ts b/packages/pyright-internal/src/analyzer/service.ts
index ee395429c0..6df07534a9 100644
--- a/packages/pyright-internal/src/analyzer/service.ts
+++ b/packages/pyright-internal/src/analyzer/service.ts
@@ -642,7 +642,7 @@ export class AnalyzerService {
 
         const errors: string[] = [];
 
-        configOptions.initializeTypeCheckingMode(commandLineOptions.typeCheckingMode ?? 'standard');
+        configOptions.initializeTypeCheckingMode(commandLineOptions.typeCheckingMode);
 
         let configs;
         try {
diff --git a/packages/pyright-internal/src/common/configOptions.ts b/packages/pyright-internal/src/common/configOptions.ts
index 0efadc018b..73fd2ceedf 100644
--- a/packages/pyright-internal/src/common/configOptions.ts
+++ b/packages/pyright-internal/src/common/configOptions.ts
@@ -1336,7 +1336,7 @@ export class ConfigOptions {
         typeCheckingMode: string | undefined,
         severityOverrides?: DiagnosticSeverityOverridesMap
     ) {
-        this.diagnosticRuleSet = ConfigOptions.getDiagnosticRuleSet(typeCheckingMode);
+        this.diagnosticRuleSet = this.constructor.getDiagnosticRuleSet(typeCheckingMode);
 
         if (severityOverrides) {
             this.applyDiagnosticOverrides(severityOverrides);
diff --git a/packages/pyright-internal/src/tests/config.test.ts b/packages/pyright-internal/src/tests/config.test.ts
index f58c99f0ef..22bcd61455 100644
--- a/packages/pyright-internal/src/tests/config.test.ts
+++ b/packages/pyright-internal/src/tests/config.test.ts
@@ -497,3 +497,18 @@ test('Extended config files', () => {
     const configOptions = service.test_getConfigOptions(commandLineOptions);
     assert.equal(configOptions.diagnosticRuleSet.strictListInference, true);
 });
+
+test('default typeCheckingMode should be "all"', () => {
+    const cwd = normalizePath(process.cwd());
+    const service = createAnalyzer();
+    const commandLineOptions = new CommandLineOptions(cwd, /* fromVsCodeExtension */ true);
+    commandLineOptions.configFilePath = 'src/tests/samples/project1';
+
+    const configOptions = service.test_getConfigOptions(commandLineOptions);
+    service.setOptions(commandLineOptions);
+
+    // as far as i can tell the typeCheckingMode value isn't saved anywhere, so we instead just check some options
+    // that are typically disabled by default unless typeCheckingMode is set to `"all"`
+    assert(configOptions.diagnosticRuleSet.deprecateTypingAliases);
+    assert.equal(configOptions.diagnosticRuleSet.reportAny, 'error');
+});
diff --git a/packages/pyright-internal/src/tests/typeEvaluatorBased.test.ts b/packages/pyright-internal/src/tests/typeEvaluatorBased.test.ts
index b24a797830..25df65504b 100644
--- a/packages/pyright-internal/src/tests/typeEvaluatorBased.test.ts
+++ b/packages/pyright-internal/src/tests/typeEvaluatorBased.test.ts
@@ -26,6 +26,12 @@ test('reportUnreachable TYPE_CHECKING', () => {
 });
 
 test('default typeCheckingMode=all', () => {
+    // there's a better test for this in `config.test.ts` which tests it in a more complete way.
+    // the logic for loading the config seems very convoluted and messy. the default typeCheckingMode
+    // seems to be determined multiple times. and there was an upstream change that broke our defaulting
+    // to "all" which went undetected by this test, because it was being changed to "standard" later on.
+    // i'm keeping both tests just in case, because i don't really get why it gets set multiple times.
+    // maybe this one effects something else
     const configOptions = new BasedConfigOptions(Uri.empty());
     const analysisResults = typeAnalyzeSampleFiles(['unreachable1.py'], configOptions);
     validateResultsButBased(analysisResults, {