Implement #5 & #6

Author: Hexer10

Program.cs

@@ -203,6 +203,8 @@ public static void ClearUpdateFiles()
 			}
 		}
 
+		public static string Indentation => OptionsObject.Editor_ReplaceTabsToWhitespace ? new string(' ', OptionsObject.Editor_IndentationSize) : "\t";
+
 		private static void App_Startup(object sender, StartupEventArgs e)
 		{
 			MahApps.Metro.ThemeManager.DetectAppStyle(Application.Current);

UI/Components/EditorElement.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Text;
 using System.Threading;
@@ -552,7 +552,7 @@ private void TextArea_TextEntered(object sender, TextCompositionEventArgs e)
                         break;
 
                     editor.TextArea.Caret.Line -= 1;
-                    editor.TextArea.Caret.Column += 1;
+                    editor.TextArea.Caret.Column += Program.Indentation.Length;
                     isBlock = false;
                     break;
                 case "}":

UI/Components/EditorIndetation.cs

@@ -34,24 +34,17 @@ public void IndentLine(TextDocument document, DocumentLine line)
                     }
                     if (lastLineLastNonWhitespaceChar == '{' && currentLineFirstNonWhitespaceChar != '}')
                     {
-                        if (Program.OptionsObject.Editor_ReplaceTabsToWhitespace)
-                        {
-                            indentation += new string(' ', Program.OptionsObject.Editor_IndentationSize);
-                        }
-                        else
-                        {
-                            indentation += "\t";
-                        }
+                        indentation += Program.Indentation;
                     }
                     else if (currentLineFirstNonWhitespaceChar == '}')
                     {
                         if (indentation.Length > 0)
                         {
-                            indentation = indentation.Substring(0, indentation.Length) + "\t\n" + indentation.Substring(0, indentation.Length);
+                            indentation = indentation.Substring(0, indentation.Length) + Program.Indentation + "\n" + indentation.Substring(0, indentation.Length);
                         }
                         else
                         {
-                            indentation = "\t\n";
+                            indentation = Program.Indentation + "\n";
                         }
                     }
                     /*if (lastLineTextTrimmed == "{" && currentLineTextTrimmed != "}")

Utils/SPSyntaxTidy/SPSyntaxTidy.cs

@@ -42,7 +42,7 @@ public static string TidyUp(string source)
                     SingleIndentationSegmentScope = 0;
                     for (int j = 0; j < subIndentLevel; ++j)
                     {
-                        outString.Append('\t');
+                        outString.Append(Program.Indentation);
                     }
                     continue;
                 }