Release v1.19.0 (#63)

Author: kboom

GitTreeFilter/Commands/CommandRegistrar.cs

@@ -22,9 +22,11 @@ public static async Task InitializeAsync(IGitFiltersPackage package)
         try
         {
             await RegisterAsync(package, commandService);
+            GitTreeFilterOutput.WriteLine($"Initialized all commands");
         }
         catch (Exception ex)
         {
+            GitTreeFilterOutput.WriteLine($"Failed to register commands: {ex}");
             ActivityLog.LogError(nameof(CommandRegistrar), $"Failed to register commands - {ex}");
             throw ex;
         }
@@ -50,19 +52,38 @@ private static async Task RegisterAsync(IGitFiltersPackage package, IMenuCommand
 
     private static void RegisterCommand(IMenuCommandService commandService, int rawCommandId, GitFiltersCommand command)
     {
-        var commandId = new CommandID(GitFiltersControls.GitFiltersControlsCmdSet, rawCommandId);
-        var menuCommand = new OleMenuCommand(command.OnExecute, commandId);
+        GitTreeFilterOutput.WriteLine($"Registering command {command.GetType()} with id {rawCommandId}");
 
-        menuCommand.BeforeQueryStatus += delegate (object sender, EventArgs e)
+        var commandId = new CommandID(GitFiltersControls.GitFiltersControlsCmdSet, rawCommandId);
+        if (commandService.FindCommand(commandId) == null)
         {
-            menuCommand.Visible = command.IsVisible;
-        };
+            var menuCommand = new OleMenuCommand(command.OnExecute, commandId);
 
-        command.VisibilityChanged += delegate
-        {
-            menuCommand.Visible = command.IsVisible;
-        };
+            menuCommand.BeforeQueryStatus += delegate (object sender, EventArgs e)
+            {
+                ThreadHelper.JoinableTaskFactory.Run(() =>
+                {
+                    menuCommand.Visible = command.IsVisible;
+                    return Task.CompletedTask;
+                });
+            };
+
+            command.VisibilityChanged += delegate
+            {
+                ThreadHelper.JoinableTaskFactory.Run(() =>
+                {
+                    menuCommand.Visible = command.IsVisible;
+                    return Task.CompletedTask;
+                });
+            };
 
-        commandService.AddCommand(menuCommand);
+            commandService.AddCommand(menuCommand);
+
+            GitTreeFilterOutput.WriteLine($"Command {command.GetType()} with id {rawCommandId} registered");
+        }
+        else
+        {
+            GitTreeFilterOutput.WriteLine($"Command {command.GetType()} with id {rawCommandId} already registered");
+        }
     }
 }

GitTreeFilter/GitTreeFilter.csproj

@@ -62,6 +62,7 @@
     <Compile Include="Commands\Diffrence\OpenDiffCommandManager.cs" />
     <Compile Include="Commands\Diffrence\OpenPhysicalFileDiffCommand.cs" />
     <Compile Include="Commands\Diffrence\OpenProjectFileDiffCommand.cs" />
+    <Compile Include="GitTreeFilterOutput.cs" />
     <Compile Include="GitTreeFilterProvider.GitFileFilter.cs" />
     <Compile Include="Models\ComparisonConfig.cs" />
     <Compile Include="GitTreeFilterErrorPresenter.cs" />

GitTreeFilter/GitTreeFilterOutput.cs

@@ -0,0 +1,33 @@
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
+using System;
+
+public static class GitTreeFilterOutput
+{
+    private static IVsOutputWindowPane _outputPane;
+
+    public static void Initialize(IServiceProvider serviceProvider)
+    {
+        ThreadHelper.ThrowIfNotOnUIThread();
+        if (_outputPane == null)
+        {
+            var outputWindow = serviceProvider.GetService(typeof(SVsOutputWindow)) as IVsOutputWindow;
+            if (outputWindow != null)
+            {
+                Guid customPaneGuid = Guid.NewGuid();
+                outputWindow.CreatePane(ref customPaneGuid, nameof(GitTreeFilter), 1, 1);
+                outputWindow.GetPane(ref customPaneGuid, out _outputPane);
+            }
+        }
+    }
+
+    public static void WriteLine(string message)
+    {
+        ThreadHelper.ThrowIfNotOnUIThread();
+
+        if (_outputPane != null)
+        {
+            _outputPane.OutputStringThreadSafe(message + Environment.NewLine);
+        }
+    }
+}

GitTreeFilter/GitTreeFilterService.cs

@@ -77,7 +77,7 @@ public ISessionSettings SessionSettings
 
     public bool IsFilterApplied
     {
-        get => _isFilterApplied;
+        get => _isFilterApplied; // true
         set
         {
             _isFilterApplied = value;
@@ -119,6 +119,7 @@ public async Task InitializeAsync(CancellationToken cancellationToken)
     {
         await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
+        GitTreeFilterOutput.Initialize(ServiceProvider.GlobalProvider);
         _gitExt = ServiceProvider.GlobalProvider.GetService(typeof(IGitExt)) as IGitExt;
         _dte = await _package.GetServiceAsync<DTE>();
 
@@ -151,6 +152,7 @@ private async Task SetUpAsync()
 
         if (!TryGetRootRepositoryPath(out string repositoryRootPath))
         {
+            GitTreeFilterOutput.WriteLine("Could not identify GIT repository to use, deactivating the plugin for now");
             PluginState = PluginLifecycleState.INACTIVE;
             Debug.WriteLine(string.Format(CultureInfo.CurrentCulture, "Could not identify GIT repository to use, deactivating the plugin for now"));
             return;
@@ -174,11 +176,10 @@ private async Task SetUpAsync()
         LoadSessionSettings();
         ItemTagManager.CreateTagTables();
 
-        if (PluginState == PluginLifecycleState.LOADING)
-        {
-            await CommandRegistrar.InitializeAsync(_package);
-        }
+        GitTreeFilterOutput.WriteLine($"Initializing commands");
+        await CommandRegistrar.InitializeAsync(_package);
 
+        GitTreeFilterOutput.WriteLine($"Initialization done");
         PluginState = PluginLifecycleState.RUNNING;
     }
 

GitTreeFilter/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="GitTreeFilter.eae60f56-2c84-4ba9-9cbc-d021d9c67958" Version="1.2.3.4" Language="en-US" Publisher="Grzegorz Gurgul" />
+        <Identity Id="GitTreeFilter.eae60f56-2c84-4ba9-9cbc-d021d9c67958" Version="999.999.999" Language="en-US" Publisher="Grzegorz Gurgul" />
         <DisplayName>GitTreeFilter</DisplayName>
         <Description xml:space="preserve">Filter solution explorer by showing only the files that were changed in comparison to a working tree from specific branch, commit or tag.</Description>
         <MoreInfo>https://github.com/kboom/git-tree-filter-4vs/</MoreInfo>

README.md

@@ -1,6 +1,6 @@
 # GitTreeFilter for Visual Studio
 
-![example workflow](https://github.com/kboom/GitTreeFilter-4-VisualStudio/actions/workflows/build.yml/badge.svg)
+[![CI](https://github.com/kboom/GitTreeFilter-4-VisualStudio/actions/workflows/ci-nightly.yml/badge.svg)](https://github.com/kboom/GitTreeFilter-4-VisualStudio/actions/workflows/ci-nightly.yml)
 
 This extension for Visual Studio 2022 allows you to filter solution explorer to include only the files changed when comparing to the worktree sometime in the past.
 Navigate through all these files as usual, and compare the changes using a context menu item.