remove eventemitter from codelens classes

4 files changed, 10 insertions, 49 deletions

diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index c46d6362..fe72eaf6 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -21,10 +21,7 @@ export let extensionContext: vscode.ExtensionContext | undefined = undefined;
 
 export let ideProtocolClient: IdeProtocolClient;
 
-export async function activateExtension(
-  context: vscode.ExtensionContext,
-  showTutorial: boolean
-) {
+export async function activateExtension(context: vscode.ExtensionContext) {
   extensionContext = context;
 
   // Before anything else, check whether this is an out-of-date version of the extension
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index c277a539..7bd08929 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -380,11 +380,10 @@ export async function startContinuePythonServer() {
     console.log("Killing old server...");
     try {
       await fkill(":65432");
-    } catch (e) {
-      console.log(
-        "Failed to kill old server, likely because it didn't exist:",
-        e
-      );
+    } catch (e: any) {
+      if (!e.message.includes("Process doesn't exist")) {
+        console.log("Failed to kill old server:", e);
+      }
     }
 
     // Do this after above check so we don't have to waste time setting up the env
diff --git a/extension/src/extension.ts b/extension/src/extension.ts
index de8f55e3..1f9f7914 100644
--- a/extension/src/extension.ts
+++ b/extension/src/extension.ts
@@ -8,12 +8,9 @@ import {
   startContinuePythonServer,
 } from "./activation/environmentSetup";
 
-async function dynamicImportAndActivate(
-  context: vscode.ExtensionContext,
-  showTutorial: boolean
-) {
+async function dynamicImportAndActivate(context: vscode.ExtensionContext) {
   const { activateExtension } = await import("./activation/activate");
-  await activateExtension(context, showTutorial);
+  await activateExtension(context);
 }
 
 export function activate(context: vscode.ExtensionContext) {
@@ -25,7 +22,7 @@ export function activate(context: vscode.ExtensionContext) {
       cancellable: false,
     },
     async () => {
-      dynamicImportAndActivate(context, true);
+      dynamicImportAndActivate(context);
     }
   );
 }
diff --git a/extension/src/lang-server/codeLens.ts b/extension/src/lang-server/codeLens.ts
index 79126eaa..778b98dc 100644
--- a/extension/src/lang-server/codeLens.ts
+++ b/extension/src/lang-server/codeLens.ts
@@ -6,7 +6,7 @@ import { DIFF_DIRECTORY } from "../diffs";
 class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
   public provideCodeLenses(
     document: vscode.TextDocument,
-    token: vscode.CancellationToken
+    _: vscode.CancellationToken
   ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
     const suggestions = editorToSuggestions.get(document.uri.toString());
     if (!suggestions) {
@@ -44,28 +44,12 @@ class SuggestionsCodeLensProvider implements vscode.CodeLensProvider {
 
     return codeLenses;
   }
-
-  onDidChangeCodeLenses?: vscode.Event<void> | undefined;
-
-  constructor(emitter?: vscode.EventEmitter<void>) {
-    if (emitter) {
-      this.onDidChangeCodeLenses = emitter.event;
-      this.onDidChangeCodeLenses(() => {
-        if (vscode.window.activeTextEditor) {
-          this.provideCodeLenses(
-            vscode.window.activeTextEditor.document,
-            new vscode.CancellationTokenSource().token
-          );
-        }
-      });
-    }
-  }
 }
 
 class DiffViewerCodeLensProvider implements vscode.CodeLensProvider {
   public provideCodeLenses(
     document: vscode.TextDocument,
-    token: vscode.CancellationToken
+    _: vscode.CancellationToken
   ): vscode.CodeLens[] | Thenable<vscode.CodeLens[]> {
     if (path.dirname(document.uri.fsPath) === DIFF_DIRECTORY) {
       const codeLenses: vscode.CodeLens[] = [];
@@ -87,22 +71,6 @@ class DiffViewerCodeLensProvider implements vscode.CodeLensProvider {
       return [];
     }
   }
-
-  onDidChangeCodeLenses?: vscode.Event<void> | undefined;
-
-  constructor(emitter?: vscode.EventEmitter<void>) {
-    if (emitter) {
-      this.onDidChangeCodeLenses = emitter.event;
-      this.onDidChangeCodeLenses(() => {
-        if (vscode.window.activeTextEditor) {
-          this.provideCodeLenses(
-            vscode.window.activeTextEditor.document,
-            new vscode.CancellationTokenSource().token
-          );
-        }
-      });
-    }
-  }
 }
 
 let diffsCodeLensDisposable: vscode.Disposable | undefined = undefined;