Display a notification when using JediLSP with Python 2.7

package.nls.json

@@ -201,6 +201,7 @@
     "products.installingModule": "Installing {0}",
     "OutdatedDebugger.updateDebuggerMessage": "We noticed you are attaching to ptvsd (Python debugger), which was deprecated on May 1st, 2020. Please switch to [debugpy](https://aka.ms/migrateToDebugpy).",
     "Python27Support.bannerMessage": "The Python extension will have limited support for Python 2.7 starting in the next release, due to changes in external projects we rely on. [Learn more](https://aka.ms/python-27-support).",
+    "Python27Support.jediMessage": "IntelliSense with Jedi for Python 2.7 is no longer supported. [Learn more](https://aka.ms/python-27-support).",
     "Jupyter.extensionRequired": "The Jupyter extension is required to perform that task. Click Yes to open the Jupyter extension installation page.",
     "TensorBoard.missingSourceFile": "We could not locate the requested source file on disk. Please manually specify the file.",
     "TensorBoard.selectMissingSourceFile": "Choose File",

src/client/activation/activationService.ts

@@ -3,8 +3,7 @@
 import '../common/extensions';
 
 import { inject, injectable } from 'inversify';
-import { ConfigurationChangeEvent, ConfigurationTarget, Disposable, OutputChannel, Uri } from 'vscode';
-
+import { ConfigurationChangeEvent, Disposable, OutputChannel, Uri } from 'vscode';
 import { LSNotSupportedDiagnosticServiceId } from '../application/diagnostics/checks/lsNotSupported';
 import { IDiagnosticsService } from '../application/diagnostics/types';
 import { IApplicationShell, ICommandManager, IWorkspaceService } from '../common/application/types';
