Rename high level feature

3feec766 · Cyrus Najmabadi · 5a0c0067 · 3feec766 · 3feec766 · 3feec766
28 changed file
--- a/src/EditorFeatures/CSharpTest/SimplifyConditional/SimplifyConditionalTests.cs
+++ b/src/EditorFeatures/CSharpTest/SimplifyConditional/SimplifyConditionalTests.cs
@@ -4,13 +4,13 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.CSharp.SimplifyConditional;
+using Microsoft.CodeAnalysis.CSharp.SimplifyBooleanExpression;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Xunit;
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.SimplifyConditional
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.SimplifyBooleanExpression
 {
    public partial class SimplifyConditionalTests : AbstractCSharpDiagnosticProviderBasedUserDiagnosticTest
    {

--- a/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs
+++ b/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs
@@ -366,7 +366,7 @@ public void CSharp_VerifyIDEDiagnosticSeveritiesAreConfigurable()
 dotnet_diagnostic.IDE0073.severity = %value%
 # IDE0074
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 # IDE1005
 csharp_style_conditional_delegate_call = true:suggestion
@@ -506,7 +506,7 @@ public void VisualBasic_VerifyIDEDiagnosticSeveritiesAreConfigurable()
 dotnet_diagnostic.IDE0073.severity = %value%
 # IDE0074
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 # IDE1006
 dotnet_diagnostic.IDE1006.severity = %value%
@@ -869,7 +869,7 @@ public void CSharp_VerifyIDECodeStyleOptionsAreConfigurable()
 file_header_template = unset
 # IDE0074, PreferSimplifiedConditionalExpression
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 # IDE1005, PreferConditionalDelegateCall
 csharp_style_conditional_delegate_call = true:suggestion
@@ -1042,7 +1042,7 @@ public void VisualBasic_VerifyIDECodeStyleOptionsAreConfigurable()
 file_header_template = unset
 # IDE0074, PreferSimplifiedConditionalExpression
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 # IDE1006
 No editorconfig based code style option

--- a/src/EditorFeatures/VisualBasicTest/SimplifyConditional/SimplifyConditionalTests.vb
+++ b/src/EditorFeatures/VisualBasicTest/SimplifyConditional/SimplifyConditionalTests.vb
@@ -5,9 +5,9 @@
 Imports Microsoft.CodeAnalysis.CodeFixes
 Imports Microsoft.CodeAnalysis.Diagnostics
 Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.Diagnostics
-Imports Microsoft.CodeAnalysis.VisualBasic.SimplifyConditional
+Imports Microsoft.CodeAnalysis.VisualBasic.SimplifyBooleanExpression
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SimplifyConditional
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.SimplifyBooleanExpression
    Partial Public Class SimplifyConditionalTests
        Inherits AbstractVisualBasicDiagnosticProviderBasedUserDiagnosticTest

--- a/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalCodeFixProvider.cs
+++ b/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalCodeFixProvider.cs
@@ -4,9 +4,9 @@
 using System.Composition;
 using Microsoft.CodeAnalysis.CodeFixes;
-using Microsoft.CodeAnalysis.SimplifyConditional;
+using Microsoft.CodeAnalysis.SimplifyBooleanExpression;
-namespace Microsoft.CodeAnalysis.CSharp.SimplifyConditional
+namespace Microsoft.CodeAnalysis.CSharp.SimplifyBooleanExpression
 {
    [ExportCodeFixProvider(LanguageNames.CSharp), Shared]
    internal class CSharpSimplifyConditionalCodeFixProvider :

--- a/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalDiagnosticAnalyzer.cs
+++ b/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalDiagnosticAnalyzer.cs
@@ -8,9 +8,9 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Operations;
-using Microsoft.CodeAnalysis.SimplifyConditional;
+using Microsoft.CodeAnalysis.SimplifyBooleanExpression;
-namespace Microsoft.CodeAnalysis.CSharp.SimplifyConditional
+namespace Microsoft.CodeAnalysis.CSharp.SimplifyBooleanExpression
 {
    [DiagnosticAnalyzer(LanguageNames.CSharp)]
    internal class CSharpSimplifyConditionalDiagnosticAnalyzer :

--- a/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalCodeFixProvider.cs
+++ b/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalCodeFixProvider.cs
@@ -16,7 +16,7 @@
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
-namespace Microsoft.CodeAnalysis.SimplifyConditional
+namespace Microsoft.CodeAnalysis.SimplifyBooleanExpression
 {
    internal abstract class AbstractSimplifyConditionalCodeFixProvider :
        SyntaxEditorBasedCodeFixProvider

--- a/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalDiagnosticAnalyzer.cs
+++ b/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalDiagnosticAnalyzer.cs
@@ -12,7 +12,7 @@
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Operations;
-namespace Microsoft.CodeAnalysis.SimplifyConditional
+namespace Microsoft.CodeAnalysis.SimplifyBooleanExpression
 {
    using static AbstractSimplifyConditionalCodeFixProvider;
@@ -42,7 +42,7 @@ internal abstract class AbstractSimplifyConditionalDiagnosticAnalyzer<
        protected AbstractSimplifyConditionalDiagnosticAnalyzer()
            : base(IDEDiagnosticIds.SimplifyConditionalExpressionDiagnosticId,
-                   CodeStyleOptions.PreferSimplifiedConditionalExpression,
+                   CodeStyleOptions.PreferSimplifiedBooleanExpressions,
                   new LocalizableResourceString(nameof(FeaturesResources.Simplify_conditional_expression), FeaturesResources.ResourceManager, typeof(FeaturesResources)),
                   new LocalizableResourceString(nameof(FeaturesResources.Conditional_expression_can_be_simplified), FeaturesResources.ResourceManager, typeof(FeaturesResources)))
        {
@@ -70,7 +70,7 @@ private void AnalyzeConditionalExpression(SyntaxNodeAnalysisContext context)
            var cancellationToken = context.CancellationToken;
            var styleOption = options.GetOption(
-                CodeStyleOptions.PreferSimplifiedConditionalExpression,
+                CodeStyleOptions.PreferSimplifiedBooleanExpressions,
                semanticModel.Language, syntaxTree, cancellationToken);
            if (!styleOption.Value)
            {

--- a/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalCodeFixProvider.vb
+++ b/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalCodeFixProvider.vb
@@ -4,9 +4,9 @@
 Imports System.Composition
 Imports Microsoft.CodeAnalysis.CodeFixes
-Imports Microsoft.CodeAnalysis.SimplifyConditional
+Imports Microsoft.CodeAnalysis.SimplifyBooleanExpression
-Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyConditional
+Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyBooleanExpression
    <ExportCodeFixProvider(LanguageNames.VisualBasic), [Shared]>
    Friend Class VisualBasicSimplifyConditionalCodeFixProvider
        Inherits AbstractSimplifyConditionalCodeFixProvider

--- a/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb
+++ b/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb
@@ -8,9 +8,9 @@ Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 Imports Microsoft.CodeAnalysis.Diagnostics
 Imports Microsoft.CodeAnalysis.LanguageServices
 Imports Microsoft.CodeAnalysis.Operations
-Imports Microsoft.CodeAnalysis.SimplifyConditional
+Imports Microsoft.CodeAnalysis.SimplifyBooleanExpression
-Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyConditional
+Namespace Microsoft.CodeAnalysis.VisualBasic.SimplifyBooleanExpression
    <DiagnosticAnalyzer(LanguageNames.VisualBasic)>
    Friend Class VisualBasicSimplifyConditionalDiagnosticAnalyzer
        Inherits AbstractSimplifyConditionalDiagnosticAnalyzer(Of

--- a/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs
+++ b/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs
@@ -1684,7 +1684,7 @@ internal StyleViewModel(OptionStore optionStore, IServiceProvider serviceProvide
            // Expression preferences
            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferObjectInitializer, ServicesVSResources.Prefer_object_initializer, s_preferObjectInitializer, s_preferObjectInitializer, this, optionStore, expressionPreferencesGroupTitle));
            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferCollectionInitializer, ServicesVSResources.Prefer_collection_initializer, s_preferCollectionInitializer, s_preferCollectionInitializer, this, optionStore, expressionPreferencesGroupTitle));
-            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferSimplifiedConditionalExpression, ServicesVSResources.Prefer_simplified_conditional_expression, s_preferSimplifiedConditionalExpression, s_preferSimplifiedConditionalExpression, this, optionStore, expressionPreferencesGroupTitle));
+            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferSimplifiedBooleanExpressions, ServicesVSResources.Prefer_simplified_boolean_expressions, s_preferSimplifiedConditionalExpression, s_preferSimplifiedConditionalExpression, this, optionStore, expressionPreferencesGroupTitle));
            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CSharpCodeStyleOptions.PreferSwitchExpression, CSharpVSResources.Prefer_switch_expression, s_preferSwitchExpression, s_preferSwitchExpression, this, optionStore, expressionPreferencesGroupTitle));
            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CSharpCodeStyleOptions.PreferPatternMatchingOverIsWithCastCheck, CSharpVSResources.Prefer_pattern_matching_over_is_with_cast_check, s_preferPatternMatchingOverIsWithCastCheck, s_preferPatternMatchingOverIsWithCastCheck, this, optionStore, expressionPreferencesGroupTitle));
            CodeStyleItems.Add(new BooleanCodeStyleOptionViewModel(CSharpCodeStyleOptions.PreferPatternMatchingOverAsWithNullCheck, CSharpVSResources.Prefer_pattern_matching_over_as_with_null_check, s_preferPatternMatchingOverAsWithNullCheck, s_preferPatternMatchingOverAsWithNullCheck, this, optionStore, expressionPreferencesGroupTitle));

