提交 dcee3090 编写于 作者: T Thomas Rzipa

fix issue #30529

上级 ca0e683c
......@@ -80,9 +80,16 @@ internal static bool DetermineIfNewLineOptionIsSet(string value, NewLineOption o
}
private static NewLineOption? ConvertToNewLineOption(string value)
=> s_newLineOptionsEditorConfigMap.TryGetValue(value, out var option)
? option
: (NewLineOption?)null;
{
if (s_newLineOptionsEditorConfigMap.TryGetValue(value, out var option)) {
return option;
}
if (s_legacyNewLineOptionsEditorConfigMap.TryGetValue(value, out var legacyOption))
{
return legacyOption;
}
return null;
}
private static string GetNewLineOptionEditorConfigString(OptionSet optionSet)
{
......
......@@ -40,6 +40,11 @@ public static partial class CSharpFormattingOptions
KeyValuePairUtil.Create("no_change", LabelPositionOptions.NoIndent),
KeyValuePairUtil.Create("one_less_than_current", LabelPositionOptions.OneLess),
});
private static readonly BidirectionalMap<string, NewLineOption> s_legacyNewLineOptionsEditorConfigMap =
new BidirectionalMap<string, NewLineOption>(new[]
{
KeyValuePairUtil.Create("object_collection_array_initalizers", NewLineOption.ObjectCollectionsArrayInitializers),
});
private static readonly BidirectionalMap<string, NewLineOption> s_newLineOptionsEditorConfigMap =
new BidirectionalMap<string, NewLineOption>(new[]
{
......@@ -52,7 +57,7 @@ public static partial class CSharpFormattingOptions
KeyValuePairUtil.Create("anonymous_methods", NewLineOption.AnonymousMethods),
KeyValuePairUtil.Create("control_blocks", NewLineOption.ControlBlocks),
KeyValuePairUtil.Create("anonymous_types", NewLineOption.AnonymousTypes),
KeyValuePairUtil.Create("object_collection_array_initalizers", NewLineOption.ObjectCollectionsArrayInitializers),
KeyValuePairUtil.Create("object_collection_array_initializers", NewLineOption.ObjectCollectionsArrayInitializers),
KeyValuePairUtil.Create("lambdas", NewLineOption.Lambdas),
KeyValuePairUtil.Create("local_functions", NewLineOption.LocalFunction),
});
......
......@@ -92,6 +92,7 @@ static void TestParseEditorConfigLabelPositioningFalse(string value)
InlineData("control_blocks", NewLineOption.ControlBlocks),
InlineData("anonymous_types", NewLineOption.AnonymousTypes),
InlineData("object_collection_array_initalizers", NewLineOption.ObjectCollectionsArrayInitializers),
InlineData("object_collection_array_initializers", NewLineOption.ObjectCollectionsArrayInitializers),
InlineData("lambdas", NewLineOption.Lambdas),
InlineData("local_functions", NewLineOption.LocalFunction)]
static void TestParseNewLineOptionTrue(string value, NewLineOption option)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册