@@ -232,8 +231,6 @@ export class LanguageServerExtensionActivationService
     ): Promise<RefCountedLanguageServer> {
         let serverType = this.getCurrentLanguageServerType();
 
-        this.updateLanguageServerSetting(resource);
-
         if (serverType === LanguageServerType.Microsoft) {
             const lsNotSupportedDiagnosticService = this.serviceContainer.get<IDiagnosticsService>(
                 IDiagnosticsService,
@@ -345,23 +342,4 @@ export class LanguageServerExtensionActivationService
         const values = await Promise.all([...this.cache.values()]);
         values.forEach((v) => (v.clearAnalysisCache ? v.clearAnalysisCache() : noop()));
     }
-
-    private updateLanguageServerSetting(resource: Resource): void {
-        // Update settings.json value to Jedi if it's JediLSP.
-        const settings = this.workspaceService
-            .getConfiguration('python', resource)
-            .inspect<LanguageServerType>('languageServer');
-
-        let configTarget: ConfigurationTarget;
-
-        if (settings?.workspaceValue === LanguageServerType.JediLSP) {
-            configTarget = ConfigurationTarget.Workspace;
-        } else if (settings?.globalValue === LanguageServerType.JediLSP) {
-            configTarget = ConfigurationTarget.Global;
-        } else {
-            return;
-        }
-
-        this.configurationService.updateSetting('languageServer', LanguageServerType.Jedi, resource, configTarget);
-    }
 }

src/client/application/diagnostics/checks/jediPython27NotSupported.ts

@@ -0,0 +1,100 @@
+/* eslint-disable max-classes-per-file */
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+import { inject, named } from 'inversify';
+import { ConfigurationTarget, DiagnosticSeverity } from 'vscode';
+import { LanguageServerType } from '../../../activation/types';
+import { IWorkspaceService } from '../../../common/application/types';
+import { IConfigurationService, IDisposableRegistry, Resource } from '../../../common/types';
+import { Common, Python27Support } from '../../../common/utils/localize';
+import { IInterpreterService } from '../../../interpreter/contracts';
+import { IServiceContainer } from '../../../ioc/types';
+import { BaseDiagnostic, BaseDiagnosticsService } from '../base';
+import { IDiagnosticsCommandFactory } from '../commands/types';
+import { DiagnosticCodes } from '../constants';
+import { DiagnosticCommandPromptHandlerServiceId, MessageCommandPrompt } from '../promptHandler';
+import { DiagnosticScope, IDiagnostic, IDiagnosticHandlerService } from '../types';
+
+export class JediPython27NotSupportedDiagnostic extends BaseDiagnostic {
+    constructor(message: string, resource: Resource) {
+        super(
+            DiagnosticCodes.JediPython27NotSupportedDiagnostic,
+            message,
+            DiagnosticSeverity.Warning,
+            DiagnosticScope.Global,
+            resource,
+        );
+    }
+}
+
+export const JediPython27NotSupportedDiagnosticServiceId = 'JediPython27NotSupportedDiagnosticServiceId';
+
+export class JediPython27NotSupportedDiagnosticService extends BaseDiagnosticsService {
+    constructor(
+        @inject(IServiceContainer) serviceContainer: IServiceContainer,
+        @inject(IInterpreterService) private readonly interpreterService: IInterpreterService,
+        @inject(IWorkspaceService) private readonly workspaceService: IWorkspaceService,
+        @inject(IConfigurationService) private readonly configurationService: IConfigurationService,
+        @inject(IDiagnosticHandlerService)
+        @named(DiagnosticCommandPromptHandlerServiceId)
+        protected readonly messageService: IDiagnosticHandlerService<MessageCommandPrompt>,
+        @inject(IDisposableRegistry) disposableRegistry: IDisposableRegistry,
+    ) {
+        super([DiagnosticCodes.JediPython27NotSupportedDiagnostic], serviceContainer, disposableRegistry, true);
+    }
+
+    public async diagnose(resource: Resource): Promise<IDiagnostic[]> {
+        const interpreter = await this.interpreterService.getActiveInterpreter(resource);
+
+        if (interpreter && (interpreter.version?.major ?? 0) < 3) {
+            return [new JediPython27NotSupportedDiagnostic(Python27Support.jediMessage(), resource)];
+        }
+
+        return [];
+    }
+
+    protected async onHandle(diagnostics: IDiagnostic[]): Promise<void> {
+        if (diagnostics.length === 0 || !this.canHandle(diagnostics[0])) {
+            return;
+        }
+        const diagnostic = diagnostics[0];
+        if (await this.filterService.shouldIgnoreDiagnostic(diagnostic.code)) {
+            return;
+        }
+
+        this.updateLanguageServerSetting(diagnostic.resource);
+
+        const commandFactory = this.serviceContainer.get<IDiagnosticsCommandFactory>(IDiagnosticsCommandFactory);
+        const options = [
+            {
+                prompt: Common.gotIt(),
+            },
+            {
+                prompt: Common.doNotShowAgain(),
+                command: commandFactory.createCommand(diagnostic, { type: 'ignore', options: DiagnosticScope.Global }),
+            },
+        ];
+
+        await this.messageService.handle(diagnostic, { commandPrompts: options });
+    }
+
+    private updateLanguageServerSetting(resource: Resource): void {
+        // Update settings.json value to Jedi if it's JediLSP.
+        const settings = this.workspaceService
+            .getConfiguration('python', resource)
+            .inspect<LanguageServerType>('languageServer');
+
+        let configTarget: ConfigurationTarget;
+
+        if (settings?.workspaceValue === LanguageServerType.JediLSP) {
+            configTarget = ConfigurationTarget.Workspace;
+        } else if (settings?.globalValue === LanguageServerType.JediLSP) {
+            configTarget = ConfigurationTarget.Global;
+        } else {
+            return;
+        }
+
+        this.configurationService.updateSetting('languageServer', LanguageServerType.Jedi, resource, configTarget);
+    }
+}

src/client/application/diagnostics/constants.ts

@@ -21,4 +21,5 @@ export enum DiagnosticCodes {
     UpgradeCodeRunnerDiagnostic = 'UpgradeCodeRunnerDiagnostic',
     PylanceDefaultDiagnostic = 'PylanceDefaultDiagnostic',
     MPLSSurveyDiagnostic = 'MPLSSurveyDiagnostic',
+    JediPython27NotSupportedDiagnostic = 'JediPython27NotSupportedDiagnostic',
 }

src/client/application/diagnostics/serviceRegistry.ts

@@ -19,6 +19,10 @@ import {
     InvalidPythonPathInDebuggerService,
     InvalidPythonPathInDebuggerServiceId,
 } from './checks/invalidPythonPathInDebugger';
+import {
+    JediPython27NotSupportedDiagnosticService,
+    JediPython27NotSupportedDiagnosticServiceId,
+} from './checks/jediPython27NotSupported';
 import { LSNotSupportedDiagnosticService, LSNotSupportedDiagnosticServiceId } from './checks/lsNotSupported';
 import {
     InvalidMacPythonInterpreterService,
@@ -100,6 +104,12 @@ export function registerTypes(serviceManager: IServiceManager, languageServerTyp
         PylanceDefaultDiagnosticServiceId,
     );
 
+    serviceManager.addSingleton<IDiagnosticsService>(
+        IDiagnosticsService,
+        JediPython27NotSupportedDiagnosticService,
+        JediPython27NotSupportedDiagnosticServiceId,
+    );
+
     serviceManager.addSingleton<IDiagnosticsCommandFactory>(IDiagnosticsCommandFactory, DiagnosticsCommandFactory);
     serviceManager.addSingleton<IApplicationDiagnostics>(IApplicationDiagnostics, ApplicationDiagnostics);
 

src/client/common/utils/localize.ts

@@ -548,6 +548,11 @@ export namespace Python27Support {
         'Python27Support.bannerMessage',
         'The Python extension will have limited support for Python 2.7 starting in the next release, due to changes in external projects we rely on. [Learn more](https://aka.ms/python-27-support).',
     );
+
+    export const jediMessage = localize(
+        'Python27Support.jediMessage',
+        'IntelliSense with Jedi for Python 2.7 is no longer supported. [Learn more](https://aka.ms/python-27-support).',
+    );
 }
 
 export namespace MPLSDeprecation {