--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1372,7 +1372,7 @@ I agree to all of the foregoing:</value>
  <data name="Some_color_scheme_colors_are_being_overridden_by_changes_made_in_the_Environment_Fonts_and_Colors_options_page_Choose_Use_Defaults_in_the_Fonts_and_Colors_page_to_revert_all_customizations" xml:space="preserve">
    <value>Some color scheme colors are being overridden by changes made in the Environment &gt; Fonts and Colors options page. Choose `Use Defaults` in the Fonts and Colors page to revert all customizations.</value>
  </data>
-  <data name="Prefer_simplified_conditional_expression" xml:space="preserve">
+  <data name="Prefer_simplified_boolean_expressions" xml:space="preserve">
-    <value>Prefer simplified conditional expression</value>
+    <value>Prefer simplified boolean expressions</value>
  </data>
 </root>
\ No newline at end of file
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Preferovat jednoduchý příkaz using</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Einfache using-Anweisung bevorzugen</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Preferir la instrucción "using" sencilla</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Préférer une instruction 'using' simple</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Preferisci l'istruzione 'using' semplice</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -427,9 +427,9 @@
        <target state="translated">単純な 'using' ステートメントを優先する</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -427,9 +427,9 @@
        <target state="translated">간단한 'using' 문 선호</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Preferuj prostą instrukcję „using”</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Preferir a instrução 'using' simples</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Предпочитать простой оператор using</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -427,9 +427,9 @@
        <target state="translated">Basit 'using' deyimini tercih et</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -427,9 +427,9 @@
        <target state="translated">首选简单的 "using" 语句</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -427,9 +427,9 @@
        <target state="translated">優先使用簡單的 'using' 陳述式</target>
        <note />
      </trans-unit>
