From 7f123c280ec5708e42dd628fd37c862987b6725e Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sun, 8 Mar 2020 01:30:17 -0800 Subject: [PATCH] Update tests --- .../CSharp/Impl/Options/Formatting/StyleViewModel.cs | 4 ++-- src/VisualStudio/Core/Def/ServicesVSResources.resx | 4 ++-- src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf | 6 +++--- src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf | 6 +++--- .../Core/Def/xlf/ServicesVSResources.zh-Hans.xlf | 6 +++--- .../Core/Def/xlf/ServicesVSResources.zh-Hant.xlf | 6 +++--- .../Core/Test/Options/BasicEditorConfigGeneratorTests.vb | 2 ++ .../Core/Test/Options/CSharpEditorConfigGeneratorTests.vb | 2 ++ src/VisualStudio/VisualBasic/Impl/Options/StyleViewModel.vb | 2 +- src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs | 4 ++-- 19 files changed, 50 insertions(+), 46 deletions(-) diff --git a/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs b/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs index d46e2128872..5184334cfe6 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 e853eb08458..b4904c3b844 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 3283a1348de..2fe9b5ca998 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 6701b555c3e..1db84b61763 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 74e36e512a5..2f899497a7b 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 341605d664b..ee26a3821ea 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 2400556d1d2..eee4bd11f38 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 408bb327a18..00254eac515 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 b8ead839a3b..4da95e2b767 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 4c1b95386fb..789c2cb1af5 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 a9ea92ebbc8..99443da12c1 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 e11d6466c2f..b6a396cb6c2 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 a5a6d51fe56..130041a6db4 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 7d674fceca5..eafd91f088b 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 06f5c04fba5..712786c70f1 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 c3ac995c301..dc04490b00a 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 32d5ba0ccfd..a968437ce40 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 052be54f0b0..fccb487b21b 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 6d9c89a8ca3..4e0496257d8 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( -- GitLab