Some fixes to the options API

mhutch · Sep 18, 2024 · c73558a · c73558a
1 parent 95aafd2
commit c73558a
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 25 deletions.
diff --git a/Core/Options/IOptionsReader.cs b/Core/Options/IOptionsReader.cs
@@ -5,5 +5,5 @@ namespace MonoDevelop.Xml.Options;
 
 public interface IOptionsReader
 {
-	bool TryGetOption<T> (Option<T> option, out T value);
+	bool TryGetOption<T> (Option<T> option, out T? value);
 }
diff --git a/Core/Options/OptionReaderExtensions.cs b/Core/Options/OptionReaderExtensions.cs
@@ -7,8 +7,8 @@ public static class OptionReaderExtensions
 {
 	public static T GetOption<T>(this IOptionsReader options, Option<T> option)
 	{
-		if (options.TryGetOption<T> (option, out T value)) {
-			return value;
+		if (options.TryGetOption<T> (option, out T? value)) {
+			return value!;
 		}
 		return option.DefaultValue;
 	}

diff --git a/Core/Options/TextFormattingOptionValues.cs b/Core/Options/TextFormattingOptionValues.cs
@@ -13,9 +13,9 @@ namespace MonoDevelop.Xml.Options;
 /// </summary>
 public sealed record class TextFormattingOptionValues ()
 {
-	public readonly TextFormattingOptionValues Default = new ();
+	public static readonly TextFormattingOptionValues Default = new ();
 
-	public bool UseTabs { get; init; } = false;
+	public bool ConvertTabsToSpaces { get; init; } = false;
 	public int TabSize { get; init; } = 4;
 	public int IndentSize { get; init; } = 4;
 	public string NewLine { get; init; } = Environment.NewLine;
@@ -24,7 +24,7 @@ public sealed record class TextFormattingOptionValues ()
 	public TextFormattingOptionValues (IOptionsReader options)
 	   : this ()
 	{
-		UseTabs = options.GetOption (TextFormattingOptions.UseTabs);
+		ConvertTabsToSpaces = options.GetOption (TextFormattingOptions.ConvertTabsToSpaces);
 		TabSize = options.GetOption (TextFormattingOptions.TabSize);
 		IndentSize = options.GetOption (TextFormattingOptions.IndentSize);
 		NewLine = options.GetOption (TextFormattingOptions.NewLine);

diff --git a/Core/Options/TextFormattingOptions.cs b/Core/Options/TextFormattingOptions.cs
@@ -12,32 +12,37 @@ namespace MonoDevelop.Xml.Options;
 /// </summary>
 public class TextFormattingOptions
 {
-	public static readonly Option<bool> UseTabs = new ("indent_style", false,
-		new EditorConfigSerializer<bool> (str => str == "tab", value => value ? "tab" : "space")
+	public static readonly Option<bool> ConvertTabsToSpaces = new (
+		"indent_style",
+		TextFormattingOptionValues.Default.ConvertTabsToSpaces,
+		new EditorConfigSerializer<bool> (str => str != "tab", value => value ? "space" : "tab")
 	);
 
-	public static readonly Option<int> TabSize = new ("tab_size", 4, true);
-
-	public static readonly Option<int> IndentSize = new ("indent_size", 4, true);
-
-	public static readonly Option<string> NewLine = new ("end_of_line", Environment.NewLine, new EditorConfigSerializer<string> (
-		str => str switch {
-			"lf" => "\n",
-			"cr" => "\r",
-			"crlf" => "\r\n",
-			_ => Environment.NewLine
-		},
-		value => value switch {
-			"\n" => "lf",
-			"\r" => "cr",
-			"\r\n" => "crlf",
-			_ => "unset"
+	public static readonly Option<int> TabSize = new ("tab_size", TextFormattingOptionValues.Default.TabSize, true);
+
+	public static readonly Option<int> IndentSize = new ("indent_size", TextFormattingOptionValues.Default.IndentSize, true);
+
+	public static readonly Option<string> NewLine = new (
+		"end_of_line",
+		TextFormattingOptionValues.Default.NewLine,
+		new EditorConfigSerializer<string> (
+			str => str switch {
+				"lf" => "\n",
+				"cr" => "\r",
+				"crlf" => "\r\n",
+				_ => Environment.NewLine
+			},
+			value => value switch {
+				"\n" => "lf",
+				"\r" => "cr",
+				"\r\n" => "crlf",
+				_ => "unset"
 		}));
 
 
 	public static readonly Option<bool> InsertFinalNewline = new ("insert_final_newline", true, true);
 
-	public static readonly Option<bool> TrimTrailingWhitespace = new ("trim_trailing_whitespace", true, true);
+	public static readonly Option<bool> TrimTrailingWhitespace = new ("trim_trailing_whitespace", TextFormattingOptionValues.Default.TrimTrailingWhitespace, true);
 
 	public static readonly Option<int?> MaxLineLength = new ("max_line_length", null, new EditorConfigSerializer<int?> (
 		str => str != "off" && int.TryParse (str, out var val) && val > 0 ? val : null,