Start converting package. Delete "paste as" commands for now since I …

…don't know where to add them yet
icsharpcode · Sep 15, 2024 · add80ff · add80ff
1 parent c4da0d8
commit add80ff
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 266 deletions.
diff --git a/Vsix/CodeConversion.cs b/Vsix/CodeConversion.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -20,7 +21,7 @@ namespace ICSharpCode.CodeConverter.VsExtension;
 
 internal class CodeConversion
 {
-    public Func<Task<ConverterOptionsPage>> GetOptions { get; }
+    [Experimental("VSEXTPREVIEW_SETTINGS")] public Func<Task<ConverterSettings>> GetOptions { get; }
     private readonly IAsyncServiceProvider _serviceProvider;
     private readonly JoinableTaskFactory _joinableTaskFactory;
     private readonly VisualStudioWorkspace _visualStudioWorkspace;

diff --git a/Vsix/CodeConverterPackage.cs b/Vsix/CodeConverterPackage.cs
@@ -4,11 +4,13 @@
 using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.VisualStudio.ComponentModelHost;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.VisualStudio.Extensibility;
 using Microsoft.VisualStudio.LanguageServices;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Threading;
 using Task = System.Threading.Tasks.Task;
+#pragma warning disable CEE0012 // TODO: I can't find any information on what this means
 
 namespace ICSharpCode.CodeConverter.VsExtension;
 
@@ -23,109 +25,58 @@ namespace ICSharpCode.CodeConverter.VsExtension;
 /// <remarks>
 /// Until the package is loaded, converting a multiple selection of projects won't work because there's no way to set a ProvideUIContextRule that covers that case
 /// </remarks>
-[ProvideBindingPath] // Resolve assemblies in our folder i.e. System.Threading.Tasks.Dataflow
-[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-[InstalledProductRegistration("#110", "#112", "1.0")] // Info on this package for Help/About
-[ProvideMenuResource("Menus.ctmenu", 1)]
-[ProvideOptionPage(typeof(ConverterOptionsPage),
-    "Code Converter", "General", 0, 0, true)]
-[Guid(PackageGuidString)]
-//See https://docs.microsoft.com/en-us/visualstudio/extensibility/how-to-use-rule-based-ui-context-for-visual-studio-extensions?view=vs-2019#term-types
-[ProvideUIContextRule(ConvertableSolutionMenuVisibilityGuid, name: nameof(ConvertableSolutionMenuVisibilityGuid),
-    expression: "HasVbproj | HasCsproj", termNames: new[] { "HasVbproj", "HasCsproj" },
-    termValues: new[] { "SolutionHasProjectCapability:VB", "SolutionHasProjectCapability:CSharp" })]
-[ProvideUIContextRule(CsEditorMenuVisibilityGuid, name: nameof(CsEditorMenuVisibilityGuid),
-    expression: "Cs", termNames: new[] { "Cs" },
-    termValues: new[] { "ActiveEditorContentType:CSharp" })]
-[ProvideUIContextRule(VbEditorMenuVisibilityGuid, name: nameof(VbEditorMenuVisibilityGuid),
-    expression: "Vb", termNames: new[] { "Vb" },
-    termValues: new[] { "ActiveEditorContentType:Basic" })]
-[ProvideUIContextRule(CsFileMenuVisibilityGuid, name: nameof(CsFileMenuVisibilityGuid),
-    expression: "Csproj", termNames: new[] { "Csproj" },
-    termValues: new[] { "ActiveProjectCapability:CSharp"})]
-[ProvideUIContextRule(VbFileMenuVisibilityGuid, name: nameof(VbFileMenuVisibilityGuid),
-    expression: "Vbproj", termNames: new[] { "Vbproj" },
-    termValues: new[] { "ActiveProjectCapability:VB"})]
-[ProvideUIContextRule(CsNodeMenuVisibilityGuid, name: nameof(CsNodeMenuVisibilityGuid),
-    expression: "Csproj", termNames: new[] { "Csproj" },
-    termValues: new[] { "ActiveProjectCapability:CSharp"})]
-[ProvideUIContextRule(VbNodeMenuVisibilityGuid, name: nameof(VbNodeMenuVisibilityGuid),
-    expression: "Vbproj", termNames: new[] { "Vbproj" },
-    termValues: new[] { "ActiveProjectCapability:VB"})]
-[ProvideUIContextRule(CsProjMenuVisibilityGuid, name: nameof(CsProjMenuVisibilityGuid),
-    expression: "Csproj", termNames: new[] { "Csproj" },
-    termValues: new[] { "ActiveProjectCapability:CSharp" })]
-[ProvideUIContextRule(VbProjMenuVisibilityGuid, name: nameof(VbProjMenuVisibilityGuid),
-    expression: "Vbproj", termNames: new[] { "Vbproj" },
-    termValues: new[] { "ActiveProjectCapability:VB" })]
-[ProvideUIContextRule(CsSolutionMenuVisibilityGuid, name: nameof(CsSolutionMenuVisibilityGuid),
-    expression: "HasCsproj", termNames: new[] { "HasCsproj" },
-    termValues: new[] { "SolutionHasProjectCapability:CSharp" })]
-[ProvideUIContextRule(VbSolutionMenuVisibilityGuid, name: nameof(VbSolutionMenuVisibilityGuid),
-    expression: "HasVbproj", termNames: new[] { "HasVbproj" },
-    termValues: new[] { "SolutionHasProjectCapability:VB" })]
 [SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1650:ElementDocumentationMustBeSpelledCorrectly", Justification = "pkgdef, VS and vsixmanifest are valid VS terms")]
-public sealed class CodeConverterPackage : AsyncPackage
+[VisualStudioContribution]
+public sealed class CodeConverterPackage : Extension
 {
-    /// <summary>
-    /// ConvertCSToVBCommandPackage GUID string.
-    /// </summary>
-    public const string PackageGuidString = "60378c8b-d75c-4fb2-aa2b-58609d67f886";
-
-    public const string CsEditorMenuVisibilityGuid = "64448be3-dcfe-467c-8659-408d672a9909";
-    public const string VbEditorMenuVisibilityGuid = "8eb86734-0b20-4986-9f20-9ed22824d0e2";
-    public const string CsFileMenuVisibilityGuid = "e32d529f-034b-4fe8-8e27-33a8ecf8f9ca";
-    public const string VbFileMenuVisibilityGuid = "207ed41c-1bf3-4e92-ad4f-f910b461acfc";
-    public const string CsNodeMenuVisibilityGuid = "1c92cd03-4bcc-4426-8c66-d34b081df30c";
-    public const string VbNodeMenuVisibilityGuid = "3151fbb3-0dd3-4804-8371-3340f65fd05d";
-    public const string CsProjMenuVisibilityGuid = "045a3ed1-4cb2-4c47-95be-0d99948e854f";
-    public const string VbProjMenuVisibilityGuid = "11700acc-38d7-4fc1-88dd-9e316aa5d6d5";
-    public const string CsSolutionMenuVisibilityGuid = "cbe34396-af03-49ab-8945-3611a641abf6";
-    public const string VbSolutionMenuVisibilityGuid = "3332e9e5-019c-4e93-b75a-2499f6f1cec6";
-    public const string ConvertableSolutionMenuVisibilityGuid = "8e7192d0-28b7-4fe7-8d84-82c1db98d459";
+    private readonly VisualStudioExtensibility _extensibility;
 
     internal Cancellation PackageCancellation { get; } = new();
 
     /// <summary>
     /// Initializes a new instance of package class.
     /// </summary>
-    public CodeConverterPackage()
+    public CodeConverterPackage(VisualStudioExtensibility extensibility)
     {
+        _extensibility = extensibility;
         // Inside this method you can place any initialization code that does not require
         // any Visual Studio service because at this point the package object is created but
         // not sited yet inside Visual Studio environment. The place to do all the other
         // initialization is the Initialize method.
     }
 
-    /// <summary>
-    /// Initialization of the package; this method is called right after the package is sited, so this is the place
-    /// where you can put all the initialization code that rely on services provided by VisualStudio.
-    /// </summary>
-    protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
+    protected override void Dispose(bool disposing)
     {
-        var oleMenuCommandService = await this.GetServiceAsync<IMenuCommandService, OleMenuCommandService>();
-        var componentModel = await this.GetServiceAsync<SComponentModel, IComponentModel>();
-
-        await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
-        var visualStudioWorkspace = componentModel.GetService<VisualStudioWorkspace>();
-        var codeConversion = await CodeConversion.CreateAsync(this, visualStudioWorkspace, this.GetDialogPageAsync<ConverterOptionsPage>);
-        ConvertCSToVBCommand.Initialize(this, oleMenuCommandService, codeConversion);
-        ConvertVBToCSCommand.Initialize(this, oleMenuCommandService, codeConversion);
-        PasteAsVB.Initialize(this, oleMenuCommandService, codeConversion);
-        PasteAsCS.Initialize(this, oleMenuCommandService, codeConversion);
-        VisualStudioInteraction.Initialize(PackageCancellation);
-        await TaskScheduler.Default;
-        await base.InitializeAsync(cancellationToken, progress);
+        PackageCancellation.Dispose();
+        base.Dispose(disposing);
     }
 
-    internal OleMenuCommandWithBlockingStatus CreateCommand(Func<CancellationToken, Task> callbackAsync, CommandID menuCommandId)
+    public override ExtensionConfiguration ExtensionConfiguration {
+        get {
+            var activationConstraints = new[] {ProjectCapability.CSharp, ProjectCapability.VB}
+                .Select(ActivationConstraint.ActiveProjectCapability);
+            return new ExtensionConfiguration() {
+                LoadedWhen = ActivationConstraint.Or(activationConstraints.ToArray()),
+                RequiresInProcessHosting = false,
+                Metadata = new ExtensionMetadata("ICSharpCode.CodeConverter", ExtensionAssemblyVersion, "ICSharpCode", "Code Converter", "Convert projects/files between VB.NET and C#")
+            };
+
+        }
+    }
+    [Experimental("VSEXTPREVIEW_SETTINGS")]
+    protected override void InitializeServices(IServiceCollection serviceCollection)
     {
-        return new OleMenuCommandWithBlockingStatus(JoinableTaskFactory, PackageCancellation, callbackAsync, menuCommandId);
+        base.InitializeServices(serviceCollection);
+        this.InitializeSettingsAsync(_extensibility).Forget();
     }
-
-    protected override void Dispose(bool disposing)
+    [Experimental("VSEXTPREVIEW_SETTINGS")]
+    private async Task InitializeSettingsAsync(VisualStudioExtensibility extensibility)
     {
-        PackageCancellation.Dispose();
-        base.Dispose(disposing);
+        await extensibility.Settings().SubscribeAsync(
+            [ConverterSettings.ConverterSettingsCategory],
+            CancellationToken.None,
+            values => {
+                // look up in dictionary the values
+            });
     }
 }
diff --git a/Vsix/ConverterOptionsPage.cs b/Vsix/ConverterOptionsPage.cs
@@ -14,7 +14,7 @@ namespace ICSharpCode.CodeConverter.VsExtension;
 internal static class ConverterSettings
 {
     [VisualStudioContribution]
-    internal static SettingCategory ConverterSettingsCategory { get; } = new("converterSettings", "Settings") {
+    public static SettingCategory ConverterSettingsCategory { get; } = new("converterSettings", "Settings") {
         Description = "Settings for the Converter extension.",
     };
 

diff --git a/Vsix/PasteAsCS.cs b/Vsix/PasteAsCS.cs
diff --git a/Vsix/PasteAsVB.cs b/Vsix/PasteAsVB.cs