Phase 2: Wired up Extensibility commands to CodeConversion logic

Author: GrahamTheCoder

Vsix/CodeConverterPackage.cs

@@ -86,6 +86,9 @@ public sealed class CodeConverterPackage : AsyncPackage
     public const string ConvertableSolutionMenuVisibilityGuid = "8e7192d0-28b7-4fe7-8d84-82c1db98d459";
 
     internal Cancellation PackageCancellation { get; } = new();
+    
+    internal static CodeConversion CodeConversionInstance { get; private set; }
+    internal static CodeConverterPackage Instance { get; private set; }
 
     /// <summary>
     /// Initializes a new instance of package class.
@@ -110,6 +113,8 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
         await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
         var visualStudioWorkspace = componentModel.GetService<VisualStudioWorkspace>();
         var codeConversion = await CodeConversion.CreateAsync(this, visualStudioWorkspace, this.GetDialogPageAsync<ConverterOptionsPage>);
+        CodeConversionInstance = codeConversion;
+        Instance = this;
         ConvertCSToVBCommand.Initialize(this, oleMenuCommandService, codeConversion);
         ConvertVBToCSCommand.Initialize(this, oleMenuCommandService, codeConversion);
         PasteAsVB.Initialize(this, oleMenuCommandService, codeConversion);

Vsix/ConvertCSToVBExtensibilityCommand.cs

@@ -19,7 +19,27 @@ public ConvertCSToVBExtensibilityCommand(CodeConverterPackage package)
 
     public override async Task ExecuteCommandAsync(IClientContext context, CancellationToken cancellationToken)
     {
-        // This will be wired up to the existing logic in Phase 2
-        await Task.CompletedTask;
+        var codeConversion = CodeConverterPackage.CodeConversionInstance;
+        var serviceProvider = CodeConverterPackage.Instance;
+        if (codeConversion == null || serviceProvider == null) return;
+
+        var itemsPath = await VisualStudioInteraction.GetSelectedItemsPathAsync(CodeConversion.IsCSFileName);
+        if (itemsPath.Count > 0)
+        {
+            await codeConversion.ConvertDocumentsAsync<ICSharpCode.CodeConverter.VB.CSToVBConversion>(itemsPath, cancellationToken);
+            return;
+        }
+
+        var projects = await VisualStudioInteraction.GetSelectedProjectsAsync(".csproj");
+        if (projects.Count > 0)
+        {
+            await codeConversion.ConvertProjectsAsync<ICSharpCode.CodeConverter.VB.CSToVBConversion>(projects, cancellationToken);
+            return;
+        }
+
+        (string filePath, var selection) = await VisualStudioInteraction.GetCurrentFilenameAndSelectionAsync(serviceProvider, CodeConversion.IsCSFileName, false);
+        if (filePath != null && selection != null) {
+            await codeConversion.ConvertDocumentAsync<ICSharpCode.CodeConverter.VB.CSToVBConversion>(filePath, selection.Value, cancellationToken);
+        }
     }
 }

Vsix/ConvertVBToCSExtensibilityCommand.cs

@@ -19,7 +19,27 @@ public ConvertVBToCSExtensibilityCommand(CodeConverterPackage package)
 
     public override async Task ExecuteCommandAsync(IClientContext context, CancellationToken cancellationToken)
     {
-        // This will be wired up to the existing logic in Phase 2
-        await Task.CompletedTask;
+        var codeConversion = CodeConverterPackage.CodeConversionInstance;
+        var serviceProvider = CodeConverterPackage.Instance;
+        if (codeConversion == null || serviceProvider == null) return;
+
+        var itemsPath = await VisualStudioInteraction.GetSelectedItemsPathAsync(CodeConversion.IsVBFileName);
+        if (itemsPath.Count > 0)
+        {
+            await codeConversion.ConvertDocumentsAsync<ICSharpCode.CodeConverter.CSharp.VBToCSConversion>(itemsPath, cancellationToken);
+            return;
+        }
+
+        var projects = await VisualStudioInteraction.GetSelectedProjectsAsync(".vbproj");
+        if (projects.Count > 0)
+        {
+            await codeConversion.ConvertProjectsAsync<ICSharpCode.CodeConverter.CSharp.VBToCSConversion>(projects, cancellationToken);
+            return;
+        }
+
+        (string filePath, var selection) = await VisualStudioInteraction.GetCurrentFilenameAndSelectionAsync(serviceProvider, CodeConversion.IsVBFileName, false);
+        if (filePath != null && selection != null) {
+            await codeConversion.ConvertDocumentAsync<ICSharpCode.CodeConverter.CSharp.VBToCSConversion>(filePath, selection.Value, cancellationToken);
+        }
     }
 }