From b65f75437d8d45e9a68e150c5c24e33fa750e1af Mon Sep 17 00:00:00 2001
From: Andy McFadden <fadden@fadden.com>
Date: Sat, 31 Aug 2019 14:54:44 -0700
Subject: [PATCH] Make local variable prefix configurable for display

It's kind of handy to have variable labels tagged.  This makes it
configurable.  The quick-set for Merlin sets it to "]", all others
leave it blank.
---
 SourceGen/AppSettings.cs                 |  4 +++-
 SourceGen/AsmGen/GenCommon.cs            |  2 ++
 SourceGen/MainController.cs              |  4 +++-
 SourceGen/WpfGui/EditAppSettings.xaml    | 10 +++++++++-
 SourceGen/WpfGui/EditAppSettings.xaml.cs | 18 ++++++++++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/SourceGen/AppSettings.cs b/SourceGen/AppSettings.cs
index 00174f5..f9309d7 100644
--- a/SourceGen/AppSettings.cs
+++ b/SourceGen/AppSettings.cs
@@ -65,6 +65,7 @@ namespace SourceGen {
         public const string FMT_PSEUDO_OP_NAMES = "fmt-pseudo-op-names";
         public const string FMT_CHAR_DELIM = "fmt-char-delim";
         public const string FMT_STRING_DELIM = "fmt-string-delim";
+        public const string FMT_LOCAL_VARIABLE_PREFIX = "fmt-local-variable-prefix";
 
         public const string CLIP_LINE_FORMAT = "clip-line-format";
 
@@ -297,7 +298,8 @@ namespace SourceGen {
         /// Sets a string setting.
         /// </summary>
         /// <param name="name">Setting name.</param>
-        /// <param name="value">Setting value.</param>
+        /// <param name="value">Setting value.  If the value is null, the setting will be
+        ///   removed.</param>
         public void SetString(string name, string value) {
             if (value == null) {
                 mSettings.Remove(name);
diff --git a/SourceGen/AsmGen/GenCommon.cs b/SourceGen/AsmGen/GenCommon.cs
index 1fc9801..f8bb8b0 100644
--- a/SourceGen/AsmGen/GenCommon.cs
+++ b/SourceGen/AsmGen/GenCommon.cs
@@ -420,6 +420,8 @@ namespace SourceGen.AsmGen {
 
             // Not doing the delimiter patterns here, because what's in the config file is
             // intended for on-screen display, and hence likely to be unsuited for an assembler.
+
+            // Ditto for the local variable prefix.
         }
     }
 }
diff --git a/SourceGen/MainController.cs b/SourceGen/MainController.cs
index 4683e2f..a71f5e4 100644
--- a/SourceGen/MainController.cs
+++ b/SourceGen/MainController.cs
@@ -435,11 +435,13 @@ namespace SourceGen {
             mFormatterConfig = new Formatter.FormatConfig();
             AsmGen.GenCommon.ConfigureFormatterFromSettings(AppSettings.Global,
                 ref mFormatterConfig);
-            //mFormatterConfig.mLocalVariableLablePrefix = "\u00a4";  // CURRENCY SIGN
             mFormatterConfig.mEndOfLineCommentDelimiter = ";";
             mFormatterConfig.mFullLineCommentDelimiterBase = ";";
             mFormatterConfig.mBoxLineCommentDelimiter = string.Empty;
 
+            mFormatterConfig.mLocalVariableLablePrefix =
+                settings.GetString(AppSettings.FMT_LOCAL_VARIABLE_PREFIX, string.Empty);
+
             string chrDelCereal = settings.GetString(AppSettings.FMT_CHAR_DELIM, null);
             if (chrDelCereal != null) {
                 mFormatterConfig.mCharDelimiters =
diff --git a/SourceGen/WpfGui/EditAppSettings.xaml b/SourceGen/WpfGui/EditAppSettings.xaml
index f313d27..543a499 100644
--- a/SourceGen/WpfGui/EditAppSettings.xaml
+++ b/SourceGen/WpfGui/EditAppSettings.xaml
@@ -556,13 +556,21 @@ limitations under the License.
                     </GroupBox>
 
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="4,16,0,0">
-                        <TextBlock Text="Expression style:"/>
+                        <TextBlock Text="Expression style:" Margin="0,3,0,0"/>
                         <ComboBox Name="expressionStyleComboBox" Width="120" Margin="8,0,0,0"
                                   ItemsSource="{Binding ExpressionStyleItems}" DisplayMemberPath="Name"
                                   IsReadOnly="True"
                                   SelectionChanged="ExpressionStyleComboBox_SelectionChanged"/>
                     </StackPanel>
 
+                    <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="4,16,0,0">
+                        <TextBlock Text="Local variable prefix:"/>
+                        <TextBox Width="66" MaxLength="8" Margin="8,1,0,0"
+                                 Text="{Binding LocalVarPrefix, UpdateSourceTrigger=PropertyChanged,
+                                    FallbackValue=.placeho}"
+                                 FontFamily="{StaticResource GeneralMonoFont}"/>
+                    </StackPanel>
+
                     <GroupBox DockPanel.Dock="Bottom" Header="Quick Set"
                               Width="400" HorizontalAlignment="Right" Padding="2,4">
                         <DockPanel LastChildFill="False" Margin="4">
diff --git a/SourceGen/WpfGui/EditAppSettings.xaml.cs b/SourceGen/WpfGui/EditAppSettings.xaml.cs
index 090bf72..9ea72a5 100644
--- a/SourceGen/WpfGui/EditAppSettings.xaml.cs
+++ b/SourceGen/WpfGui/EditAppSettings.xaml.cs
@@ -832,6 +832,19 @@ namespace SourceGen.WpfGui {
             get { return sExpStyleItems; }
         }
 
+        public string LocalVarPrefix {
+            get { return mLocalVarPrefix; }
+            set {
+                if (mLocalVarPrefix != value) {
+                    mLocalVarPrefix = value;
+                    OnPropertyChanged();
+                    mSettings.SetString(AppSettings.FMT_LOCAL_VARIABLE_PREFIX, value);
+                    IsDirty = true;
+                }
+            }
+        }
+        private string mLocalVarPrefix;
+
         private void Loaded_DisplayFormat() {
             PopulateWidthDisamSettings();
 
@@ -844,6 +857,9 @@ namespace SourceGen.WpfGui {
 
             // No need to set this to anything specific.
             displayFmtQuickComboBox.SelectedIndex = 0;
+
+            LocalVarPrefix = mSettings.GetString(AppSettings.FMT_LOCAL_VARIABLE_PREFIX,
+                string.Empty);
         }
 
         /// <summary>
@@ -932,12 +948,14 @@ namespace SourceGen.WpfGui {
                 formatConfig.mForceAbsOperandPrefix,
                 formatConfig.mForceLongOperandPrefix);
             SelectExpressionStyle(formatConfig.mExpressionMode);
+            LocalVarPrefix = formatConfig.mLocalVariableLablePrefix;
             // dirty flag set by change watchers if one or more fields have changed
         }
 
         private void QuickFmtDefaultButton_Click(object sender, RoutedEventArgs e) {
             SetWidthDisamSettings(null, "l", "a:", "f:");
             SelectExpressionStyle(ExpressionMode.Common);
+            LocalVarPrefix = string.Empty;
             // dirty flag set by change watchers if one or more fields have changed
         }