Lint files from sort interpreter and autoselection PRs (microsoft#16689)

* Linting changes for env sorting * Lint all files under autoSelection/

Author: kimadeline

.eslintignore

@@ -41,12 +41,6 @@ src/test/interpreters/mocks.ts
 src/test/interpreters/interpreterVersion.unit.test.ts
 src/test/interpreters/virtualEnvs/index.unit.test.ts
 src/test/interpreters/virtualEnvs/condaInheritEnvPrompt.unit.test.ts
-src/test/interpreters/autoSelection/rules/settings.unit.test.ts
-src/test/interpreters/autoSelection/rules/cached.unit.test.ts
-src/test/interpreters/autoSelection/rules/winRegistry.unit.test.ts
-src/test/interpreters/autoSelection/rules/base.unit.test.ts
-src/test/interpreters/autoSelection/rules/currentPath.unit.test.ts
-src/test/interpreters/autoSelection/rules/system.unit.test.ts
 src/test/interpreters/virtualEnvManager.unit.test.ts
 src/test/interpreters/pythonPathUpdaterFactory.unit.test.ts
 src/test/interpreters/activation/service.unit.test.ts
@@ -276,7 +270,6 @@ src/test/workspaceSymbols/common.ts
 src/test/workspaceSymbols/main.unit.test.ts
 src/test/workspaceSymbols/generator.unit.test.ts
 
-src/client/interpreter/configuration/interpreterComparer.ts
 src/client/interpreter/configuration/interpreterSelector/commands/base.ts
 src/client/interpreter/configuration/interpreterSelector/commands/resetInterpreter.ts
 src/client/interpreter/configuration/interpreterSelector/commands/setShebangInterpreter.ts
@@ -288,12 +281,6 @@ src/client/interpreter/helpers.ts
 src/client/interpreter/virtualEnvs/condaInheritEnvPrompt.ts
 src/client/interpreter/virtualEnvs/types.ts
 src/client/interpreter/virtualEnvs/index.ts
-src/client/interpreter/autoSelection/rules/baseRule.ts
-src/client/interpreter/autoSelection/rules/winRegistry.ts
-src/client/interpreter/autoSelection/rules/settings.ts
-src/client/interpreter/autoSelection/rules/currentPath.ts
-src/client/interpreter/autoSelection/rules/cached.ts
-src/client/interpreter/autoSelection/rules/system.ts
 src/client/interpreter/activation/service.ts
 src/client/interpreter/display/shebangCodeLensProvider.ts
 src/client/interpreter/display/index.ts

src/client/interpreter/autoSelection/constants.ts

@@ -23,7 +23,9 @@ export enum NextAction {
 @injectable()
 export abstract class BaseRuleService implements IInterpreterAutoSelectionRule {
  protected nextRule?: IInterpreterAutoSelectionRule;
+
  private readonly stateStore: IPersistentState<PythonEnvironment | undefined>;
+
  constructor(
  @unmanaged() protected readonly ruleName: AutoSelectionRule,
  @inject(IFileSystem) private readonly fs: IFileSystem,
@@ -34,9 +36,11 @@ export abstract class BaseRuleService implements IInterpreterAutoSelectionRule {
  undefined,
  );
  }
+
  public setNextRule(rule: IInterpreterAutoSelectionRule): void {
  this.nextRule = rule;
  }
+
  @traceDecorators.verbose('autoSelectInterpreter')
  public async autoSelectInterpreter(resource: Resource, manager?: IInterpreterAutoSelectionService): Promise<void> {
  await this.clearCachedInterpreterIfInvalid(resource);
@@ -53,15 +57,18 @@ export abstract class BaseRuleService implements IInterpreterAutoSelectionRule {
  await this.next(resource, manager);
  }
  }
+
  public getPreviouslyAutoSelectedInterpreter(_resource: Resource): PythonEnvironment | undefined {
- const value = this.stateStore.value;
+ const { value } = this.stateStore;
  traceVerbose(`Current value for rule ${this.ruleName} is ${value ? JSON.stringify(value) : 'nothing'}`);
  return value;
  }
+
  protected abstract onAutoSelectInterpreter(
  resource: Resource,
  manager?: IInterpreterAutoSelectionService,
  ): Promise<NextAction>;
+
  @traceDecorators.verbose('setGlobalInterpreter')
  protected async setGlobalInterpreter(
  interpreter?: PythonEnvironment,
@@ -86,7 +93,8 @@ export abstract class BaseRuleService implements IInterpreterAutoSelectionRule {
 
  return false;
  }
- protected async clearCachedInterpreterIfInvalid(resource: Resource) {
+
+ protected async clearCachedInterpreterIfInvalid(resource: Resource): Promise<void> {
  if (!this.stateStore.value || (await this.fs.fileExists(this.stateStore.value.path))) {
  return;
  }
@@ -97,13 +105,18 @@ export abstract class BaseRuleService implements IInterpreterAutoSelectionRule {
  );
  await this.cacheSelectedInterpreter(resource, undefined);
  }
- protected async cacheSelectedInterpreter(_resource: Resource, interpreter: PythonEnvironment | undefined) {
+
+ protected async cacheSelectedInterpreter(
+ _resource: Resource,
+ interpreter: PythonEnvironment | undefined,
+ ): Promise<void> {
  const interpreterPath = interpreter ? interpreter.path : '';
  const interpreterPathInCache = this.stateStore.value ? this.stateStore.value.path : '';
  const updated = interpreterPath === interpreterPathInCache;
  sendTelemetryEvent(EventName.PYTHON_INTERPRETER_AUTO_SELECTION, {}, { rule: this.ruleName, updated });
  await this.stateStore.updateValue(interpreter);
  }
+
  protected async next(resource: Resource, manager?: IInterpreterAutoSelectionService): Promise<void> {
  traceVerbose(`Executing next rule from ${this.ruleName}`);
  return this.nextRule && manager ? this.nextRule.autoSelectInterpreter(resource, manager) : undefined;

src/client/interpreter/autoSelection/rules/baseRule.ts

@@ -14,6 +14,7 @@ import { BaseRuleService, NextAction } from './baseRule';
 @injectable()
 export class CachedInterpretersAutoSelectionRule extends BaseRuleService {
  protected readonly rules: IInterpreterAutoSelectionRule[];
+
  constructor(
  @inject(IFileSystem) fs: IFileSystem,
  @inject(IInterpreterHelper) private readonly helper: IInterpreterHelper,
@@ -31,6 +32,7 @@ export class CachedInterpretersAutoSelectionRule extends BaseRuleService {
  super(AutoSelectionRule.cachedInterpreters, fs, stateFactory);
  this.rules = [systemInterpreter, currentPathInterpreter, winRegInterpreter];
  }
+
  protected async onAutoSelectInterpreter(
  resource: Resource,
  manager?: IInterpreterAutoSelectionService,

src/client/interpreter/autoSelection/rules/cached.ts

@@ -31,11 +31,12 @@ export class CurrentPathInterpretersAutoSelectionRule extends BaseRuleService {
  ) {
  super(AutoSelectionRule.currentPath, fs, stateFactory);
  }
+
  protected async onAutoSelectInterpreter(
  resource: Resource,
  manager?: IInterpreterAutoSelectionService,
  ): Promise<NextAction> {
- let interpreters = (await inDiscoveryExperiment(this.experimentService))
+ const interpreters = (await inDiscoveryExperiment(this.experimentService))
  ? await this.pyenvs.getInterpreters(resource, undefined, [PythonEnvSource.PathEnvVar])
  : await this.serviceContainer
  .get<IInterpreterLocatorService>(IInterpreterLocatorService, CURRENT_PATH_SERVICE)

src/client/interpreter/autoSelection/rules/currentPath.ts

@@ -22,11 +22,12 @@ export class SettingsInterpretersAutoSelectionRule extends BaseRuleService {
  ) {
  super(AutoSelectionRule.settings, fs, stateFactory);
  }
+
  protected async onAutoSelectInterpreter(
  _resource: Resource,
  _manager?: IInterpreterAutoSelectionService,
  ): Promise<NextAction> {
- const pythonConfig = this.workspaceService.getConfiguration('python', null as any)!;
+ const pythonConfig = this.workspaceService.getConfiguration('python')!;
  const pythonPathInConfig = this.experiments.inExperimentSync(DeprecatePythonPath.experiment)
  ? this.interpreterPathService.inspect(undefined)
  : pythonConfig.inspect<string>('pythonPath')!;

src/client/interpreter/autoSelection/rules/settings.ts

@@ -22,6 +22,7 @@ export class SystemWideInterpretersAutoSelectionRule extends BaseRuleService {
  ) {
  super(AutoSelectionRule.systemWide, fs, stateFactory);
  }
+
  protected async onAutoSelectInterpreter(
  resource: Resource,
  manager?: IInterpreterAutoSelectionService,

src/client/interpreter/autoSelection/rules/system.ts

@@ -33,6 +33,7 @@ export class WindowsRegistryInterpretersAutoSelectionRule extends BaseRuleServic
  ) {
  super(AutoSelectionRule.windowsRegistry, fs, stateFactory);
  }
+
  protected async onAutoSelectInterpreter(
  resource: Resource,
  manager?: IInterpreterAutoSelectionService,

src/client/interpreter/autoSelection/rules/winRegistry.ts

@@ -12,6 +12,7 @@ import { IInterpreterComparer } from './types';
 @injectable()
 export class InterpreterComparer implements IInterpreterComparer {
  constructor(@inject(IInterpreterHelper) private readonly interpreterHelper: IInterpreterHelper) {}
+
  public compare(a: PythonEnvironment, b: PythonEnvironment): number {
  const nameA = getSortName(a, this.interpreterHelper);
  const nameB = getSortName(b, this.interpreterHelper);

src/client/interpreter/configuration/interpreterComparer.ts

@@ -30,15 +30,19 @@ suite('Interpreters - Auto Selection - Base Rule', () => {
  public async next(resource: Resource, manager?: IInterpreterAutoSelectionService): Promise<void> {
  return super.next(resource, manager);
  }
+
  public async cacheSelectedInterpreter(resource: Resource, interpreter: PythonEnvironment | undefined) {
  return super.cacheSelectedInterpreter(resource, interpreter);
  }
+
  public async setGlobalInterpreter(
  interpreter?: PythonEnvironment,
  manager?: IInterpreterAutoSelectionService,
  ): Promise<boolean> {
  return super.setGlobalInterpreter(interpreter, manager);
  }
+
+ // eslint-disable-next-line class-methods-use-this
  protected async onAutoSelectInterpreter(
  _resource: Uri,
  _manager?: IInterpreterAutoSelectionService,
@@ -97,7 +101,7 @@ suite('Interpreters - Auto Selection - Base Rule', () => {
  });
  test('State store must be updated', async () => {
  const resource = Uri.parse('x');
- const interpreterInfo = { x: '1324' } as any;
+ const interpreterInfo = ({ x: '1324' } as unknown) as PythonEnvironment;
  when(state.updateValue(anything())).thenResolve();
 
  await rule.cacheSelectedInterpreter(resource, interpreterInfo);
@@ -106,7 +110,7 @@ suite('Interpreters - Auto Selection - Base Rule', () => {
  });
  test('State store must be cleared when file does not exist', async () => {
  const resource = Uri.parse('x');
- const interpreterInfo = { path: '1324' } as any;
+ const interpreterInfo = ({ path: '1324' } as unknown) as PythonEnvironment;
  when(state.value).thenReturn(interpreterInfo);
  when(state.updateValue(anything())).thenResolve();
  when(fs.fileExists(interpreterInfo.path)).thenResolve(false);
@@ -119,7 +123,7 @@ suite('Interpreters - Auto Selection - Base Rule', () => {
  });
  test('State store must not be cleared when file exists', async () => {
  const resource = Uri.parse('x');
- const interpreterInfo = { path: '1324' } as any;
+ const interpreterInfo = ({ path: '1324' } as unknown) as PythonEnvironment;
  when(state.value).thenReturn(interpreterInfo);
  when(state.updateValue(anything())).thenResolve();
  when(fs.fileExists(interpreterInfo.path)).thenResolve(true);
@@ -139,15 +143,15 @@ suite('Interpreters - Auto Selection - Base Rule', () => {
  });
  test('Get value from state store', async () => {
  const stateStoreValue = 'x';
- when(state.value).thenReturn(stateStoreValue as any);
+ when(state.value).thenReturn((stateStoreValue as unknown) as PythonEnvironment);
 
  expect(rule.getPreviouslyAutoSelectedInterpreter(Uri.parse('x'))).to.be.equal(stateStoreValue);
 
  verify(state.value).atLeast(1);
  });
  test('setGlobalInterpreter should do nothing if interpreter is undefined or version is empty', async () => {
  const manager = mock(InterpreterAutoSelectionService);
- const interpreterInfo = { path: '1324' } as any;
+ const interpreterInfo = ({ path: '1324' } as unknown) as PythonEnvironment;
 
  const result1 = await rule.setGlobalInterpreter(undefined, instance(manager));
  const result2 = await rule.setGlobalInterpreter(interpreterInfo, instance(manager));
@@ -158,8 +162,8 @@ suite('Interpreters - Auto Selection - Base Rule', () => {
  });
  test('setGlobalInterpreter should not update manager if interpreter is not better than one stored in manager', async () => {
  const manager = mock(InterpreterAutoSelectionService);
- const interpreterInfo = { path: '1324', version: new SemVer('1.0.0') } as any;
- const interpreterInfoInManager = { path: '2', version: new SemVer('2.0.0') } as any;
+ const interpreterInfo = ({ path: '1324', version: new SemVer('1.0.0') } as unknown) as PythonEnvironment;
+ const interpreterInfoInManager = ({ path: '2', version: new SemVer('2.0.0') } as unknown) as PythonEnvironment;
  when(manager.getAutoSelectedInterpreter(undefined)).thenReturn(interpreterInfoInManager);
 
  const result = await rule.setGlobalInterpreter(interpreterInfo, instance(manager));
@@ -170,8 +174,8 @@ suite('Interpreters - Auto Selection - Base Rule', () => {
  });
  test('setGlobalInterpreter should update manager if interpreter is better than one stored in manager', async () => {
  const manager = mock(InterpreterAutoSelectionService);
- const interpreterInfo = { path: '1324', version: new SemVer('3.0.0') } as any;
- const interpreterInfoInManager = { path: '2', version: new SemVer('2.0.0') } as any;
+ const interpreterInfo = ({ path: '1324', version: new SemVer('3.0.0') } as unknown) as PythonEnvironment;
+ const interpreterInfoInManager = ({ path: '2', version: new SemVer('2.0.0') } as unknown) as PythonEnvironment;
  when(manager.getAutoSelectedInterpreter(undefined)).thenReturn(interpreterInfoInManager);
 
  const result = await rule.setGlobalInterpreter(interpreterInfo, instance(manager));