bug fix

Author: jacob-ronstadt

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/CodeQLCommand.cs

@@ -9,11 +9,13 @@
 using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Threading;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection.Metadata;
 using System.Runtime.InteropServices;
 using System.Security.Policy;
 using System.Threading.Tasks;
@@ -196,8 +198,13 @@ private async System.Threading.Tasks.Task MenuItemCallbackAsync(object sender, E
                         try
                         {
                             var sarifResults = await CodeQLService.Instance.RunCodeQLQueryAsync(CodeQLService.Instance.SelectedQuery.Trim());
-                            var sarifViewer = new SarifViewerInterop(Package.GetGlobalService(typeof(SVsShell)) as IVsShell);
-                            if (false && sarifViewer.IsSariferExtensionInstalled)
+                            var VsShell = Package.GetGlobalService(typeof(SVsShell)) as IVsShell;
+
+                            SarifViewerInterop sarifViewer = new SarifViewerInterop(Package.GetGlobalService(typeof(SVsShell)) as IVsShell);
+                            Guid extensionGuid = SarifViewerInterop.ViewerExtensionGuid;
+
+                            int status = VsShell.IsPackageInstalled(ref extensionGuid, out int installed);
+                            if (installed == 1)
                             {
                                 if (!sarifViewer.IsViewerExtensionLoaded)
                                 {
@@ -211,6 +218,7 @@ private async System.Threading.Tasks.Task MenuItemCallbackAsync(object sender, E
                                 //if (CodeQLGeneralOptions.Instance.AutomaticallyOpenResults) { }
                                 Microsoft.VisualStudio.Shell.VsShellUtilities.OpenDocument(this.ServiceProvider, sarifResults);
                             }
+                            
                         }
                         catch (Exception ex)
                         {

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/OutputWindowTracerListener.cs

@@ -27,11 +27,12 @@ public override void Write(string message)
         {
             if (this.EnsurePane())
             {
-                    ThreadHelper.JoinableTaskFactory.RunAsync(async () =>
-                    {
-                        await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
-                        this.pane.OutputStringThreadSafe(message);
-                    }).FileAndForget("OutputWindowEvent");
+                ThreadHelper.JoinableTaskFactory.RunAsync(async () =>
+                {
+                    await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+                    this.pane.Activate();
+                    this.pane.OutputStringThreadSafe(message);
+                }).FileAndForget("OutputWindowEvent");
             }
         }
 

tools/extensions/CodeQL.VisualStudio/CodeQL.VisualStudio/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="CodeQL.VisualStudio.Extension.34DD7857-F5F1-4960-B60F-4E9285157836" Version="1.0.0.0" Language="en-US" Publisher="Jacob Ronstadt" />
+        <Identity Id="CodeQL.VisualStudio.Extension.34DD7857-F5F1-4960-B60F-4E9285157836" Version="0.0.0.1" Language="en-US" Publisher="Microsoft" />
         <DisplayName>CodeQL Visual Studio Extension</DisplayName>
         <Description xml:space="preserve">CodeQL Visual Studio Extension</Description>
         <License>License.txt</License>