From 3feec7664178aa76cd1bc20a3140ed9122177588 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Sun, 8 Mar 2020 13:21:52 -0700 Subject: [PATCH] Rename high level feature --- .../SimplifyConditionalTests.cs | 4 ++-- .../Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs | 8 ++++---- .../SimplifyConditionalTests.vb | 4 ++-- .../CSharpSimplifyConditionalCodeFixProvider.cs | 4 ++-- .../CSharpSimplifyConditionalDiagnosticAnalyzer.cs | 4 ++-- .../AbstractSimplifyConditionalCodeFixProvider.cs | 2 +- .../AbstractSimplifyConditionalDiagnosticAnalyzer.cs | 6 +++--- .../VisualBasicSimplifyConditionalCodeFixProvider.vb | 4 ++-- .../VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb | 4 ++-- .../CSharp/Impl/Options/Formatting/StyleViewModel.cs | 2 +- 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 +++--- .../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 | 4 ++-- .../Core/Test/Options/CSharpEditorConfigGeneratorTests.vb | 4 ++-- .../VisualBasic/Impl/Options/StyleViewModel.vb | 2 +- .../Core/Portable/CodeStyle/CodeStyleOptions.cs | 8 ++++---- 28 files changed, 71 insertions(+), 71 deletions(-) rename src/EditorFeatures/CSharpTest/{SimplifyConditional => SimplifyBooleanExpression}/SimplifyConditionalTests.cs (98%) rename src/EditorFeatures/VisualBasicTest/{SimplifyConditional => SimplifyBooleanExpression}/SimplifyConditionalTests.vb (98%) rename src/Features/CSharp/Portable/{SimplifyConditional => SimplifyBooleanExpression}/CSharpSimplifyConditionalCodeFixProvider.cs (82%) rename src/Features/CSharp/Portable/{SimplifyConditional => SimplifyBooleanExpression}/CSharpSimplifyConditionalDiagnosticAnalyzer.cs (89%) rename src/Features/Core/Portable/{SimplifyConditional => SimplifyBooleanExpression}/AbstractSimplifyConditionalCodeFixProvider.cs (98%) rename src/Features/Core/Portable/{SimplifyConditional => SimplifyBooleanExpression}/AbstractSimplifyConditionalDiagnosticAnalyzer.cs (97%) rename src/Features/VisualBasic/Portable/{SimplifyConditional => SimplifyBooleanExpression}/VisualBasicSimplifyConditionalCodeFixProvider.vb (81%) rename src/Features/VisualBasic/Portable/{SimplifyConditional => SimplifyBooleanExpression}/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb (90%) diff --git a/src/EditorFeatures/CSharpTest/SimplifyConditional/SimplifyConditionalTests.cs b/src/EditorFeatures/CSharpTest/SimplifyBooleanExpression/SimplifyConditionalTests.cs similarity index 98% rename from src/EditorFeatures/CSharpTest/SimplifyConditional/SimplifyConditionalTests.cs rename to src/EditorFeatures/CSharpTest/SimplifyBooleanExpression/SimplifyConditionalTests.cs index 3b4a69fc601..d3eec2d411e 100644 --- a/src/EditorFeatures/CSharpTest/SimplifyConditional/SimplifyConditionalTests.cs +++ b/src/EditorFeatures/CSharpTest/SimplifyBooleanExpression/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 { diff --git a/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs b/src/EditorFeatures/Test/Diagnostics/IDEDiagnosticIDConfigurationTests.cs index 78c1d6cdc79..fb44ff4dad7 100644 --- 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 diff --git a/src/EditorFeatures/VisualBasicTest/SimplifyConditional/SimplifyConditionalTests.vb b/src/EditorFeatures/VisualBasicTest/SimplifyBooleanExpression/SimplifyConditionalTests.vb similarity index 98% rename from src/EditorFeatures/VisualBasicTest/SimplifyConditional/SimplifyConditionalTests.vb rename to src/EditorFeatures/VisualBasicTest/SimplifyBooleanExpression/SimplifyConditionalTests.vb index 706d29edb81..612b56d8138 100644 --- a/src/EditorFeatures/VisualBasicTest/SimplifyConditional/SimplifyConditionalTests.vb +++ b/src/EditorFeatures/VisualBasicTest/SimplifyBooleanExpression/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 diff --git a/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalCodeFixProvider.cs b/src/Features/CSharp/Portable/SimplifyBooleanExpression/CSharpSimplifyConditionalCodeFixProvider.cs similarity index 82% rename from src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalCodeFixProvider.cs rename to src/Features/CSharp/Portable/SimplifyBooleanExpression/CSharpSimplifyConditionalCodeFixProvider.cs index f2c7d10d2b5..01df3a5989f 100644 --- a/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalCodeFixProvider.cs +++ b/src/Features/CSharp/Portable/SimplifyBooleanExpression/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 : diff --git a/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalDiagnosticAnalyzer.cs b/src/Features/CSharp/Portable/SimplifyBooleanExpression/CSharpSimplifyConditionalDiagnosticAnalyzer.cs similarity index 89% rename from src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalDiagnosticAnalyzer.cs rename to src/Features/CSharp/Portable/SimplifyBooleanExpression/CSharpSimplifyConditionalDiagnosticAnalyzer.cs index 9cade7ac471..44f480e4c3b 100644 --- a/src/Features/CSharp/Portable/SimplifyConditional/CSharpSimplifyConditionalDiagnosticAnalyzer.cs +++ b/src/Features/CSharp/Portable/SimplifyBooleanExpression/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 : diff --git a/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalCodeFixProvider.cs b/src/Features/Core/Portable/SimplifyBooleanExpression/AbstractSimplifyConditionalCodeFixProvider.cs similarity index 98% rename from src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalCodeFixProvider.cs rename to src/Features/Core/Portable/SimplifyBooleanExpression/AbstractSimplifyConditionalCodeFixProvider.cs index e6f4abe32b7..a9ed35dc9b2 100644 --- a/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalCodeFixProvider.cs +++ b/src/Features/Core/Portable/SimplifyBooleanExpression/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 diff --git a/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalDiagnosticAnalyzer.cs b/src/Features/Core/Portable/SimplifyBooleanExpression/AbstractSimplifyConditionalDiagnosticAnalyzer.cs similarity index 97% rename from src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalDiagnosticAnalyzer.cs rename to src/Features/Core/Portable/SimplifyBooleanExpression/AbstractSimplifyConditionalDiagnosticAnalyzer.cs index 415a4f4c860..8a3b67fb9e2 100644 --- a/src/Features/Core/Portable/SimplifyConditional/AbstractSimplifyConditionalDiagnosticAnalyzer.cs +++ b/src/Features/Core/Portable/SimplifyBooleanExpression/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) { diff --git a/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalCodeFixProvider.vb b/src/Features/VisualBasic/Portable/SimplifyBooleanExpression/VisualBasicSimplifyConditionalCodeFixProvider.vb similarity index 81% rename from src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalCodeFixProvider.vb rename to src/Features/VisualBasic/Portable/SimplifyBooleanExpression/VisualBasicSimplifyConditionalCodeFixProvider.vb index 90932510e79..db3e4a233a6 100644 --- a/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalCodeFixProvider.vb +++ b/src/Features/VisualBasic/Portable/SimplifyBooleanExpression/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 Friend Class VisualBasicSimplifyConditionalCodeFixProvider Inherits AbstractSimplifyConditionalCodeFixProvider diff --git a/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb b/src/Features/VisualBasic/Portable/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb similarity index 90% rename from src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb rename to src/Features/VisualBasic/Portable/SimplifyBooleanExpression/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb index 7f290ef6b53..c2805bef4e2 100644 --- a/src/Features/VisualBasic/Portable/SimplifyConditional/VisualBasicSimplifyConditionalDiagnosticAnalyzer.vb +++ b/src/Features/VisualBasic/Portable/SimplifyBooleanExpression/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 Friend Class VisualBasicSimplifyConditionalDiagnosticAnalyzer Inherits AbstractSimplifyConditionalDiagnosticAnalyzer(Of diff --git a/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs b/src/VisualStudio/CSharp/Impl/Options/Formatting/StyleViewModel.cs index 5184334cfe6..262706ec12b 100644 --- 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)); diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx index b4904c3b844..78b4495c85f 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 expression + + Prefer simplified boolean expressions \ 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 2fe9b5ca998..d8f5be1c43c 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf index 1db84b61763..242f47f57c1 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf index 2f899497a7b..d007d4cb143 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf index ee26a3821ea..41df2a19732 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf index eee4bd11f38..bc1cfaf5991 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf index 00254eac515..49d589778cd 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf index 4da95e2b767..f98ee65a35c 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf index 789c2cb1af5..cc540a4497d 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf index 99443da12c1..1fd077a2fcd 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf index b6a396cb6c2..9dd29765bfe 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf index 130041a6db4..bf631554df6 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf index eafd91f088b..f3a1d29bf1c 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf index 712786c70f1..35a18b90803 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 expression - Prefer simplified conditional expression + + Prefer simplified boolean expressions + Prefer simplified boolean expressions diff --git a/src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb b/src/VisualStudio/Core/Test/Options/BasicEditorConfigGeneratorTests.vb index dc04490b00a..006532f33a3 100644 --- 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 diff --git a/src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb b/src/VisualStudio/Core/Test/Options/CSharpEditorConfigGeneratorTests.vb index a968437ce40..f9af2365013 100644 --- 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 diff --git a/src/VisualStudio/VisualBasic/Impl/Options/StyleViewModel.vb b/src/VisualStudio/VisualBasic/Impl/Options/StyleViewModel.vb index fccb487b21b..c9e516a7a60 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_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)) diff --git a/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs b/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs index 4e0496257d8..b81dc048995 100644 --- a/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs +++ b/src/Workspaces/Core/Portable/CodeStyle/CodeStyleOptions.cs @@ -131,12 +131,12 @@ private static Option CreateCommonOption(OptionGroup group, string name, T defaultValue: false, storageLocations: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferCollectionInitializer_FadeOutCode")); - internal static readonly PerLanguageOption> PreferSimplifiedConditionalExpression = CreateOption( - CodeStyleOptionGroups.ExpressionLevelPreferences, nameof(PreferSimplifiedConditionalExpression), + internal static readonly PerLanguageOption> PreferSimplifiedBooleanExpressions = CreateOption( + CodeStyleOptionGroups.ExpressionLevelPreferences, nameof(PreferSimplifiedBooleanExpressions), defaultValue: TrueWithSuggestionEnforcement, storageLocations: new OptionStorageLocation[]{ - EditorConfigStorageLocation.ForBoolCodeStyleOption("dotnet_style_prefer_simplified_conditional_expressions"), - new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferSimplifiedConditionalExpression")}); + EditorConfigStorageLocation.ForBoolCodeStyleOption("dotnet_style_prefer_simplified_boolean_expressions"), + new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.PreferSimplifiedBooleanExpressions")}); internal static readonly PerLanguageOption OperatorPlacementWhenWrapping = new PerLanguageOption( -- GitLab