Remove legacy config options

src/Common/CSharp/CodeStyle/BodyStyle.cs

@@ -43,31 +43,25 @@ public static BodyStyle Create(SyntaxNodeAnalysisContext context)
                 option = BodyStyleOption.Expression;
             }
         }
-        else if (configOptions.TryGetValueAsBool(LegacyConfigOptions.ConvertExpressionBodyToBlockBody, out bool useBlockBody))
-        {
-            option = (useBlockBody) ? BodyStyleOption.Block : BodyStyleOption.Expression;
-        }
 
         bool? useBlockBodyWhenDeclarationIsMultiLine = null;
 
-        if (ConfigOptions.GetValueAsBool(configOptions, ConfigOptions.UseBlockBodyWhenDeclarationSpansOverMultipleLines) == true
-            || configOptions.IsEnabled(LegacyConfigOptions.ConvertExpressionBodyToBlockBodyWhenDeclarationIsMultiLine))
+        if (ConfigOptions.GetValueAsBool(configOptions, ConfigOptions.UseBlockBodyWhenDeclarationSpansOverMultipleLines) == true)
         {
             useBlockBodyWhenDeclarationIsMultiLine = true;
         }
 
         bool? useBlockBodyWhenExpressionIsMultiline = null;
 
-        if (ConfigOptions.GetValueAsBool(configOptions, ConfigOptions.UseBlockBodyWhenExpressionSpansOverMultipleLines) == true
-            || configOptions.IsEnabled(LegacyConfigOptions.ConvertExpressionBodyToBlockBodyWhenExpressionIsMultiLine))
+        if (ConfigOptions.GetValueAsBool(configOptions, ConfigOptions.UseBlockBodyWhenExpressionSpansOverMultipleLines) == true)
         {
             useBlockBodyWhenExpressionIsMultiline = true;
         }
 
         return new BodyStyle(option, useBlockBodyWhenDeclarationIsMultiLine, useBlockBodyWhenExpressionIsMultiline);
     }
 
-    internal enum BodyStyleOption
+    private enum BodyStyleOption
     {
         None,
         Block,

src/Common/CSharp/Extensions/CodeStyleExtensions.cs

@@ -102,9 +102,6 @@ public static NewLineStyle GetNewLineBeforeWhileInDoStatement(this SyntaxNodeAna
         if (ConfigOptions.TryGetValueAsBool(configOptions, ConfigOptions.NewLineBeforeWhileInDoStatement, out bool addNewLine))
             return (addNewLine) ? NewLineStyle.Add : NewLineStyle.Remove;
 
-        if (configOptions.TryGetValueAsBool(LegacyConfigOptions.RemoveNewLineBetweenClosingBraceAndWhileKeyword, out bool removeLine))
-            return (removeLine) ? NewLineStyle.Remove : NewLineStyle.Add;
-
         return NewLineStyle.None;
     }
 
@@ -113,9 +110,6 @@ public static NewLinePosition GetBinaryOperatorNewLinePosition(this AnalyzerConf
         if (TryGetNewLinePosition(configOptions, ConfigOptions.BinaryOperatorNewLine, out NewLinePosition newLinePosition))
             return newLinePosition;
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.AddNewLineAfterBinaryOperatorInsteadOfBeforeIt))
-            return NewLinePosition.After;
-
         return NewLinePosition.None;
     }
 
@@ -124,9 +118,6 @@ public static NewLinePosition GetConditionalOperatorNewLinePosition(this Analyze
         if (TryGetNewLinePosition(configOptions, ConfigOptions.ConditionalOperatorNewLine, out NewLinePosition newLinePosition))
             return newLinePosition;
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.AddNewLineAfterConditionalOperatorInsteadOfBeforeIt))
-            return NewLinePosition.After;
-
         return NewLinePosition.None;
     }
 
@@ -135,9 +126,6 @@ public static NewLinePosition GetArrowTokenNewLinePosition(this AnalyzerConfigOp
         if (TryGetNewLinePosition(configOptions, ConfigOptions.ArrowTokenNewLine, out NewLinePosition newLinePosition))
             return newLinePosition;
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.AddNewLineAfterExpressionBodyArrowInsteadOfBeforeIt))
-            return NewLinePosition.After;
-
         return NewLinePosition.None;
     }
 
@@ -146,9 +134,6 @@ public static NewLinePosition GetEqualsTokenNewLinePosition(this AnalyzerConfigO
         if (TryGetNewLinePosition(configOptions, ConfigOptions.EqualsTokenNewLine, out NewLinePosition newLinePosition))
             return newLinePosition;
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.AddNewLineAfterEqualsSignInsteadOfBeforeIt))
-            return NewLinePosition.After;
-
         return NewLinePosition.None;
     }
 
@@ -175,9 +160,6 @@ public static UsingDirectiveBlankLineStyle GetBlankLineBetweenUsingDirectives(th
             }
         }
 
-        if (ConfigOptions.TryGetValueAsBool(configOptions, LegacyConfigOptions.RemoveEmptyLineBetweenUsingDirectivesWithDifferentRootNamespace, out bool removeLine))
-            return (removeLine) ? UsingDirectiveBlankLineStyle.Never : UsingDirectiveBlankLineStyle.SeparateGroups;
-
         return UsingDirectiveBlankLineStyle.None;
     }
 
