Language server name (microsoft#12653)

Mikhail Arkhipov · web-flow · commit e0b80243727c · 2020-06-29T17:07:11.000-07:00
diff --git a/src/client/activation/activationService.ts b/src/client/activation/activationService.ts
@@ -287,7 +287,7 @@ export class LanguageServerExtensionActivationService
                 outputLine = 'Starting Microsoft Python language server.';
                 break;
             case LanguageServerType.Node:
-                outputLine = 'Starting Node.js language server.';
+                outputLine = 'Starting Pylance language server.';
                 break;
             case LanguageServerType.None:
                 outputLine = 'Editor support is inactive since language server is set to None.';
diff --git a/src/client/activation/node/languageServerFolderService.ts b/src/client/activation/node/languageServerFolderService.ts
@@ -14,6 +14,8 @@ import { IServiceContainer } from '../../ioc/types';
 import { LanguageServerFolderService } from '../common/languageServerFolderService';
 import { FolderVersionPair, ILanguageServerFolderService, NodeLanguageServerFolder } from '../types';
 
+export const PylanceExtensionName = 'ms-python.vscode-pylance';
+
 class FallbackNodeLanguageServerFolderService extends LanguageServerFolderService {
     constructor(serviceContainer: IServiceContainer) {
         super(serviceContainer, NodeLanguageServerFolder);
@@ -99,12 +101,7 @@ export class NodeLanguageServerFolderService implements ILanguageServerFolderSer
             return undefined;
         }
 
-        const extensionName = this.workspaceService.getConfiguration('python').get<string>('lsExtensionName');
-        if (!extensionName) {
-            return undefined;
-        }
-
-        const extension = this.extensions.getExtension<ILSExtensionApi>(extensionName);
+        const extension = this.extensions.getExtension<ILSExtensionApi>(PylanceExtensionName);
         if (!extension) {
             return undefined;
         }
diff --git a/src/client/activation/types.ts b/src/client/activation/types.ts
@@ -66,7 +66,7 @@ export interface IExtensionActivationService {
 export enum LanguageServerType {
     Jedi = 'Jedi',
     Microsoft = 'Microsoft',
-    Node = 'Node',
+    Node = 'Pylance',
     None = 'None'
 }
 
diff --git a/src/test/activation/node/languageServerFolderService.unit.test.ts b/src/test/activation/node/languageServerFolderService.unit.test.ts
@@ -9,7 +9,8 @@ import { Extension, Uri, WorkspaceConfiguration } from 'vscode';
 import {
     ILanguageServerFolder,
     ILSExtensionApi,
-    NodeLanguageServerFolderService
+    NodeLanguageServerFolderService,
+    PylanceExtensionName
 } from '../../../client/activation/node/languageServerFolderService';
 import { IWorkspaceService } from '../../../client/common/application/types';
 import { IConfigurationService, IExtensions, IPythonSettings } from '../../../client/common/types';
@@ -19,7 +20,6 @@ import { IServiceContainer } from '../../../client/ioc/types';
 
 suite('Node Language Server Folder Service', () => {
     const resource = Uri.parse('a');
-    const extensionName = 'some.extension';
 
     let serviceContainer: TypeMoq.IMock<IServiceContainer>;
     let pythonSettings: TypeMoq.IMock<IPythonSettings>;
@@ -99,7 +99,6 @@ suite('Node Language Server Folder Service', () => {
     test('lsExtensionName is undefined', async () => {
         pythonSettings.setup((p) => p.downloadLanguageServer).returns(() => true);
         workspaceConfiguration.setup((wc) => wc.get('packageName')).returns(() => undefined);
-        workspaceConfiguration.setup((wc) => wc.get('lsExtensionName')).returns(() => undefined);
 
         const folderService = new TestService(
             serviceContainer.object,
@@ -116,8 +115,7 @@ suite('Node Language Server Folder Service', () => {
     test('lsExtension not installed', async () => {
         pythonSettings.setup((p) => p.downloadLanguageServer).returns(() => true);
         workspaceConfiguration.setup((wc) => wc.get('packageName')).returns(() => undefined);
-        workspaceConfiguration.setup((wc) => wc.get('lsExtensionName')).returns(() => extensionName);
-        extensions.setup((e) => e.getExtension(extensionName)).returns(() => undefined);
+        extensions.setup((e) => e.getExtension(PylanceExtensionName)).returns(() => undefined);
 
         const folderService = new TestService(
             serviceContainer.object,
@@ -150,8 +148,7 @@ suite('Node Language Server Folder Service', () => {
             extension.setup((e) => e.exports).returns(() => extensionApi);
             pythonSettings.setup((p) => p.downloadLanguageServer).returns(() => true);
             workspaceConfiguration.setup((wc) => wc.get('packageName')).returns(() => undefined);
-            workspaceConfiguration.setup((wc) => wc.get('lsExtensionName')).returns(() => extensionName);
-            extensions.setup((e) => e.getExtension(extensionName)).returns(() => extension.object);
+            extensions.setup((e) => e.getExtension(PylanceExtensionName)).returns(() => extension.object);
             folderService = new TestService(
                 serviceContainer.object,
                 configService.object,

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ export interface IExtensionActivationService {`
`66`	`66`	`export enum LanguageServerType {`
`67`	`67`	`Jedi = 'Jedi',`
`68`	`68`	`Microsoft = 'Microsoft',`
`69`		`- Node = 'Node',`
	`69`	`+ Node = 'Pylance',`
`70`	`70`	`None = 'None'`
`71`	`71`	`}`
`72`	`72`