-      <trans-unit id="Prefer_simplified_conditional_expression">
+      <trans-unit id="Prefer_simplified_boolean_expressions">
-        <source>Prefer simplified conditional expression</source>
+        <source>Prefer simplified boolean expressions</source>
-        <target state="new">Prefer simplified conditional expression</target>
+        <target state="new">Prefer simplified boolean expressions</target>
        <note />
      </trans-unit>
      <trans-unit id="Prefer_static_local_functions">

--- a/src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb
+++ b/src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb
@@ -74,7 +74,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 # Field preferences
@@ -201,7 +201,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 # Field preferences

--- a/src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb
+++ b/src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb
@@ -73,7 +73,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 # Field preferences
@@ -285,7 +285,7 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_simplified_conditional_expressions = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_simplified_interpolation = true:suggestion
 # Field preferences

--- a/src/VisualStudio/VisualBasic/Impl/Options/StyleViewModel.vb
+++ b/src/VisualStudio/VisualBasic/Impl/Options/StyleViewModel.vb
@@ -718,7 +718,7 @@ End Class
            ' expression preferences
            Me.CodeStyleItems.Add(New BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferObjectInitializer, ServicesVSResources.Prefer_object_initializer, s_preferObjectInitializer, s_preferObjectInitializer, Me, optionStore, expressionPreferencesGroupTitle))
            Me.CodeStyleItems.Add(New BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferCollectionInitializer, ServicesVSResources.Prefer_collection_initializer, s_preferCollectionInitializer, s_preferCollectionInitializer, Me, optionStore, expressionPreferencesGroupTitle))
