Use syntax highlighting for argument and header value

ShareX.HelpersLib/Extensions/Extensions.cs

@@ -307,7 +307,7 @@ public static long ToUnix(this DateTime dateTime)
             return Helpers.DateTimeToUnix(dateTime);
         }
 
-        public static void AppendTextToSelection(this TextBox tb, string text)
+        public static void AppendTextToSelection(this TextBoxBase tb, string text)
         {
             if (!string.IsNullOrEmpty(text))
             {

ShareX.HelpersLib/NameParser/CodeMenu.cs

@@ -33,12 +33,12 @@ namespace ShareX.HelpersLib
 {
     public static class CodeMenu
     {
-        public static ContextMenuStrip Create<TEntry>(TextBox tb, params TEntry[] ignoreList) where TEntry : CodeMenuEntry
+        public static ContextMenuStrip Create<TEntry>(TextBoxBase tb, params TEntry[] ignoreList) where TEntry : CodeMenuEntry
         {
             return Create(tb, ignoreList, (CodeMenuItem[])null);
         }
 
-        public static ContextMenuStrip Create<TEntry>(TextBox tb, TEntry[] ignoreList, CodeMenuItem[] extraItems) where TEntry : CodeMenuEntry
+        public static ContextMenuStrip Create<TEntry>(TextBoxBase tb, TEntry[] ignoreList, CodeMenuItem[] extraItems) where TEntry : CodeMenuEntry
         {
             ContextMenuStrip cms = new ContextMenuStrip
             {

ShareX.UploadersLib/Forms/UploadersConfigForm.Designer.cs

@@ -120,18 +120,20 @@ private void InitializeComponent()
             this.lblCustomUploaderURL = new System.Windows.Forms.Label();
             this.tcCustomUploaderArguments = new System.Windows.Forms.TabControl();
             this.tpCustomUploaderArguments = new System.Windows.Forms.TabPage();
+            this.pCustomUploaderArgValue = new System.Windows.Forms.Panel();
+            this.rtbCustomUploaderArgValue = new System.Windows.Forms.RichTextBox();
             this.btnCustomUploaderArgUpdate = new System.Windows.Forms.Button();
             this.txtCustomUploaderArgName = new System.Windows.Forms.TextBox();
-            this.txtCustomUploaderArgValue = new System.Windows.Forms.TextBox();
             this.btnCustomUploaderArgAdd = new System.Windows.Forms.Button();
             this.btnCustomUploaderArgRemove = new System.Windows.Forms.Button();
             this.lvCustomUploaderArguments = new ShareX.HelpersLib.MyListView();
             this.chCustomUploaderArgumentsName = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.chCustomUploaderArgumentsValue = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.tpCustomUploaderHeaders = new System.Windows.Forms.TabPage();
+            this.pCustomUploaderHeaderValue = new System.Windows.Forms.Panel();
+            this.rtbCustomUploaderHeaderValue = new System.Windows.Forms.RichTextBox();
             this.btnCustomUploaderHeaderUpdate = new System.Windows.Forms.Button();
             this.txtCustomUploaderHeaderName = new System.Windows.Forms.TextBox();
-            this.txtCustomUploaderHeaderValue = new System.Windows.Forms.TextBox();
             this.btnCustomUploaderHeaderAdd = new System.Windows.Forms.Button();
             this.btnCustomUploaderHeaderRemove = new System.Windows.Forms.Button();
             this.lvCustomUploaderHeaders = new ShareX.HelpersLib.MyListView();
@@ -725,7 +727,9 @@ private void InitializeComponent()
             this.tpCustomUploaderRegexParse.SuspendLayout();
             this.tcCustomUploaderArguments.SuspendLayout();
             this.tpCustomUploaderArguments.SuspendLayout();
+            this.pCustomUploaderArgValue.SuspendLayout();
             this.tpCustomUploaderHeaders.SuspendLayout();
+            this.pCustomUploaderHeaderValue.SuspendLayout();
             this.gbCustomUploaders.SuspendLayout();
             this.tpURLShorteners.SuspendLayout();
             this.tcURLShorteners.SuspendLayout();
@@ -1330,9 +1334,9 @@ private void InitializeComponent()
             // 
             // tpCustomUploaderArguments
             // 
+            this.tpCustomUploaderArguments.Controls.Add(this.pCustomUploaderArgValue);
             this.tpCustomUploaderArguments.Controls.Add(this.btnCustomUploaderArgUpdate);
             this.tpCustomUploaderArguments.Controls.Add(this.txtCustomUploaderArgName);
-            this.tpCustomUploaderArguments.Controls.Add(this.txtCustomUploaderArgValue);
             this.tpCustomUploaderArguments.Controls.Add(this.btnCustomUploaderArgAdd);
             this.tpCustomUploaderArguments.Controls.Add(this.btnCustomUploaderArgRemove);
             this.tpCustomUploaderArguments.Controls.Add(this.lvCustomUploaderArguments);
@@ -1340,6 +1344,21 @@ private void InitializeComponent()
             this.tpCustomUploaderArguments.Name = "tpCustomUploaderArguments";
             this.tpCustomUploaderArguments.UseVisualStyleBackColor = true;
             // 
+            // pCustomUploaderArgValue
+            // 
+            this.pCustomUploaderArgValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pCustomUploaderArgValue.Controls.Add(this.rtbCustomUploaderArgValue);
+            resources.ApplyResources(this.pCustomUploaderArgValue, "pCustomUploaderArgValue");
+            this.pCustomUploaderArgValue.Name = "pCustomUploaderArgValue";
+            // 
+            // rtbCustomUploaderArgValue
+            // 
+            this.rtbCustomUploaderArgValue.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.rtbCustomUploaderArgValue.DetectUrls = false;
+            resources.ApplyResources(this.rtbCustomUploaderArgValue, "rtbCustomUploaderArgValue");
+            this.rtbCustomUploaderArgValue.Name = "rtbCustomUploaderArgValue";
+            this.rtbCustomUploaderArgValue.TextChanged += new System.EventHandler(this.rtbCustomUploaderArgValue_TextChanged);
+            // 
             // btnCustomUploaderArgUpdate
             // 
             resources.ApplyResources(this.btnCustomUploaderArgUpdate, "btnCustomUploaderArgUpdate");
@@ -1353,11 +1372,6 @@ private void InitializeComponent()
             this.txtCustomUploaderArgName.Name = "txtCustomUploaderArgName";
             this.txtCustomUploaderArgName.TextChanged += new System.EventHandler(this.txtCustomUploaderArgName_TextChanged);
             // 
-            // txtCustomUploaderArgValue
-            // 
-            resources.ApplyResources(this.txtCustomUploaderArgValue, "txtCustomUploaderArgValue");
-            this.txtCustomUploaderArgValue.Name = "txtCustomUploaderArgValue";
-            // 
             // btnCustomUploaderArgAdd
             // 
             resources.ApplyResources(this.btnCustomUploaderArgAdd, "btnCustomUploaderArgAdd");
@@ -1401,9 +1415,9 @@ private void InitializeComponent()
             // 
             // tpCustomUploaderHeaders
             // 
+            this.tpCustomUploaderHeaders.Controls.Add(this.pCustomUploaderHeaderValue);
             this.tpCustomUploaderHeaders.Controls.Add(this.btnCustomUploaderHeaderUpdate);
             this.tpCustomUploaderHeaders.Controls.Add(this.txtCustomUploaderHeaderName);
-            this.tpCustomUploaderHeaders.Controls.Add(this.txtCustomUploaderHeaderValue);
             this.tpCustomUploaderHeaders.Controls.Add(this.btnCustomUploaderHeaderAdd);
             this.tpCustomUploaderHeaders.Controls.Add(this.btnCustomUploaderHeaderRemove);
             this.tpCustomUploaderHeaders.Controls.Add(this.lvCustomUploaderHeaders);
@@ -1411,6 +1425,21 @@ private void InitializeComponent()
             this.tpCustomUploaderHeaders.Name = "tpCustomUploaderHeaders";
             this.tpCustomUploaderHeaders.UseVisualStyleBackColor = true;
             // 
+            // pCustomUploaderHeaderValue
+            // 
+            this.pCustomUploaderHeaderValue.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pCustomUploaderHeaderValue.Controls.Add(this.rtbCustomUploaderHeaderValue);
+            resources.ApplyResources(this.pCustomUploaderHeaderValue, "pCustomUploaderHeaderValue");
+            this.pCustomUploaderHeaderValue.Name = "pCustomUploaderHeaderValue";
+            // 
+            // rtbCustomUploaderHeaderValue
+            // 
+            this.rtbCustomUploaderHeaderValue.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.rtbCustomUploaderHeaderValue.DetectUrls = false;
+            resources.ApplyResources(this.rtbCustomUploaderHeaderValue, "rtbCustomUploaderHeaderValue");
+            this.rtbCustomUploaderHeaderValue.Name = "rtbCustomUploaderHeaderValue";
+            this.rtbCustomUploaderHeaderValue.TextChanged += new System.EventHandler(this.rtbCustomUploaderHeaderValue_TextChanged);
+            // 
             // btnCustomUploaderHeaderUpdate
             // 
             resources.ApplyResources(this.btnCustomUploaderHeaderUpdate, "btnCustomUploaderHeaderUpdate");
@@ -1424,11 +1453,6 @@ private void InitializeComponent()
             this.txtCustomUploaderHeaderName.Name = "txtCustomUploaderHeaderName";
             this.txtCustomUploaderHeaderName.TextChanged += new System.EventHandler(this.txtCustomUploaderHeaderName_TextChanged);
             // 
-            // txtCustomUploaderHeaderValue
-            // 
-            resources.ApplyResources(this.txtCustomUploaderHeaderValue, "txtCustomUploaderHeaderValue");
-            this.txtCustomUploaderHeaderValue.Name = "txtCustomUploaderHeaderValue";
-            // 
             // btnCustomUploaderHeaderAdd
             // 
             resources.ApplyResources(this.btnCustomUploaderHeaderAdd, "btnCustomUploaderHeaderAdd");
@@ -5669,8 +5693,10 @@ private void InitializeComponent()
             this.tcCustomUploaderArguments.ResumeLayout(false);
             this.tpCustomUploaderArguments.ResumeLayout(false);
             this.tpCustomUploaderArguments.PerformLayout();
+            this.pCustomUploaderArgValue.ResumeLayout(false);
             this.tpCustomUploaderHeaders.ResumeLayout(false);
             this.tpCustomUploaderHeaders.PerformLayout();
+            this.pCustomUploaderHeaderValue.ResumeLayout(false);
             this.gbCustomUploaders.ResumeLayout(false);
             this.tpURLShorteners.ResumeLayout(false);
             this.tcURLShorteners.ResumeLayout(false);
@@ -5864,7 +5890,6 @@ private void InitializeComponent()
         private System.Windows.Forms.TextBox txtCustomUploaderFileForm;
         private System.Windows.Forms.Label lblCustomUploaderURL;
         private System.Windows.Forms.Button btnCustomUploaderArgUpdate;
-        private System.Windows.Forms.TextBox txtCustomUploaderArgValue;
         private System.Windows.Forms.Button btnCustomUploaderArgRemove;
         private ShareX.HelpersLib.MyListView lvCustomUploaderArguments;
         private System.Windows.Forms.ColumnHeader chCustomUploaderArgumentsName;
@@ -6186,7 +6211,6 @@ private void InitializeComponent()
         private System.Windows.Forms.TabPage tpCustomUploaderHeaders;
         private System.Windows.Forms.Button btnCustomUploaderHeaderUpdate;
         private System.Windows.Forms.TextBox txtCustomUploaderHeaderName;
-        private System.Windows.Forms.TextBox txtCustomUploaderHeaderValue;
         private System.Windows.Forms.Button btnCustomUploaderHeaderAdd;
         private System.Windows.Forms.Button btnCustomUploaderHeaderRemove;
         private HelpersLib.MyListView lvCustomUploaderHeaders;
@@ -6475,5 +6499,9 @@ private void InitializeComponent()
         private System.Windows.Forms.Panel pCustomUploaderLog;
         private System.Windows.Forms.Panel pCustomUploaderRequestURL;
         private System.Windows.Forms.RichTextBox rtbCustomUploaderRequestURL;
+        private System.Windows.Forms.Panel pCustomUploaderArgValue;
+        private System.Windows.Forms.RichTextBox rtbCustomUploaderArgValue;
+        private System.Windows.Forms.Panel pCustomUploaderHeaderValue;
+        private System.Windows.Forms.RichTextBox rtbCustomUploaderHeaderValue;
     }
 }

ShareX.UploadersLib/Forms/UploadersConfigForm.cs

@@ -105,10 +105,10 @@ private void InitializeControls()
             CodeMenuItem codeMenuItemInput = new CodeMenuItem("$input$", "Text/URL input");
             CodeMenuItem codeMenuItemFilename = new CodeMenuItem("$filename$", "File name");
 
-            CodeMenu.Create<CodeMenuEntryFilename>(txtCustomUploaderArgValue,
+            CodeMenu.Create<CodeMenuEntryFilename>(rtbCustomUploaderArgValue,
                 new CodeMenuEntryFilename[] { CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn },
                 new CodeMenuItem[] { codeMenuItemInput, codeMenuItemFilename });
-            CodeMenu.Create<CodeMenuEntryFilename>(txtCustomUploaderHeaderValue,
+            CodeMenu.Create<CodeMenuEntryFilename>(rtbCustomUploaderHeaderValue,
                 new CodeMenuEntryFilename[] { CodeMenuEntryFilename.n, CodeMenuEntryFilename.t, CodeMenuEntryFilename.pn },
                 new CodeMenuItem[] { codeMenuItemInput, codeMenuItemFilename });
 
@@ -118,6 +118,9 @@ private void InitializeControls()
             eiFTP.ObjectType = typeof(FTPAccount);
 
             // Custom uploader
+            rtbCustomUploaderRequestURL.AddContextMenu();
+            rtbCustomUploaderArgValue.AddContextMenu();
+            rtbCustomUploaderHeaderValue.AddContextMenu();
             rtbCustomUploaderURL.AddContextMenu();
             rtbCustomUploaderThumbnailURL.AddContextMenu();
             rtbCustomUploaderDeletionURL.AddContextMenu();
@@ -3514,6 +3517,11 @@ private void txtCustomUploaderArgName_TextChanged(object sender, EventArgs e)
             CustomUploaderUpdateArgumentsState();
         }
 
+        private void rtbCustomUploaderArgValue_TextChanged(object sender, EventArgs e)
+        {
+            CustomUploaderSyntaxHighlight(rtbCustomUploaderArgValue);
+        }
+
         private void btnCustomUploaderArgAdd_Click(object sender, EventArgs e)
         {
             string name = txtCustomUploaderArgName.Text;
@@ -3532,13 +3540,13 @@ private void btnCustomUploaderArgAdd_Click(object sender, EventArgs e)
                     }
                     else
                     {
-                        string value = txtCustomUploaderArgValue.Text;
+                        string value = rtbCustomUploaderArgValue.Text;
                         lvCustomUploaderArguments.Items.Add(name).SubItems.Add(value);
                         uploader.Arguments.Add(name, value);
 
                         lvCustomUploaderArguments.SelectedItems.Clear();
                         txtCustomUploaderArgName.Text = "";
-                        txtCustomUploaderArgValue.Text = "";
+                        rtbCustomUploaderArgValue.Text = "";
                         txtCustomUploaderArgName.Focus();
                     }
                 }
@@ -3564,7 +3572,7 @@ private void btnCustomUploaderArgUpdate_Click(object sender, EventArgs e)
 
                 if (!string.IsNullOrEmpty(name))
                 {
-                    string value = txtCustomUploaderArgValue.Text;
+                    string value = rtbCustomUploaderArgValue.Text;
 
                     CustomUploaderItem uploader = CustomUploaderGetSelected();
                     if (uploader != null)
@@ -3591,7 +3599,7 @@ private void lvCustomUploaderArguments_SelectedIndexChanged(object sender, Event
             }
 
             txtCustomUploaderArgName.Text = name;
-            txtCustomUploaderArgValue.Text = value;
+            rtbCustomUploaderArgValue.Text = value;
 
             CustomUploaderUpdateArgumentsState();
         }
@@ -3601,6 +3609,11 @@ private void txtCustomUploaderHeaderName_TextChanged(object sender, EventArgs e)
             CustomUploaderUpdateHeadersState();
         }
 
+        private void rtbCustomUploaderHeaderValue_TextChanged(object sender, EventArgs e)
+        {
+            CustomUploaderSyntaxHighlight(rtbCustomUploaderHeaderValue);
+        }
+
         private void btnCustomUploaderHeaderAdd_Click(object sender, EventArgs e)
         {
             string name = txtCustomUploaderHeaderName.Text;
@@ -3619,13 +3632,13 @@ private void btnCustomUploaderHeaderAdd_Click(object sender, EventArgs e)
                     }
                     else
                     {
-                        string value = txtCustomUploaderHeaderValue.Text;
+                        string value = rtbCustomUploaderHeaderValue.Text;
                         lvCustomUploaderHeaders.Items.Add(name).SubItems.Add(value);
                         uploader.Headers.Add(name, value);
 
                         lvCustomUploaderHeaders.SelectedItems.Clear();
                         txtCustomUploaderHeaderName.Text = "";
-                        txtCustomUploaderHeaderValue.Text = "";
+                        rtbCustomUploaderHeaderValue.Text = "";
                         txtCustomUploaderHeaderName.Focus();
                     }
                 }
@@ -3651,7 +3664,7 @@ private void btnCustomUploaderHeaderUpdate_Click(object sender, EventArgs e)
 
                 if (!string.IsNullOrEmpty(name))
                 {
-                    string value = txtCustomUploaderHeaderValue.Text;
+                    string value = rtbCustomUploaderHeaderValue.Text;
 
                     CustomUploaderItem uploader = CustomUploaderGetSelected();
                     if (uploader != null)
@@ -3678,7 +3691,7 @@ private void lvCustomUploaderHeaders_SelectedIndexChanged(object sender, EventAr
             }
 
             txtCustomUploaderHeaderName.Text = name;
-            txtCustomUploaderHeaderValue.Text = value;
+            rtbCustomUploaderHeaderValue.Text = value;
 
             CustomUploaderUpdateHeadersState();
         }

ShareX.UploadersLib/Forms/UploadersConfigFormHelper.cs

@@ -962,7 +962,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
             txtCustomUploaderFileForm.Enabled = uploader.RequestType == CustomUploaderRequestMethod.POST;
 
             txtCustomUploaderArgName.Text = "";
-            txtCustomUploaderArgValue.Text = "";
+            rtbCustomUploaderArgValue.Text = "";
             lvCustomUploaderArguments.Items.Clear();
             if (uploader.Arguments != null)
             {
@@ -973,7 +973,7 @@ private void CustomUploaderLoad(CustomUploaderItem uploader)
             }
 
             txtCustomUploaderHeaderName.Text = "";
-            txtCustomUploaderHeaderValue.Text = "";
+            rtbCustomUploaderHeaderValue.Text = "";
             lvCustomUploaderHeaders.Items.Clear();
             if (uploader.Headers != null)
             {