microsoft · MikhailArkhipov · May 27, 2020 · May 6, 2020 · May 6, 2020 · May 11, 2020
diff --git a/.github/ISSUE_TEMPLATE/1_ds_bug_report.md b/.github/ISSUE_TEMPLATE/1_ds_bug_report.md
@@ -33,7 +33,7 @@ _Please provide as much info as you readily know_
 -   **Jupyter server running:** Local | Remote | N/A
 -   **Extension version:** 20YY.MM.#####-xxx
 -   **VS Code version:** #.##
--   **Setting python.jediEnabled:** true | false
+-   **Setting python.languageServer:** Jedi | Microsoft | None
 -   **Python and/or Anaconda version:** #.#.#
 -   **OS:** Windows | Mac | Linux (distro):
 -   **Virtual environment:** conda | venv | virtualenv | N/A | ...

diff --git a/.github/ISSUE_TEMPLATE/2_bug_report.md b/.github/ISSUE_TEMPLATE/2_bug_report.md
@@ -15,7 +15,6 @@ labels: classify, type-bug
 -   Type of virtual environment used (N/A | venv | virtualenv | conda | ...): XXX
 -   Relevant/affected Python packages and their versions: XXX
 -   Relevant/affected Python-related VS Code extensions and their versions: XXX
--   Jedi or Language Server? (i.e. what is `"python.jediEnabled"` set to; more info #3977): XXX
 -   Value of the `python.languageServer` setting: XXX
 
 ## Expected behaviour

diff --git a/.github/release_plan.md b/.github/release_plan.md
@@ -11,7 +11,7 @@
     -   [ ] Change the version in [`package.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) from a `-dev` suffix to `-rc` (🤖)
     -   [ ] Run `npm install` to make sure [`package-lock.json`](https://github.com/Microsoft/vscode-python/blob/master/package.json) is up-to-date (🤖)
     -   [ ] Update `requirements.txt` to point to latest release version of [ptvsd](https://github.com/microsoft/ptvsd).
-    -   [ ] Update `languageServerVersion` in `package.json` to point to the latest version (???) of [the Language Server](https://github.com/Microsoft/python-language-server).
+    -   [ ] Update `languageServerVersion` in `package.json` to point to the latest version of the [Language Server](https://github.com/Microsoft/python-language-server).
     -   [ ] Update [`CHANGELOG.md`](https://github.com/Microsoft/vscode-python/blob/master/CHANGELOG.md) (🤖)
         -   [ ] Run [`news`](https://github.com/Microsoft/vscode-python/tree/master/news) (typically `python news --final --update CHANGELOG.md | code-insiders -`)
         -   [ ] Copy over the "Thanks" section from the previous release

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -45,7 +45,7 @@
         "source.fixAll.eslint": true,
         "source.fixAll.tslint": true
     },
-    "python.jediEnabled": false,
+    "python.languageServer": "Microsoft",
     "python.analysis.logLevel": "Trace",
     "python.analysis.downloadChannel": "beta",
     "python.linting.pylintEnabled": false,

diff --git a/news/.vscode/settings.json b/news/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "python.jediEnabled": false,
+    "python.languageServer": "Microsoft",
     "python.formatting.provider": "black",
     "editor.formatOnSave": true,
     "python.testing.pytestArgs": ["."],

diff --git a/news/1 Enhancements/7010.md b/news/1 Enhancements/7010.md
@@ -0,0 +1 @@
+Removed `python.jediEnabled` setting in favor of `python.languageServer`. Instead of `"python.jediEnabled": true` please use `"python.languageServer": "Jedi"`.
diff --git a/news/1 Enhancements/README.md b/news/1 Enhancements/README.md
@@ -1 +1,2 @@
 Changes that add new features.
+
diff --git a/package.json b/package.json
@@ -2121,12 +2121,6 @@
                     "description": "Whether to install Python modules globally when not using an environment.",
                     "scope": "resource"
                 },
-                "python.jediEnabled": {
-                    "type": "boolean",
-                    "default": true,
-                    "description": "Enables Jedi as IntelliSense engine instead of Microsoft Python Analysis Engine.",
-                    "scope": "resource"
-                },
                 "python.jediMemoryLimit": {
                     "type": "number",
                     "default": 0,

diff --git a/src/client/activation/activationService.ts b/src/client/activation/activationService.ts
@@ -35,7 +35,6 @@ import {
     LanguageServerType
 } from './types';
 
-const jediEnabledSetting: keyof IPythonSettings = 'jediEnabled';
 const languageServerSetting: keyof IPythonSettings = 'languageServer';
 const workspacePathNameForGlobalWorkspaces = '';
 
@@ -130,32 +129,37 @@ export class LanguageServerExtensionActivationService
         }
     }
     @swallowExceptions('Send telemetry for Language Server current selection')
-    public async sendTelemetryForChosenLanguageServer(jediEnabled: boolean): Promise<void> {
-        const state = this.stateFactory.createGlobalPersistentState<boolean | undefined>('SWITCH_LS', undefined);
-        if (typeof state.value !== 'boolean') {
-            await state.updateValue(jediEnabled);
+    public async sendTelemetryForChosenLanguageServer(languageServer: LanguageServerType): Promise<void> {
+        const state = this.stateFactory.createGlobalPersistentState<LanguageServerType | undefined>(
+            'SWITCH_LS',
+            undefined
+        );
+        if (typeof state.value !== 'string') {
+            await state.updateValue(languageServer);
         }
-        if (state.value !== jediEnabled) {
-            await state.updateValue(jediEnabled);
+        if (state.value !== languageServer) {
+            await state.updateValue(languageServer);
             sendTelemetryEvent(EventName.PYTHON_LANGUAGE_SERVER_CURRENT_SELECTION, undefined, {
-                switchTo: jediEnabled
+                switchTo: languageServer
             });
         } else {
             sendTelemetryEvent(EventName.PYTHON_LANGUAGE_SERVER_CURRENT_SELECTION, undefined, {
-                lsStartup: jediEnabled
+                lsStartup: languageServer
             });
         }
     }
 
     /**
-     * Checks if user has not manually set `jediEnabled` setting
+     * Checks if user does not have any `languageServer` setting set.
      * @param resource
-     * @returns `true` if user has NOT manually added the setting and is using default configuration, `false` if user has `jediEnabled` setting added
+     * @returns `true` if user is using default configuration, `false` if user has `languageServer` setting added.
      */
     public isJediUsingDefaultConfiguration(resource: Resource): boolean {
-        const settings = this.workspaceService.getConfiguration('python', resource).inspect<boolean>('jediEnabled');
+        const settings = this.workspaceService
+            .getConfiguration('python', resource)
+            .inspect<LanguageServerType>('languageServer');
         if (!settings) {
-            traceError('WorkspaceConfiguration.inspect returns `undefined` for setting `python.jediEnabled`');
+            traceError('WorkspaceConfiguration.inspect returns `undefined` for setting `python.languageServer`');
             return false;
         }
         return (
@@ -170,19 +174,21 @@ export class LanguageServerExtensionActivationService
      * @returns `true` if user is using jedi, `false` if user is using language server
      */
     public useJedi(): boolean {
+        // Check if `languageServer` setting is missing (default configuration).
         if (this.isJediUsingDefaultConfiguration(this.resource)) {
+            // If user is assigned to an experiment (i.e. use LS), return false.
             if (this.abExperiments.inExperiment(LSEnabled)) {
                 return false;
             }
             // Send telemetry if user is in control group
             this.abExperiments.sendTelemetryIfInExperiment(LSControl);
+            return true; // Do use Jedi as it is default.
         }
+        // Configuration is non-default, so `languageServer` should be present.
         const configurationService = this.serviceContainer.get<IConfigurationService>(IConfigurationService);
-        let enabled = configurationService.getSettings(this.resource).jediEnabled;
-        const languageServerType = configurationService.getSettings(this.resource).languageServer;
-        enabled = enabled || languageServerType === LanguageServerType.Jedi;
-        this.sendTelemetryForChosenLanguageServer(enabled).ignoreErrors();
-        return enabled;
+        const lstType = configurationService.getSettings(this.resource).languageServer;
+        this.sendTelemetryForChosenLanguageServer(lstType).ignoreErrors();
+        return lstType === LanguageServerType.Jedi;
     }
 
     protected async onWorkspaceFoldersChanged() {
@@ -296,7 +302,6 @@ export class LanguageServerExtensionActivationService
             ? this.workspaceService.workspaceFolders!.map((workspace) => workspace.uri)
             : [undefined];
         if (
-            workspacesUris.findIndex((uri) => event.affectsConfiguration(`python.${jediEnabledSetting}`, uri)) === -1 &&
             workspacesUris.findIndex((uri) => event.affectsConfiguration(`python.${languageServerSetting}`, uri)) === -1
         ) {
             return;

diff --git a/src/client/activation/languageServer/languageServerFolderService.ts b/src/client/activation/languageServer/languageServerFolderService.ts
@@ -7,19 +7,23 @@ import { inject, injectable } from 'inversify';
 import { IApplicationEnvironment } from '../../common/application/types';
 import { IServiceContainer } from '../../ioc/types';
 import { LanguageServerFolderService } from '../common/languageServerFolderService';
+import { DotNetLanguageServerFolder } from '../types';
+
+// Must match languageServerVersion* keys in package.json
+const DotNetLanguageServerMinVersionKey = 'languageServerVersion';
 
 @injectable()
 export class DotNetLanguageServerFolderService extends LanguageServerFolderService {
     constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
-        super(serviceContainer, 'languageServer');
+        super(serviceContainer, DotNetLanguageServerFolder);
     }
 
     protected getMinimalLanguageServerVersion(): string {
         let minVersion = '0.0.0';
         try {
             const appEnv = this.serviceContainer.get<IApplicationEnvironment>(IApplicationEnvironment);
             if (appEnv) {
-                minVersion = appEnv.packageJson.languageServerVersion as string;
+                minVersion = appEnv.packageJson[DotNetLanguageServerMinVersionKey] as string;
             }
             // tslint:disable-next-line: no-empty
         } catch {}

diff --git a/src/client/activation/node/languageServerFolderService.ts b/src/client/activation/node/languageServerFolderService.ts
@@ -6,11 +6,12 @@
 import { inject, injectable } from 'inversify';
 import { IServiceContainer } from '../../ioc/types';
 import { LanguageServerFolderService } from '../common/languageServerFolderService';
+import { NodeLanguageServerFolder } from '../types';
 
 @injectable()
 export class NodeLanguageServerFolderService extends LanguageServerFolderService {
     constructor(@inject(IServiceContainer) serviceContainer: IServiceContainer) {
-        super(serviceContainer, 'nodeLanguageServer');
+        super(serviceContainer, NodeLanguageServerFolder);
     }
 
     protected getMinimalLanguageServerVersion(): string {

diff --git a/src/client/activation/types.ts b/src/client/activation/types.ts
@@ -70,6 +70,9 @@ export enum LanguageServerType {
     None = 'None'
 }
 
+export const DotNetLanguageServerFolder = 'languageServer';
+export const NodeLanguageServerFolder = 'nodeLanguageServer';
+
 // tslint:disable-next-line: interface-name
 export interface DocumentHandler {
     handleOpen(document: TextDocument): void;

diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -86,7 +86,6 @@ export class PythonSettings implements IPythonSettings {
     }
     private static pythonSettings: Map<string, PythonSettings> = new Map<string, PythonSettings>();
     public downloadLanguageServer = true;
-    public jediEnabled = true;
     public jediPath = '';
     public jediMemoryLimit = 1024;
     public envFile = '';
@@ -223,27 +222,25 @@ export class PythonSettings implements IPythonSettings {
         this.downloadLanguageServer = systemVariables.resolveAny(
             pythonSettings.get<boolean>('downloadLanguageServer', true)
         )!;
-        this.jediEnabled = systemVariables.resolveAny(pythonSettings.get<boolean>('jediEnabled', true))!;
         this.autoUpdateLanguageServer = systemVariables.resolveAny(
             pythonSettings.get<boolean>('autoUpdateLanguageServer', true)
         )!;
-        if (this.jediEnabled) {
-            // tslint:disable-next-line:no-backbone-get-set-outside-model no-non-null-assertion
-            this.jediPath = systemVariables.resolveAny(pythonSettings.get<string>('jediPath'))!;
-            if (typeof this.jediPath === 'string' && this.jediPath.length > 0) {
-                this.jediPath = getAbsolutePath(systemVariables.resolveAny(this.jediPath), workspaceRoot);
-            } else {
-                this.jediPath = '';
-            }
-            this.jediMemoryLimit = pythonSettings.get<number>('jediMemoryLimit')!;
-        }
 
         let ls = pythonSettings.get<LanguageServerType>('languageServer');
         if (!ls) {
             ls = LanguageServerType.Jedi;
         }
         this.languageServer = systemVariables.resolveAny(ls)!;
 
+        // tslint:disable-next-line:no-backbone-get-set-outside-model no-non-null-assertion
+        this.jediPath = systemVariables.resolveAny(pythonSettings.get<string>('jediPath'))!;
+        if (typeof this.jediPath === 'string' && this.jediPath.length > 0) {
+            this.jediPath = getAbsolutePath(systemVariables.resolveAny(this.jediPath), workspaceRoot);
+        } else {
+            this.jediPath = '';
+        }
+        this.jediMemoryLimit = pythonSettings.get<number>('jediMemoryLimit')!;
+
         const envFileSetting = pythonSettings.get<string>('envFile');
         this.envFile = systemVariables.resolveAny(envFileSetting)!;
         sendSettingTelemetry(this.workspace, envFileSetting);

diff --git a/src/client/common/featureDeprecationManager.ts b/src/client/common/featureDeprecationManager.ts
@@ -30,7 +30,7 @@ const deprecatedFeatures: DeprecatedFeatureInfo[] = [
     {
         doNotDisplayPromptStateKey: 'SHOW_DEPRECATED_FEATURE_PROMPT_FOR_AUTO_COMPLETE_PRELOAD_MODULES',
         message:
-            "The setting 'python.autoComplete.preloadModules' is deprecated, please consider using the new Language Server ('python.jediEnabled = false').",
+            "The setting 'python.autoComplete.preloadModules' is deprecated, please consider using Microsoft Language Server ('python.languageServer' setting).",
         moreInfoUrl: 'https://github.com/Microsoft/vscode-python/issues/1704',
         setting: { setting: 'autoComplete.preloadModules' }
     }

diff --git a/src/client/common/types.ts b/src/client/common/types.ts
@@ -165,7 +165,6 @@ export interface IPythonSettings {
     readonly poetryPath: string;
     readonly insidersChannel: ExtensionChannels;
     readonly downloadLanguageServer: boolean;
-    readonly jediEnabled: boolean;
     readonly jediPath: string;
     readonly jediMemoryLimit: number;
     readonly devOptions: string[];

diff --git a/src/client/languageServices/proposeLanguageServerBanner.ts b/src/client/languageServices/proposeLanguageServerBanner.ts
@@ -5,6 +5,7 @@
 
 import { inject, injectable } from 'inversify';
 import { ConfigurationTarget } from 'vscode';
+import { LanguageServerType } from '../activation/types';
 import { IApplicationShell } from '../common/application/types';
 import '../common/extensions';
 import { IConfigurationService, IPersistentStateFactory, IPythonExtensionBanner } from '../common/types';
@@ -82,7 +83,7 @@ export class ProposeLanguageServerBanner implements IPythonExtensionBanner {
         const response = await this.appShell.showInformationMessage(this.bannerMessage, ...this.bannerLabels);
         switch (response) {
             case this.bannerLabels[ProposeLSLabelIndex.Yes]: {
-                await this.enableNewLanguageServer();
+                await this.enableLanguageServer();
                 await this.disable();
                 break;
             }
@@ -111,7 +112,12 @@ export class ProposeLanguageServerBanner implements IPythonExtensionBanner {
             .updateValue(false);
     }
 
-    public async enableNewLanguageServer(): Promise<void> {
-        await this.configuration.updateSetting('jediEnabled', false, undefined, ConfigurationTarget.Global);
+    public async enableLanguageServer(): Promise<void> {
+        await this.configuration.updateSetting(
+            'languageServer',
+            LanguageServerType.Microsoft,
+            undefined,
+            ConfigurationTarget.Global
+        );
     }
 }
diff --git a/src/client/linters/linterAvailability.ts b/src/client/linters/linterAvailability.ts
@@ -6,6 +6,7 @@
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
 import { Uri } from 'vscode';
+import { LanguageServerType } from '../activation/types';
 import { IApplicationShell, IWorkspaceService } from '../common/application/types';
 import '../common/extensions';
 import { IFileSystem } from '../common/platform/types';
@@ -133,11 +134,11 @@ export class AvailableLinterActivator implements IAvailableLinterActivator {
      *
      * This is a feature of the vscode-python extension that will become enabled once the
      * Python Language Server becomes the default, replacing Jedi as the default. Testing
-     * the global default setting for `"python.jediEnabled": false` enables it.
+     * the global default setting for `"python.languageServer": !Jedi` enables it.
      *
-     * @returns true if the global default for python.jediEnabled is false.
+     * @returns true if the global default for python.languageServer is not Jedi.
      */
     public get isFeatureEnabled(): boolean {
-        return !this.configService.getSettings().jediEnabled;
+        return this.configService.getSettings().languageServer !== LanguageServerType.Jedi;
     }
 }
diff --git a/src/client/linters/linterInfo.ts b/src/client/linters/linterInfo.ts
@@ -3,6 +3,7 @@
 
 import * as path from 'path';
 import { Uri } from 'vscode';
+import { LanguageServerType } from '../activation/types';
 import { IWorkspaceService } from '../common/application/types';
 import { ExecutionInfo, IConfigurationService, Product } from '../common/types';
 import { ILinterInfo, LinterId } from './types';
@@ -85,14 +86,20 @@ export class PylintLinterInfo extends LinterInfo {
         super(Product.pylint, 'pylint', configService, configFileNames);
     }
     public isEnabled(resource?: Uri): boolean {
-        const enabled = super.isEnabled(resource);
-        if (!enabled || this.configService.getSettings(resource).jediEnabled) {
+        // We want to be sure the setting is not default since default is `true` and hence
+        // missing setting yields `true`. When setting is missing and LS is non-Jedi,
+        // we want default to be `false`. So inspection here makes sure we are not getting
+        // `true` because there is no setting and LS is active.
+        const enabled = super.isEnabled(resource); // Is it enabled by settings?
+        const usingJedi = this.configService.getSettings(resource).languageServer === LanguageServerType.Jedi;
+        if (usingJedi) {
+            // In Jedi case adhere to default behavior. Missing setting means `enabled`.
             return enabled;
         }
-        // If we're using new LS, then by default Pylint is disabled (unless the user provides a value).
-        const inspection = this.workspaceService
-            .getConfiguration('python', resource)
-            .inspect<boolean>('linting.pylintEnabled');
+        // If we're using LS, then by default Pylint is disabled unless user provided
+        // the value. We have to resort to direct inspection of settings here.
+        const configuration = this.workspaceService.getConfiguration('python', resource);
+        const inspection = configuration.inspect<boolean>(this.enabledSettingName);
         if (
             !inspection ||
             (inspection.globalValue === undefined &&

diff --git a/src/client/telemetry/index.ts b/src/client/telemetry/index.ts
@@ -6,6 +6,7 @@ import * as stackTrace from 'stack-trace';
 // tslint:disable-next-line: import-name
 import TelemetryReporter from 'vscode-extension-telemetry/lib/telemetryReporter';
 
+import { LanguageServerType } from '../activation/types';
 import { DiagnosticCodes } from '../application/diagnostics/constants';
 import { IWorkspaceService } from '../common/application/types';
 import { AppinsightsKey, isTestExecution, PVSC_EXTENSION_ID } from '../common/constants';
@@ -1118,11 +1119,11 @@ export interface IEventNamePropertyMapping {
         /**
          * The startup value of the language server setting
          */
-        lsStartup?: boolean;
+        lsStartup?: LanguageServerType;
         /**
-         * Used to track switch between LS and Jedi. Carries the final state after the switch.
+         * Used to track switch between language servers. Carries the final state after the switch.
          */
-        switchTo?: boolean;
+        switchTo?: LanguageServerType;
     };
     /**
      * Telemetry event sent with details after attempting to download LS
@@ -1216,7 +1217,7 @@ export interface IEventNamePropertyMapping {
         lsVersion?: string;
     };
     /**
-     * Telemetry event sent when user specified None to the language server and jediEnabled is false.
+     * Telemetry event sent when user specified None to the language server.
      */
     [EventName.PYTHON_LANGUAGE_SERVER_NONE]: never | undefined;
     /**
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Removed `python.jediEnabled` setting in favor of `python.languageServer`. Instead of `"python.jediEnabled": true` please use `"python.languageServer": "Jedi"`.