Make auto indent depend on formatOnType setting value (#20480)

For #20479
microsoft · Jan 6, 2023 · 90cb829 · 90cb829
1 parent e6b2752
commit 90cb829
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/client/activation/node/analysisOptions.ts b/src/client/activation/node/analysisOptions.ts
@@ -44,23 +44,19 @@ export class NodeLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
 
     private async isAutoIndentEnabled() {
         const editorConfig = this.getPythonSpecificEditorSection();
-        let formatOnTypeEffectiveValue = editorConfig.get(FORMAT_ON_TYPE_CONFIG_SETTING);
         const formatOnTypeInspect = editorConfig.inspect(FORMAT_ON_TYPE_CONFIG_SETTING);
         const formatOnTypeSetForPython = formatOnTypeInspect?.globalLanguageValue !== undefined;
 
         const inExperiment = await this.isInAutoIndentExperiment();
-
-        if (inExperiment !== formatOnTypeSetForPython) {
-            if (inExperiment) {
-                await NodeLanguageServerAnalysisOptions.setPythonSpecificFormatOnType(editorConfig, true);
-            } else if (formatOnTypeInspect?.globalLanguageValue !== false) {
-                await NodeLanguageServerAnalysisOptions.setPythonSpecificFormatOnType(editorConfig, undefined);
-            }
-
-            formatOnTypeEffectiveValue = this.getPythonSpecificEditorSection().get(FORMAT_ON_TYPE_CONFIG_SETTING);
+        // only explicitly enable formatOnType for those who are in the experiment
+        // but have not explicitly given a value for the setting
+        if (!formatOnTypeSetForPython && inExperiment) {
+            await NodeLanguageServerAnalysisOptions.setPythonSpecificFormatOnType(editorConfig, true);
         }
 
-        return inExperiment && formatOnTypeEffectiveValue;
+        const formatOnTypeEffectiveValue = this.getPythonSpecificEditorSection().get(FORMAT_ON_TYPE_CONFIG_SETTING);
+
+        return formatOnTypeEffectiveValue;
     }
 
     private async isInAutoIndentExperiment(): Promise<boolean> {