Address various eslint errors (#14945)

Co-authored-by: Kim-Adeline Miguel <[email protected]>

Author: brettcannon

src/client/activation/common/cancellationUtils.ts

@@ -80,6 +80,7 @@ export class FileBasedCancellationStrategy implements CancellationStrategy, Disp
         this._sender = new FileCancellationSenderStrategy(folderName);
     }
 
+    // eslint-disable-next-line class-methods-use-this
     get receiver(): CancellationReceiverStrategy {
         return CancellationReceiverStrategy.Message;
     }

src/client/activation/jedi/activator.ts

@@ -19,6 +19,7 @@ import { ILanguageServerManager } from '../types';
  */
 @injectable()
 export class JediLanguageServerActivator extends LanguageServerActivatorBase {
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
     constructor(
         @inject(ILanguageServerManager) manager: ILanguageServerManager,
         @inject(IWorkspaceService) workspace: IWorkspaceService,
@@ -28,6 +29,7 @@ export class JediLanguageServerActivator extends LanguageServerActivatorBase {
         super(manager, workspace, fs, configurationService);
     }
 
+    // eslint-disable-next-line class-methods-use-this, @typescript-eslint/no-unused-vars
     public async ensureLanguageServerIsAvailable(_resource: Resource): Promise<void> {
         // Nothing to do here. Jedi language server is shipped with the extension
     }

src/client/activation/jedi/analysisOptions.ts

@@ -8,6 +8,7 @@ import { ILanguageServerOutputChannel } from '../types';
 
 @injectable()
 export class JediLanguageServerAnalysisOptions extends LanguageServerAnalysisOptionsBase {
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
     constructor(
         @inject(IEnvironmentVariablesProvider) envVarsProvider: IEnvironmentVariablesProvider,
         @inject(ILanguageServerOutputChannel) lsOutputChannel: ILanguageServerOutputChannel

src/client/common/utils/resourceLifecycle.ts

@@ -44,12 +44,13 @@ export class Disposables implements IDisposables {
         this.disposables.push(...disposables);
     }
 
-    public push(...disposables: IDisposable[]) {
+    public push(...disposables: IDisposable[]): void {
         this.disposables.push(...disposables);
     }
 
     public async dispose(): Promise<void> {
-        const disposables = this.disposables;
+        // tslint:disable-next-line: no-this-assignment
+        const { disposables } = this;
         this.disposables = [];
         await disposeAll(disposables);
     }

src/client/pythonEnvironments/common/windowsRegistry.ts

@@ -6,10 +6,8 @@ import {
 } from 'winreg';
 import { createDeferred } from '../../common/utils/async';
 
-
 export { HKCU, HKLM, REG_SZ, Options };
 
-
 export interface IRegistryKey {
     hive: string;
     arch: string;

src/client/pythonEnvironments/discovery/locators/services/KnownPathsService.ts

@@ -4,6 +4,7 @@
 
 import { inject, injectable } from 'inversify';
 import * as path from 'path';
+import { Uri } from 'vscode';
 import { IFileSystem, IPlatformService } from '../../../../common/platform/types';
 import { ICurrentProcess, IPathUtils } from '../../../../common/types';
 import { IInterpreterHelper, IKnownSearchPathsForInterpreters } from '../../../../interpreter/contracts';
@@ -34,16 +35,18 @@ export class KnownPathsService extends CacheableLocatorService {
      * Called by VS Code to indicate it is done with the resource.
      */
     // tslint:disable:no-empty
-    // eslint-disable-next-line @typescript-eslint/no-empty-function,class-methods-use-this
-    public dispose(): void {}
-    // tslint:enable:no-empty
+    // eslint-disable-next-line
+    public dispose(): void {
+        // No body
+    }
 
     /**
      * Return the located interpreters.
      *
      * This is used by CacheableLocatorService.getInterpreters().
      */
-    protected getInterpretersImplementation(): Promise<PythonEnvironment[]> {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    protected getInterpretersImplementation(_resource?: Uri): Promise<PythonEnvironment[]> {
         return this.suggestionsFromKnownPaths();
     }
 

src/client/pythonEnvironments/discovery/locators/services/condaEnvFileService.ts

@@ -39,13 +39,16 @@ export class CondaEnvFileService extends CacheableLocatorService {
      * Called by VS Code to indicate it is done with the resource.
      */
     // tslint:disable-next-line:no-empty
-    public dispose() {}
+    public dispose(): void {
+        // No body
+    }
 
     /**
      * Return the located interpreters.
      *
      * This is used by CacheableLocatorService.getInterpreters().
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     protected getInterpretersImplementation(_resource?: Uri): Promise<PythonEnvironment[]> {
         return this.getSuggestionsFromConda();
     }
@@ -108,12 +111,12 @@ export class CondaEnvFileService extends CacheableLocatorService {
     private async getInterpreterDetails(environmentPath: string): Promise<PythonEnvironment | undefined> {
         const interpreter = this.condaService.getInterpreterPath(environmentPath);
         if (!interpreter || !(await this.fileSystem.fileExists(interpreter))) {
-            return;
+            return undefined;
         }
 
         const details = await this.helperService.getInterpreterInformation(interpreter);
         if (!details) {
-            return;
+            return undefined;
         }
         const envName = details.envName ? details.envName : path.basename(environmentPath);
         this._hasInterpreters.resolve(true);

src/client/pythonEnvironments/discovery/locators/services/condaEnvService.ts

@@ -31,13 +31,16 @@ export class CondaEnvService extends CacheableLocatorService {
      * Called by VS Code to indicate it is done with the resource.
      */
     // tslint:disable-next-line:no-empty
-    public dispose() {}
+    public dispose(): void {
+        // No body
+    }
 
     /**
      * Return the located interpreters.
      *
      * This is used by CacheableLocatorService.getInterpreters().
      */
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     protected getInterpretersImplementation(_resource?: Uri): Promise<PythonEnvironment[]> {
         return this.getSuggestionsFromConda();
     }

src/client/pythonEnvironments/discovery/locators/services/currentPathService.ts

@@ -39,7 +39,9 @@ export class CurrentPathService extends CacheableLocatorService {
      * Called by VS Code to indicate it is done with the resource.
      */
     // tslint:disable-next-line:no-empty
-    public dispose() {}
+    public dispose(): void {
+        // No body
+    }
 
     /**
      * Return the located interpreters.
@@ -77,7 +79,7 @@ export class CurrentPathService extends CacheableLocatorService {
     private async getInterpreterDetails(pythonPath: string): Promise<PythonEnvironment | undefined> {
         return this.helper.getInterpreterInformation(pythonPath).then((details) => {
             if (!details) {
-                return;
+                return undefined;
             }
             this._hasInterpreters.resolve(true);
             return {
@@ -110,7 +112,7 @@ export class CurrentPathService extends CacheableLocatorService {
                     );
                     return '';
                 })
-                .catch((_ex) => {
+                .catch(() => {
                     traceInfo(
                         `Detection of Python Interpreter for Command ${options.command} and args ${pyArgs.join(
                             ' ',

src/client/pythonEnvironments/discovery/locators/services/pipEnvService.ts

@@ -46,7 +46,9 @@ export class PipEnvService extends CacheableLocatorService implements IPipEnvSer
     }
 
     // tslint:disable-next-line:no-empty
-    public dispose() {}
+    public dispose(): void {
+        // No body
+    }
 
     public async isRelatedPipEnvironment(dir: string, pythonPath: string): Promise<boolean> {
         if (!this.didTriggerInterpreterSuggestions) {
@@ -99,12 +101,12 @@ export class PipEnvService extends CacheableLocatorService implements IPipEnvSer
     private async getInterpreterFromPipenv(pipenvCwd: string): Promise<PythonEnvironment | undefined> {
         const interpreterPath = await this.getInterpreterPathFromPipenv(pipenvCwd);
         if (!interpreterPath) {
-            return;
+            return undefined;
         }
 
         const details = await this.helper.getInterpreterInformation(interpreterPath);
         if (!details) {
-            return;
+            return undefined;
         }
         this._hasInterpreters.resolve(true);
         await this.pipEnvServiceHelper.trackWorkspaceFolder(interpreterPath, Uri.file(pipenvCwd));
@@ -129,7 +131,7 @@ export class PipEnvService extends CacheableLocatorService implements IPipEnvSer
     private async getInterpreterPathFromPipenv(cwd: string, ignoreErrors = false): Promise<string | undefined> {
         // Quick check before actually running pipenv
         if (!(await this.checkIfPipFileExists(cwd))) {
-            return;
+            return undefined;
         }
         try {
             // call pipenv --version just to see if pipenv is in the PATH
@@ -139,7 +141,7 @@ export class PipEnvService extends CacheableLocatorService implements IPipEnvSer
                 appShell.showWarningMessage(
                     `Workspace contains Pipfile but '${this.executable}' was not found. Make sure '${this.executable}' is on the PATH.`,
                 );
-                return;
+                return undefined;
             }
             // The --py command will fail if the virtual environment has not been setup yet.
             // so call pipenv --venv to check for the virtual environment first.
@@ -149,7 +151,7 @@ export class PipEnvService extends CacheableLocatorService implements IPipEnvSer
                 appShell.showWarningMessage(
                     'Workspace contains Pipfile but the associated virtual environment has not been setup. Setup the virtual environment manually if needed.',
                 );
-                return;
+                return undefined;
             }
             const pythonPath = await this.invokePipenv('--py', cwd);
             return pythonPath && (await this.fs.fileExists(pythonPath)) ? pythonPath : undefined;
@@ -160,6 +162,8 @@ export class PipEnvService extends CacheableLocatorService implements IPipEnvSer
                 return undefined;
             }
         }
+
+        return undefined;
     }
 
     private async checkIfPipFileExists(cwd: string): Promise<boolean> {
@@ -200,5 +204,7 @@ export class PipEnvService extends CacheableLocatorService implements IPipEnvSer
             traceWarning('Error in invoking PipEnv', error);
             traceWarning(`Relevant Environment Variables ${JSON.stringify(enviromentVariableValues, undefined, 4)}`);
         }
+
+        return undefined;
     }
 }