@@ -226,9 +208,6 @@ public static BlankLineStyle GetBlankLineBetweenSingleLineAccessors(this SyntaxN
         if (ConfigOptions.TryGetValueAsBool(configOptions, ConfigOptions.BlankLineBetweenSingleLineAccessors, out bool addLine))
             return (addLine) ? BlankLineStyle.Add : BlankLineStyle.Remove;
 
-        if (ConfigOptions.TryGetValueAsBool(configOptions, LegacyConfigOptions.RemoveEmptyLineBetweenSingleLineAccessors, out bool removeLine))
-            return (removeLine) ? BlankLineStyle.Remove : BlankLineStyle.Add;
-
         return BlankLineStyle.None;
     }
 
@@ -248,9 +227,6 @@ public static BlankLineStyle GetBlankLineBetweenSingleLineAccessors(this SyntaxN
             }
         }
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.ConvertMethodGroupToAnonymousFunction))
-            return true;
-
         return null;
     }
 
@@ -270,9 +246,6 @@ public static EnumFlagOperationStyle GetEnumHasFlagStyle(this SyntaxNodeAnalysis
             }
         }
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.ConvertBitwiseOperationToHasFlagCall))
-            return EnumFlagOperationStyle.HasFlagMethod;
-
         return EnumFlagOperationStyle.None;
     }
 
@@ -285,9 +258,6 @@ public static ConfigureAwaitStyle GetConfigureAwaitStyle(this SyntaxNodeAnalysis
             return (value) ? ConfigureAwaitStyle.Include : ConfigureAwaitStyle.Omit;
         }
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.RemoveCallToConfigureAwait))
-            return ConfigureAwaitStyle.Omit;
-
         return ConfigureAwaitStyle.None;
     }
 
@@ -304,9 +274,6 @@ public static EmptyStringStyle GetEmptyStringStyle(this SyntaxNodeAnalysisContex
                 return EmptyStringStyle.Literal;
         }
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.UseStringEmptyInsteadOfEmptyStringLiteral))
-            return EmptyStringStyle.Field;
-
         return EmptyStringStyle.None;
     }
 
@@ -323,9 +290,6 @@ public static NullCheckStyle GetNullCheckStyle(this SyntaxNodeAnalysisContext co
                 return NullCheckStyle.PatternMatching;
         }
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.UseComparisonInsteadPatternMatchingToCheckForNull))
-            return NullCheckStyle.EqualityOperator;
-
         return NullCheckStyle.None;
     }
 
@@ -349,9 +313,6 @@ public static ConditionalExpressionParenthesesStyle GetConditionalExpressionPare
             }
         }
 
-        if (configOptions.IsEnabled(LegacyConfigOptions.RemoveParenthesesFromConditionOfConditionalExpressionWhenExpressionIsSingleToken))
-            return ConditionalExpressionParenthesesStyle.OmitWhenConditionIsSingleToken;
-
         return ConditionalExpressionParenthesesStyle.None;
     }
 
@@ -371,9 +332,6 @@ public static ObjectCreationParenthesesStyle GetObjectCreationParenthesesStyle(t
             }
         }
 
-        if (context.IsEnabled(LegacyConfigOptions.RemoveParenthesesWhenCreatingNewObject))
-            return ObjectCreationParenthesesStyle.Omit;
-
         return ObjectCreationParenthesesStyle.None;
     }
 
@@ -393,9 +351,6 @@ public static AccessibilityModifierStyle GetAccessModifiersStyle(this SyntaxNode
             }
         }
 
-        if (ConfigOptions.TryGetValueAsBool(configOptions, LegacyConfigOptions.RemoveAccessibilityModifiers, out bool useImplicit))
-            return (useImplicit) ? AccessibilityModifierStyle.Implicit : AccessibilityModifierStyle.Explicit;
-
         return AccessibilityModifierStyle.None;
     }
 
@@ -498,12 +453,6 @@ public static TypeStyle GetArrayCreationTypeStyle(this SyntaxNodeAnalysisContext
             }
         }
 
-        if (context.IsEnabled(LegacyConfigOptions.UseImplicitlyTypedArrayWhenTypeIsObvious))
-            return TypeStyle.ImplicitWhenTypeIsObvious;
-
-        if (context.IsEnabled(LegacyConfigOptions.UseImplicitlyTypedArray))
-            return TypeStyle.Implicit;
-
         return TypeStyle.None;
     }
 
@@ -582,9 +531,6 @@ public static BodyStyle GetBodyStyle(this SyntaxNodeAnalysisContext context)
             return value;
         }
 
-        if (context.TryGetOptionAsBool(LegacyConfigOptions.RemoveEmptyLineBetweenClosingBraceAndSwitchSection, out value))
-            return !value;
-
         return null;
     }
 
@@ -608,9 +554,6 @@ public static BlankLineStyle GetBlankLineAfterFileScopedNamespaceDeclaration(thi
             return value;
 #pragma warning restore CS0618 // Type or member is obsolete
 
-        if (context.TryGetOptionAsBool(LegacyConfigOptions.SuppressUnityScriptMethods, out value))
-            return value;
-
         return null;
     }