-            Me.CodeStyleItems.Add(New BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferSimplifiedConditionalExpression, ServicesVSResources.Prefer_simplified_conditional_expression, s_preferSimplifiedConditionalExpressions, s_preferSimplifiedConditionalExpressions, Me, optionStore, expressionPreferencesGroupTitle))
+            Me.CodeStyleItems.Add(New BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferSimplifiedBooleanExpressions, ServicesVSResources.Prefer_simplified_boolean_expressions, s_preferSimplifiedConditionalExpressions, s_preferSimplifiedConditionalExpressions, Me, optionStore, expressionPreferencesGroupTitle))
            Me.CodeStyleItems.Add(New BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferExplicitTupleNames, ServicesVSResources.Prefer_explicit_tuple_name, s_preferExplicitTupleName, s_preferExplicitTupleName, Me, optionStore, expressionPreferencesGroupTitle))
            Me.CodeStyleItems.Add(New BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferInferredTupleNames, ServicesVSResources.Prefer_inferred_tuple_names, s_preferInferredTupleName, s_preferInferredTupleName, Me, optionStore, expressionPreferencesGroupTitle))
            Me.CodeStyleItems.Add(New BooleanCodeStyleOptionViewModel(CodeStyleOptions.PreferInferredAnonymousTypeMemberNames, ServicesVSResources.Prefer_inferred_anonymous_type_member_names, s_preferInferredAnonymousTypeMemberName, s_preferInferredAnonymousTypeMemberName, Me, optionStore, expressionPreferencesGroupTitle))

--- a/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs
+++ b/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs
@@ -131,12 +131,12 @@ private static Option<T> CreateCommonOption<T>(OptionGroup group, string name, T
            defaultValue: false,
            storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferCollectionInitializer_FadeOutCode"));
-        internal static readonly PerLanguageOption<CodeStyleOption<bool>> PreferSimplifiedConditionalExpression = CreateOption(
+        internal static readonly PerLanguageOption<CodeStyleOption<bool>> PreferSimplifiedBooleanExpressions = CreateOption(
-            CodeStyleOptionGroups.ExpressionLevelPreferences, nameof(PreferSimplifiedConditionalExpression),
+            CodeStyleOptionGroups.ExpressionLevelPreferences, nameof(PreferSimplifiedBooleanExpressions),
            defaultValue: TrueWithSuggestionEnforcement,
            storageLocations: new OptionStorageLocation[]{
-                EditorConfigStorageLocation.ForBoolCodeStyleOption("dotnet_style_prefer_simplified_conditional_expressions"),
+                EditorConfigStorageLocation.ForBoolCodeStyleOption("dotnet_style_prefer_simplified_boolean_expressions"),
-                new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferSimplifiedConditionalExpression")});
+                new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferSimplifiedBooleanExpressions")});
        internal static readonly PerLanguageOption<OperatorPlacementWhenWrappingPreference> OperatorPlacementWhenWrapping =
            new PerLanguageOption<OperatorPlacementWhenWrappingPreference>(