Fixing conflict between inline outparameter and discard settings / v4.4 visualizers installer + assemblies

Author: SteveWilkes

AgileObjects.ReadableExpressions.Visualizers.4.3.0.msi

@@ -4,5 +4,5 @@
 [assembly: AssemblyCompany("AgileObjects")]
 [assembly: AssemblyProduct("ReadableExpressions.Visualizers")]
 
-[assembly: AssemblyVersion("4.3.0")]
-[assembly: AssemblyFileVersion("4.3.0")]
+[assembly: AssemblyVersion("4.4.0")]
+[assembly: AssemblyFileVersion("4.4.0")]

CommonVisualizerAssemblyInfo.cs

@@ -9,7 +9,7 @@ as well as reflection objects like `Type`, `FieldInfo`, `PropertyInfo`, etc.
 ## Debugger Visualizer
 
 The Debugger Visualizer installer can be downloaded from 
-[the Visual Studio Gallery](https://marketplace.visualstudio.com/items?itemName=vs-publisher-1232914.ReadableExpressionsVisualizers).
+[Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=vs-publisher-1232914.ReadableExpressionsVisualizers).
 
 The visualizer has both Light and Dark themes:
 

README.md

@@ -797,6 +797,7 @@ public void ShouldIncludeAnInlineOutParameterDiscard()
                 intParameter);
 
             var translated = tryGetLambda.ToReadableString(stgs => stgs
+                .DeclareOutputParametersInline
                 .DiscardUnusedParameters);
 
             translated.ShouldBe("(ip, i) => ip.TryGet(i, out _)");

ReadableExpressions.UnitTests/WhenTranslatingMemberAccesses.cs

@@ -39,6 +39,8 @@ public static VisualizerDialogSettings GetInstance()
 
         public bool DeclareOutputParametersInline { get; set; }
 
+        public bool DiscardUnusedParameters { get; set; }
+
         public bool ShowImplicitArrayTypes { get; set; }
 
         public bool ShowLambdaParameterTypeNames { get; set; }

ReadableExpressions.Visualizers.Core/Configuration/VisualizerDialogSettings.cs

@@ -99,6 +99,11 @@ private static void SetValues(
                 settings.DeclareOutputParametersInline = IsTrue(value);
             }
 
+            if (settingsByName.TryGetValue(nameof(settings.DiscardUnusedParameters), out value))
+            {
+                settings.DiscardUnusedParameters = IsTrue(value);
+            }
+
             if (settingsByName.TryGetValue(nameof(settings.ShowImplicitArrayTypes), out value))
             {
                 settings.ShowImplicitArrayTypes = IsTrue(value);
@@ -269,6 +274,7 @@ private static string Serialize(VisualizerDialogSettings settings)
 {nameof(settings.UseExplicitTypeNames)}: {settings.UseExplicitTypeNames}
 {nameof(settings.UseExplicitGenericParameters)}: {settings.UseExplicitGenericParameters}
 {nameof(settings.DeclareOutputParametersInline)}: {settings.DeclareOutputParametersInline}
+{nameof(settings.DiscardUnusedParameters)}: {settings.DiscardUnusedParameters}
 {nameof(settings.ShowImplicitArrayTypes)}: {settings.ShowImplicitArrayTypes}
 {nameof(settings.ShowLambdaParameterTypeNames)}: {settings.ShowLambdaParameterTypeNames}
 {nameof(settings.ShowQuotedLambdaComments)}: {settings.ShowQuotedLambdaComments}".TrimStart();

ReadableExpressions.Visualizers.Core/Configuration/VisualizerDialogSettingsManager.cs

@@ -0,0 +1,15 @@
+namespace AgileObjects.ReadableExpressions.Visualizers.Dialog.Controls
+{
+    internal class DiscardUnusedParametersOption : VisualizerDialogOptionBase
+    {
+        public DiscardUnusedParametersOption(VisualizerDialog dialog)
+            : base(
+                "Discard unused parameters",
+                "Translate unused lambda or output parameter variables to discards (_).",
+                dialog.Settings.DiscardUnusedParameters,
+                (dlg, isChecked) => dlg.Settings.DiscardUnusedParameters = isChecked,
+                dialog)
+        {
+        }
+    }
+}

ReadableExpressions.Visualizers.Dialog/Controls/DiscardUnusedParametersOption.cs

@@ -41,6 +41,7 @@ public void Populate()
                 new ToolStripControlHost(new ExplicitTypeNamesOption(_dialog)),
                 new ToolStripControlHost(new ExplicitGenericParamsOption(_dialog)),
                 new ToolStripControlHost(new DeclareOutParamsInlineOption(_dialog)),
+                new ToolStripControlHost(new DiscardUnusedParametersOption(_dialog)),
                 new ToolStripControlHost(new ImplicitArrayTypeNamesOption(_dialog)),
                 new ToolStripControlHost(new LambdaParameterTypeNamesOption(_dialog)),
                 new ToolStripControlHost(new QuotedLambdaCommentsOption(_dialog))

ReadableExpressions.Visualizers.Dialog/Controls/VisualizerOptionsMenuItem.cs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Version="4.3.0.0" Name="AgileObjects.ReadableExpressions.Visualizers"
+  <Product Id="*" Version="4.4.0.0" Name="AgileObjects.ReadableExpressions.Visualizers"
            Language="1033"  Manufacturer="AgileObjects" UpgradeCode="BB7C528F-ECFD-45F2-B50C-9F0A71EC8BE9">
 
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />

ReadableExpressions.Visualizers.Installer/Product.wxs

@@ -28,6 +28,11 @@ public static ITranslationSettings Update(
                 settings = settings.DeclareOutputParametersInline;
             }
 
+            if (dialogSettings.DiscardUnusedParameters)
+            {
+                settings = settings.DiscardUnusedParameters;
+            }
+
             if (dialogSettings.ShowImplicitArrayTypes)
             {
                 settings = settings.ShowImplicitArrayTypes;