PR feedback

Author: Paul van Brenk

Nodejs/Product/Nodejs/NodejsPackage.cs

@@ -6,14 +6,12 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Microsoft.NodejsTools.Commands;
 using Microsoft.NodejsTools.Debugger.DebugEngine;
 using Microsoft.NodejsTools.Debugger.Remote;
 using Microsoft.NodejsTools.Jade;
-using Microsoft.NodejsTools.Logging;
 using Microsoft.NodejsTools.Options;
 using Microsoft.NodejsTools.Project;
 using Microsoft.NodejsTools.ProjectWizard;
@@ -72,7 +70,7 @@ internal sealed partial class NodejsPackage : CommonPackage
 
         // Hold references for the subscribed events. Otherwise the callbacks will be garbage collected
         // after the initialization
-        private List<EnvDTE.CommandEvents> _subscribedCommandEvents = new List<EnvDTE.CommandEvents>();
+        private readonly List<EnvDTE.CommandEvents> subscribedCommandEvents = new List<EnvDTE.CommandEvents>();
 
         /// <summary>
         /// Default constructor of the package.
@@ -125,19 +123,18 @@ protected override void Initialize()
                 new SendFeedbackCommand(),
                 new ShowDocumentationCommand()
             };
+
             try
             {
                 commands.Add(new AzureExplorerAttachDebuggerCommand());
             }
             catch (NotSupportedException)
             {
             }
-            RegisterCommands(commands, Guids.NodejsCmdSet);
 
+            RegisterCommands(commands, Guids.NodejsCmdSet);
             MakeDebuggerContextAvailable();
 
-            InitializeTelemetry();
-
             // The variable is inherited by child processes backing Test Explorer, and is used in
             // the NTVS test discoverer and test executor to connect back to VS.
             Environment.SetEnvironmentVariable(NodejsConstants.NodeToolsProcessIdEnvironmentVariable, Process.GetCurrentProcess().Id.ToString());
@@ -172,14 +169,7 @@ private void SubscribeToVsCommandEvents(
             {
                 targetEvent.AfterExecute += afterExecute;
             }
-            this._subscribedCommandEvents.Add(targetEvent);
-        }
-
-        private void InitializeTelemetry()
-        {
-            // Fetch the session synchronously on the UI thread; if this doesn't happen before we try using this on 
-            // the background thread then the VS process will deadlock.
-            TelemetryHelper.Initialize();
+            this.subscribedCommandEvents.Add(targetEvent);
         }
 
         public new IComponentModel ComponentModel => this.GetComponentModel();
@@ -349,15 +339,5 @@ public string BrowseForDirectory(IntPtr owner, string initialDirectory = null)
                 }
             }
         }
-
-        internal static void NavigateTo(string filename, int line, int col)
-        {
-            VsUtilities.NavigateTo(Instance, filename, Guid.Empty, line, col);
-        }
-
-        internal static void NavigateTo(string filename, int pos)
-        {
-            VsUtilities.NavigateTo(Instance, filename, Guid.Empty, pos);
-        }
     }
 }

Nodejs/Product/Nodejs/Project/NodejsProjectLauncher.cs

@@ -52,15 +52,10 @@ public NodejsProjectLauncher(NodejsProjectNode project)
         #region IProjectLauncher Members
         public int LaunchProject(bool debug)
         {
-            return Start(ResolveStartupFile(), debug);
+            return LaunchFile(ResolveStartupFile(), debug);
         }
 
         public int LaunchFile(string file, bool debug)
-        {
-            return Start(file, debug);
-        }
-
-        private int Start(string file, bool debug)
         {
             var nodePath = GetNodePath();
 

Nodejs/Product/Nodejs/Telemetry/TelemetryHelper.cs

@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Telemetry;
 using static Microsoft.NodejsTools.Telemetry.TelemetryEvents;
 using static Microsoft.NodejsTools.Telemetry.TelemetryProperties;
@@ -12,12 +11,6 @@ namespace Microsoft.NodejsTools.Telemetry
     /// </summary>
     internal static class TelemetryHelper
     {
-        public static void Initialize()
-        {
-            ThreadHelper.ThrowIfNotOnUIThread();
-            var defaultSession = TelemetryService.DefaultSession;
-        }
-
         public static void LogProjectImported()
         {
             TelemetryService.DefaultSession.PostUserTask(ProjectImported, TelemetryResult.Success);