Fixed namespace and type errors, changed null to undefined where applicable

news/3 Code Health/18345.md

@@ -0,0 +1 @@
+Fixed typescript and namespace errors. (Thanks [Harry-Hopkinson](https://github.com/Harry-Hopkinson))

src/client/browser/extension.ts

@@ -83,7 +83,7 @@ async function runPylance(
 
         const languageClient = new LanguageClient('python', 'Python Language Server', clientOptions, worker);
 
-        languageClient.onDidChangeState((e) => {
+        languageClient.onDidChangeState((e): void => {
             // The client's on* methods must be called after the client has started, but if called too
             // late the server may have already sent a message (which leads to failures). Register
             // these on the state change to running to ensure they are ready soon enough.
@@ -97,20 +97,27 @@ async function runPylance(
                 ),
             );
 
-            languageClient.onTelemetry((telemetryEvent) => {
-                const eventName = telemetryEvent.EventName || EventName.LANGUAGE_SERVER_TELEMETRY;
-                const formattedProperties = {
-                    ...telemetryEvent.Properties,
-                    // Replace all slashes in the method name so it doesn't get scrubbed by vscode-extension-telemetry.
-                    method: telemetryEvent.Properties.method?.replace(/\//g, '.'),
-                };
-                sendTelemetryEventBrowser(
-                    eventName,
-                    telemetryEvent.Measurements,
-                    formattedProperties,
-                    telemetryEvent.Exception,
-                );
-            });
+            languageClient.onTelemetry(
+                (telemetryEvent: {
+                    EventName: EventName;
+                    Properties: { method: string };
+                    Measurements: number | Record<string, number> | undefined;
+                    Exception: Error | undefined;
+                }) => {
+                    const eventName = telemetryEvent.EventName || EventName.LANGUAGE_SERVER_TELEMETRY;
+                    const formattedProperties = {
+                        ...telemetryEvent.Properties,
+                        // Replace all slashes in the method name so it doesn't get scrubbed by vscode-extension-telemetry.
+                        method: telemetryEvent.Properties.method?.replace(/\//g, '.'),
+                    };
+                    sendTelemetryEventBrowser(
+                        eventName,
+                        telemetryEvent.Measurements,
+                        formattedProperties,
+                        telemetryEvent.Exception,
+                    );
+                },
+            );
         });
 
         const disposable = languageClient.start();

src/client/browser/intellisenseStatus.ts

@@ -22,5 +22,5 @@ export function createStatusItem(): vscode.Disposable {
         return statusItem;
     }
     // eslint-disable-next-line @typescript-eslint/no-empty-function
-    return { dispose: () => {} };
+    return { dispose: () => undefined };
 }

src/client/extension.ts

@@ -29,7 +29,6 @@ initializeFileLogging(logDispose);
 // loading starts here
 
 import { ProgressLocation, ProgressOptions, window } from 'vscode';
-
 import { buildApi } from './api';
 import { IApplicationShell, IWorkspaceService } from './common/application/types';
 import { IAsyncDisposableRegistry, IDisposableRegistry, IExperimentService, IExtensionContext } from './common/types';
@@ -193,6 +192,6 @@ function notifyUser(msg: string) {
         }
         appShell.showErrorMessage(msg).ignoreErrors();
     } catch (ex) {
-        traceError('failed to notify user', ex);
+        traceError('Failed to Notify User', ex);
     }
 }

src/client/interpreter/helpers.ts

@@ -4,6 +4,7 @@ import { IDocumentManager, IWorkspaceService } from '../common/application/types
 import { FileSystemPaths } from '../common/platform/fs-paths';
 import { Resource } from '../common/types';
 import { IServiceContainer } from '../ioc/types';
+import { PythonEnvSource } from '../pythonEnvironments/base/info';
 import { compareSemVerLikeVersions } from '../pythonEnvironments/base/info/pythonVersion';
 import { EnvironmentType, getEnvironmentTypeName, PythonEnvironment } from '../pythonEnvironments/info';
 import { IComponentAdapter, IInterpreterHelper, WorkspacePythonPath } from './contracts';
@@ -66,6 +67,22 @@ export class InterpreterHelper implements IInterpreterHelper {
         return this.pyenvs.getInterpreterInformation(pythonPath);
     }
 
+    public async getInterpreters({ resource, source }: { resource?: Uri; source?: PythonEnvSource[] } = {}): Promise<
+        PythonEnvironment[]
+    > {
+        const interpreters = await this.pyenvs.getInterpreters(resource, source);
+        return sortInterpreters(interpreters);
+    }
+
+    public async getInterpreterPath(pythonPath: string): Promise<string> {
+        const interpreterInfo: any = await this.getInterpreterInformation(pythonPath);
+        if (interpreterInfo) {
+            return interpreterInfo.path;
+        } else {
+            return pythonPath;
+        }
+    }
+
     public async isMacDefaultPythonPath(pythonPath: string): Promise<boolean> {
         return this.pyenvs.isMacDefaultPythonPath(pythonPath);
     }

src/client/interpreter/interpreterService.ts

@@ -107,7 +107,7 @@ export class InterpreterService implements Disposable, IInterpreterService {
             interpreterDisplay.registerVisibilityFilter(filter);
         }
         disposables.push(
-            this.onDidChangeInterpreters((e) => {
+            this.onDidChangeInterpreters((e): void => {
                 const interpreter = e.old ?? e.new;
                 if (interpreter) {
                     this.didChangeInterpreterInformation.fire(interpreter);
@@ -119,7 +119,7 @@ export class InterpreterService implements Disposable, IInterpreterService {
                 // To handle scenario when language mode is set to "python"
                 filter.interpreterVisibilityEmitter.fire();
             }),
-            documentManager.onDidChangeActiveTextEditor((e) => {
+            documentManager.onDidChangeActiveTextEditor((e): void => {
                 filter.interpreterVisibilityEmitter.fire();
                 if (e && e.document) {
                     this.refresh(e.document.uri);
@@ -129,7 +129,7 @@ export class InterpreterService implements Disposable, IInterpreterService {
         const pySettings = this.configService.getSettings();
         this._pythonPathSetting = pySettings.pythonPath;
         disposables.push(
-            this.interpreterPathService.onDidChange((i) => {
+            this.interpreterPathService.onDidChange((i): void => {
                 this._onConfigChanged(i.uri);
             }),
         );

typings/index.d.ts

@@ -1,8 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-
 // Added to allow compilation of backbone types pulled in from ipywidgets (@jupyterlab/widgets).
-declare module JQuery {
-    type TriggeredEvent = any;
+declare namespace JQuery {
+    type TriggeredEvent = unknown;
 }