diff --git a/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs b/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs index d46e2128872530b1372d0385c59fa1c9a55454b4..5184334cfe69be5c3be1c0c3f7c650f39048c027 100644 --- a/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs +++ b/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)); diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx index e853eb084589b93a9e7ed477594004ac1157dd32..b4904c3b84439c68921f12576b0ef7b9c4ea44de 100644 --- 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: 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. - - Prefer simplified conditional expressions + + Prefer simplified conditional expression \ No newline at end of file diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf index 3283a1348dec4a9dbf0e2987594f0f38b2c20855..2fe9b5ca99808d556219117daf5cef9786263233 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf @@ -427,9 +427,9 @@ Preferovat jednoduchý příkaz using - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf index 6701b555c3ee2a45bceadf6b070ef756f6aefb79..1db84b61763f9a29060ee83e938b69d7e75a13c8 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf @@ -427,9 +427,9 @@ Einfache using-Anweisung bevorzugen - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf index 74e36e512a5fea340241e2a4bf903c8eaae9e051..2f899497a7bfbd1c8916c8e29142210c1859371f 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf @@ -427,9 +427,9 @@ Preferir la instrucción "using" sencilla - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf index 341605d664bd91cc73792110a00868889187070d..ee26a3821ea2523e90b5d56b2234e6e8a22c7eed 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf @@ -427,9 +427,9 @@ Préférer une instruction 'using' simple - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf index 2400556d1d21598a7770ebb39cf0bacbf3052d52..eee4bd11f3876c1f49bfb14ee6dd924989557568 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf @@ -427,9 +427,9 @@ Preferisci l'istruzione 'using' semplice - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf index 408bb327a181f3735850386e22e4c2d36b16519d..00254eac515af42e3c9d72047bdd61f6a7e179c3 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf @@ -427,9 +427,9 @@ 単純な 'using' ステートメントを優先する - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf index b8ead839a3ba9da88e5206328847ef0fc125712a..4da95e2b7678c0c37da24f690e847b594bdc3903 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf @@ -427,9 +427,9 @@ 간단한 'using' 문 선호 - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf index 4c1b95386fb04d9444c7d0730d624c911b506196..789c2cb1af52e415f5fc45a97e914380a40ef935 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf @@ -427,9 +427,9 @@ Preferuj prostą instrukcję „using” - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf index a9ea92ebbc823160af149cd286a3387e3f2ff6b2..99443da12c1d03561fe487f8baeb552b11054f83 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf @@ -427,9 +427,9 @@ Preferir a instrução 'using' simples - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf index e11d6466c2f76cffca9f1c827624ee5b85f40eb4..b6a396cb6c20e7a807aa964dcb94fd761941241d 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf @@ -427,9 +427,9 @@ Предпочитать простой оператор using - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf index a5a6d51fe56c752823f0e2b3d2a8f01079c3df2c..130041a6db41381d10ba628d3b8544976d5f883e 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf @@ -427,9 +427,9 @@ Basit 'using' deyimini tercih et - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf index 7d674fceca5504c13a96decce1dbf04c4ba08c91..eafd91f088b78bb07570672c78247dead6e82802 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf @@ -427,9 +427,9 @@ 首选简单的 "using" 语句 - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf index 06f5c04fba5c955ab940cf09f5e408d5a6b42ae5..712786c70f182e306121c4b277dafff52be59d51 100644 --- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf +++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf @@ -427,9 +427,9 @@ 優先使用簡單的 'using' 陳述式 - - Prefer simplified conditional expressions - Prefer simplified conditional expressions + + Prefer simplified conditional expression + Prefer simplified conditional expression diff --git a/src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb b/src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb index c3ac995c301e347385b72839d8f11fa53817bf80..dc04490b00a91680a528630a1810866457892f49 100644 --- a/src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb +++ b/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 diff --git a/src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb b/src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb index 32d5ba0ccfde7b3603acb2b64b4523ae30fe95fc..a968437ce40bc1d685c7d9c85f7b20412e4ca7bd 100644 --- a/src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb +++ b/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 diff --git a/src/VisualStudio/VisualBasic/Impl/Options/StyleViewModel.vb b/src/VisualStudio/VisualBasic/Impl/Options/StyleViewModel.vb index 052be54f0b0e33f62ac289abb31b3d5b8394c4db..fccb487b21b998eecebf9b4b17483386a5154fa8 100644 --- 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_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)) diff --git a/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs b/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs index 6d9c89a8ca36e09899f8fc4d523e26b86f822425..4e0496257d896531cbf81cdbdf461ca538fb3ada 100644 --- a/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs +++ b/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs @@ -135,8 +135,8 @@ private static Option CreateCommonOption(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 OperatorPlacementWhenWrapping = new PerLanguageOption(