Rename IDefaultJediLanguageServer to IDefaultLanguageServer

microsoft · Feb 3, 2021 · 3cb0282 · 3cb0282
1 parent 1582c1a
commit 3cb0282
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 35 deletions.
diff --git a/src/client/common/configSettings.ts b/src/client/common/configSettings.ts
@@ -30,7 +30,7 @@ import * as internalPython from './process/internal/python';
 import {
     IAnalysisSettings,
     IAutoCompleteSettings,
-    IDefaultJediLanguageServer,
+    IDefaultLanguageServer,
     IExperiments,
     IExperimentsManager,
     IFormattingSettings,
@@ -164,7 +164,7 @@ export class PythonSettings implements IPythonSettings {
         private readonly experimentsManager?: IExperimentsManager,
         private readonly interpreterPathService?: IInterpreterPathService,
         private readonly interpreterSecurityService?: IInterpreterSecurityService,
-        private readonly defaultJedi?: IDefaultJediLanguageServer,
+        private readonly defaultJedi?: IDefaultLanguageServer,
     ) {
         this.workspace = workspace || new WorkspaceService();
         this.workspaceRoot = workspaceFolder;
@@ -178,7 +178,7 @@ export class PythonSettings implements IPythonSettings {
         experimentsManager?: IExperimentsManager,
         interpreterPathService?: IInterpreterPathService,
         interpreterSecurityService?: IInterpreterSecurityService,
-        defaultJedi?: IDefaultJediLanguageServer,
+        defaultJedi?: IDefaultLanguageServer,
     ): PythonSettings {
         workspace = workspace || new WorkspaceService();
         const workspaceFolderUri = PythonSettings.getSettingsUriAndTarget(resource, workspace).uri;
@@ -282,7 +282,7 @@ export class PythonSettings implements IPythonSettings {
         this.useIsolation = systemVariables.resolveAny(pythonSettings.get<boolean>('useIsolation', true))!;
 
         const defaultServer = this.defaultJedi
-            ? this.defaultJedi.defaultJediType
+            ? this.defaultJedi.defaultLSType
             : pythonSettings.get<LanguageServerType>('languageServer');
         let ls = defaultServer ?? LanguageServerType.Jedi;
         ls = systemVariables.resolveAny(ls);

diff --git a/src/client/common/configuration/service.ts b/src/client/common/configuration/service.ts
@@ -14,7 +14,7 @@ import { isUnitTestExecution } from '../constants';
 import { DeprecatePythonPath } from '../experiments/groups';
 import {
     IConfigurationService,
-    IDefaultJediLanguageServer,
+    IDefaultLanguageServer,
     IExperimentsManager,
     IInterpreterPathService,
     IPythonSettings,
@@ -37,7 +37,7 @@ export class ConfigurationService implements IConfigurationService {
         const interpreterSecurityService = this.serviceContainer.get<IInterpreterSecurityService>(
             IInterpreterSecurityService,
         );
-        const defaultJedi = this.serviceContainer.tryGet<IDefaultJediLanguageServer>(IDefaultJediLanguageServer);
+        const defaultJedi = this.serviceContainer.tryGet<IDefaultLanguageServer>(IDefaultLanguageServer);
         return PythonSettings.getInstance(
             resource,
             InterpreterAutoSelectionService,

diff --git a/src/client/common/experiments/helpers.ts b/src/client/common/experiments/helpers.ts
@@ -7,7 +7,7 @@ import { injectable } from 'inversify';
 import { LanguageServerType } from '../../activation/types';
 import { IServiceManager } from '../../ioc/types';
 import { IWorkspaceService } from '../application/types';
-import { IDefaultJediLanguageServer, IExperimentService } from '../types';
+import { IDefaultLanguageServer, IExperimentService } from '../types';
 import { DiscoveryVariants, JediLSP } from './groups';
 
 export async function inDiscoveryExperiment(experimentService: IExperimentService): Promise<boolean> {
@@ -19,11 +19,11 @@ export async function inDiscoveryExperiment(experimentService: IExperimentServic
 }
 
 @injectable()
-class DefaultLanguageServer implements IDefaultJediLanguageServer {
-    public readonly defaultJediType: LanguageServerType.Jedi | LanguageServerType.JediLSP;
+class DefaultLanguageServer implements IDefaultLanguageServer {
+    public readonly defaultLSType: LanguageServerType.Jedi | LanguageServerType.JediLSP;
 
     constructor(defaultServer: LanguageServerType.Jedi | LanguageServerType.JediLSP) {
-        this.defaultJediType = defaultServer;
+        this.defaultLSType = defaultServer;
     }
 }
 
@@ -49,8 +49,8 @@ export async function setDefaultLanguageServerByExperiment(
     const lsType = (await experimentService.inExperiment(JediLSP.experiment))
         ? LanguageServerType.JediLSP
         : LanguageServerType.Jedi;
-    serviceManager.addSingletonInstance<IDefaultJediLanguageServer>(
-        IDefaultJediLanguageServer,
+    serviceManager.addSingletonInstance<IDefaultLanguageServer>(
+        IDefaultLanguageServer,
         new DefaultLanguageServer(lsType),
     );
     return Promise.resolve();

diff --git a/src/client/common/types.ts b/src/client/common/types.ts
@@ -631,8 +631,8 @@ export interface IInterpreterPathService {
  * Adding experiment check there would mean touching the entire extension. For simplicity
  * this is a solution.
  */
-export const IDefaultJediLanguageServer = Symbol('IDefaultJediLanguageServer');
+export const IDefaultLanguageServer = Symbol('IDefaultLanguageServer');
 
-export interface IDefaultJediLanguageServer {
-    readonly defaultJediType: LanguageServerType.Jedi | LanguageServerType.JediLSP;
+export interface IDefaultLanguageServer {
+    readonly defaultLSType: LanguageServerType;
 }
diff --git a/src/test/common/experiments/helpers.unit.test.ts b/src/test/common/experiments/helpers.unit.test.ts
@@ -14,7 +14,7 @@ import {
     setDefaultLanguageServerByExperiment,
 } from '../../../client/common/experiments/helpers';
 import { ExperimentService } from '../../../client/common/experiments/service';
-import { IDefaultJediLanguageServer, IExperimentService } from '../../../client/common/types';
+import { IDefaultLanguageServer, IExperimentService } from '../../../client/common/types';
 import { ServiceManager } from '../../../client/ioc/serviceManager';
 import { IServiceManager } from '../../../client/ioc/types';
 import { MockWorkspaceConfiguration } from '../../startPage/mockWorkspaceConfig';
@@ -68,9 +68,7 @@ suite('Experiments - setDefaultLanguageServerByExperiment()', () => {
 
         verify(workspaceService.getConfiguration('python')).once();
         verify(experimentService.inExperiment(JediLSP.experiment)).never();
-        verify(
-            serviceManager.addSingletonInstance<IDefaultJediLanguageServer>(IDefaultJediLanguageServer, anything()),
-        ).never();
+        verify(serviceManager.addSingletonInstance<IDefaultLanguageServer>(IDefaultLanguageServer, anything())).never();
     });
 
     test('languageServer NOT set by user and NOT in experiment', async () => {
@@ -81,11 +79,11 @@ suite('Experiments - setDefaultLanguageServerByExperiment()', () => {
             }),
         );
         when(experimentService.inExperiment(JediLSP.experiment)).thenResolve(false);
-        when(
-            serviceManager.addSingletonInstance<IDefaultJediLanguageServer>(IDefaultJediLanguageServer, anything()),
-        ).thenCall((_symbol, value: IDefaultJediLanguageServer) => {
-            defaultServerType = value.defaultJediType;
-        });
+        when(serviceManager.addSingletonInstance<IDefaultLanguageServer>(IDefaultLanguageServer, anything())).thenCall(
+            (_symbol, value: IDefaultLanguageServer) => {
+                defaultServerType = value.defaultLSType;
+            },
+        );
 
         await setDefaultLanguageServerByExperiment(
             instance(experimentService),
@@ -95,9 +93,7 @@ suite('Experiments - setDefaultLanguageServerByExperiment()', () => {
 
         verify(workspaceService.getConfiguration('python')).once();
         verify(experimentService.inExperiment(JediLSP.experiment)).once();
-        verify(
-            serviceManager.addSingletonInstance<IDefaultJediLanguageServer>(IDefaultJediLanguageServer, anything()),
-        ).once();
+        verify(serviceManager.addSingletonInstance<IDefaultLanguageServer>(IDefaultLanguageServer, anything())).once();
         expect(defaultServerType).to.equal(LanguageServerType.Jedi);
     });
 
@@ -109,11 +105,11 @@ suite('Experiments - setDefaultLanguageServerByExperiment()', () => {
             }),
         );
         when(experimentService.inExperiment(JediLSP.experiment)).thenResolve(true);
-        when(
-            serviceManager.addSingletonInstance<IDefaultJediLanguageServer>(IDefaultJediLanguageServer, anything()),
-        ).thenCall((_symbol, value: IDefaultJediLanguageServer) => {
-            defaultServerType = value.defaultJediType;
-        });
+        when(serviceManager.addSingletonInstance<IDefaultLanguageServer>(IDefaultLanguageServer, anything())).thenCall(
+            (_symbol, value: IDefaultLanguageServer) => {
+                defaultServerType = value.defaultLSType;
+            },
+        );
 
         await setDefaultLanguageServerByExperiment(
             instance(experimentService),
@@ -123,9 +119,7 @@ suite('Experiments - setDefaultLanguageServerByExperiment()', () => {
 
         verify(workspaceService.getConfiguration('python')).once();
         verify(experimentService.inExperiment(JediLSP.experiment)).once();
-        verify(
-            serviceManager.addSingletonInstance<IDefaultJediLanguageServer>(IDefaultJediLanguageServer, anything()),
-        ).once();
+        verify(serviceManager.addSingletonInstance<IDefaultLanguageServer>(IDefaultLanguageServer, anything())).once();
         expect(defaultServerType).to.equal(LanguageServerType.JediLSP);
     });
 });