cleaning up a merge issue

aaronpowell · Jul 3, 2019 · 6a113c7 · 6a113c7
1 parent 883fc69
commit 6a113c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -20,8 +20,8 @@ async function activateProfile(
   await settingsHelper.updateUserSettings(profileSettings);
 
   let extensions = config.getProfileExtensions(profile);
-  await extensionsHelper.installExtensions(extensions);
-  await extensionsHelper.removeExtensions(extensions);
+  await extensionsHelper.installExtensions(extensions, logger);
+  await extensionsHelper.removeExtensions(extensions, logger);
 
   msg.dispose();
 
@@ -178,7 +178,7 @@ export async function activate(context: vscode.ExtensionContext) {
     )
   );
 
-  liveShare.initialize(context, config, (profile: string) => {
+  liveShare.initialize(config, (profile: string) => {
     activateProfile(profile, config, settingsHelper, extensionsHelper);
   });
 }
diff --git a/src/services/liveShare.ts b/src/services/liveShare.ts
@@ -1,13 +1,11 @@
-import * as vscode from "vscode";
 import * as vsls from "vsls";
 import Config from "./config";
 
 export async function initialize(
-    context: vscode.ExtensionContext,
     config: Config,
     activateProfileHandler: (profile: string) => void
 ) {
-    // Check to see if the end-user has the Live Share 
+    // Check to see if the end-user has the Live Share
     // extension installed, and if not, exit early.
     const liveShare = await vsls.getApi();
     if (!liveShare) {