Update tests

src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs

@@ -562,7 +562,7 @@ class Customer2
 }}
 ";
 
-        private static readonly string s_preferSimplifiedConditionalExpressions = $@"
+        private static readonly string s_preferSimplifiedConditionalExpression = $@"
 using System.Threading;
 
 class Customer1
@@ -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_expressions, s_preferSimplifiedConditionalExpressions, s_preferSimplifiedConditionalExpressions, 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(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));

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_expressions" xml:space="preserve">
-    <value>Prefer simplified conditional expressions</value>
+  <data name="Prefer_simplified_conditional_expression" xml:space="preserve">
+    <value>Prefer simplified conditional expression</value>
   </data>
 </root>
\ No newline at end of file

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

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_expressions">
-        <source>Prefer simplified conditional expressions</source>
-        <target state="new">Prefer simplified conditional expressions</target>
+      <trans-unit id="Prefer_simplified_conditional_expression">
+        <source>Prefer simplified conditional expression</source>
+        <target state="new">Prefer simplified conditional expression</target>
         <note />
       </trans-unit>
       <trans-unit id="Prefer_static_local_functions">

src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb

@@ -74,6 +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_interpolation = true:suggestion
 
 # Field preferences
@@ -200,6 +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_interpolation = true:suggestion
 
 # Field preferences

src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb

@@ -73,6 +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_interpolation = true:suggestion
 
 # Field preferences
@@ -284,6 +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_interpolation = true:suggestion
 
 # Field preferences

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_expressions, s_preferSimplifiedConditionalExpressions, s_preferSimplifiedConditionalExpressions, 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.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))

src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs

@@ -135,8 +135,8 @@ private static Option<T> CreateCommonOption<T>(OptionGroup group, string name, T
             CodeStyleOptionGroups.ExpressionLevelPreferences, nameof(PreferSimplifiedConditionalExpression),
             defaultValue: TrueWithSuggestionEnforcement,
             storageLocations: new OptionStorageLocation[]{
-                EditorConfigStorageLocation.ForBoolCodeStyleOption("dotnet_style_prefer_simplified_conditionals"),
-                new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferSimplifiedConditionals")});
+                EditorConfigStorageLocation.ForBoolCodeStyleOption("dotnet_style_prefer_simplified_conditional_expressions"),
+                new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferSimplifiedConditionalExpression")});
 
         internal static readonly PerLanguageOption<OperatorPlacementWhenWrappingPreference> OperatorPlacementWhenWrapping =
             new PerLanguageOption<OperatorPlacementWhenWrappingPreference>(