Code review requested changes

dotnet · Apr 14, 2022 · 31a5855 · 31a5855
1 parent c230316
commit 31a5855
Show file tree

Hide file tree

Showing 21 changed files with 95 additions and 102 deletions.
diff --git a/...arp/Microsoft.NetCore.Analyzers/Runtime/CSharpSpecifyCultureForToLowerAndToUpper.Fixer.cs b/...arp/Microsoft.NetCore.Analyzers/Runtime/CSharpSpecifyCultureForToLowerAndToUpper.Fixer.cs
@@ -43,18 +43,16 @@ protected override Task<Document> UseInvariantVersionAsync(Document document, Sy
         {
             if (node.IsKind(SyntaxKind.IdentifierName))
             {
-                if (node.Parent?.IsKind(SyntaxKind.SimpleMemberAccessExpression) == true)
+                if (node.Parent is MemberAccessExpressionSyntax memberAccess)
                 {
-                    var memberAccess = (MemberAccessExpressionSyntax)node.Parent;
                     var replacementMethodName = GetReplacementMethodName(memberAccess.Name.Identifier.Text);
                     var newMemberAccess = memberAccess.WithName((SimpleNameSyntax)generator.IdentifierName(replacementMethodName)).WithAdditionalAnnotations(Formatter.Annotation);
                     var newRoot = root.ReplaceNode(memberAccess, newMemberAccess);
                     return Task.FromResult(document.WithSyntaxRoot(newRoot));
                 }
 
-                if (node.Parent?.IsKind(SyntaxKind.MemberBindingExpression) == true)
+                if (node.Parent is MemberBindingExpressionSyntax memberBinding)
                 {
-                    var memberBinding = (MemberBindingExpressionSyntax)node.Parent;
                     var replacementMethodName = GetReplacementMethodName(memberBinding.Name.Identifier.Text);
                     var newMemberBinding = memberBinding.WithName((SimpleNameSyntax)generator.IdentifierName(replacementMethodName)).WithAdditionalAnnotations(Formatter.Annotation);
                     var newRoot = root.ReplaceNode(memberBinding, newMemberBinding);

diff --git a/...rs/CSharp/Microsoft.NetCore.Analyzers/Runtime/CSharpSpecifyCultureForToLowerAndToUpper.cs b/...rs/CSharp/Microsoft.NetCore.Analyzers/Runtime/CSharpSpecifyCultureForToLowerAndToUpper.cs
@@ -17,13 +17,13 @@ protected override Location GetMethodNameLocation(SyntaxNode invocationNode)
             Debug.Assert(invocationNode.IsKind(SyntaxKind.InvocationExpression));
 
             var invocation = (InvocationExpressionSyntax)invocationNode;
-            if (invocation.Expression.IsKind(SyntaxKind.SimpleMemberAccessExpression))
+            if (invocation.Expression is MemberAccessExpressionSyntax memberAccess)
             {
-                return ((MemberAccessExpressionSyntax)invocation.Expression).Name.GetLocation();
+                return memberAccess.Name.GetLocation();
             }
-            else if (invocation.Expression.IsKind(SyntaxKind.MemberBindingExpression))
+            else if (invocation.Expression is MemberBindingExpressionSyntax memberBinding)
             {
-                return ((MemberBindingExpressionSyntax)invocation.Expression).Name.GetLocation();
+                return memberBinding.Name.GetLocation();
             }
             return invocation.GetLocation();
         }

diff --git a/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/MicrosoftNetCoreAnalyzersResources.resx b/src/NetAnalyzers/Core/Microsoft.NetCore.Analyzers/MicrosoftNetCoreAnalyzersResources.resx
@@ -1853,13 +1853,13 @@
     <value>'{0}' uses the preview type '{1}' and needs to opt into preview features. See {2} for more information.</value>
   </data>
   <data name="SpecifyCultureForToLowerAndToUpperTitle" xml:space="preserve">
-    <value>Specify culture explicitly</value>
+    <value>Specify a culture or use an invariant version</value>
   </data>
   <data name="SpecifyCultureForToLowerAndToUpperDescription" xml:space="preserve">
-    <value>Specify culture to help avoid accidental implicit dependence on current culture</value>
+    <value>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</value>
   </data>
   <data name="SpecifyCultureForToLowerAndToUpperMessage" xml:space="preserve">
-    <value>Specify culture to avoid implicit dependence on current culture</value>
+    <value>Specify a culture or use an invariant version to avoid implicit dependency on current culture</value>
   </data>
   <data name="SpecifyCurrentCulture" xml:space="preserve">
     <value>Specify current culture</value>

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureForToLowerAndToUpper.cs b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/Runtime/SpecifyCultureForToLowerAndToUpper.cs
@@ -1,6 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the MIT license.  See License.txt in the project root for license information.
 
-using System;
 using System.Collections.Immutable;
 using Analyzer.Utilities;
 using Microsoft.CodeAnalysis;
@@ -52,8 +51,7 @@ protected override void InitializeWorker(CompilationStartAnalysisContext context
 
         private static bool IsToLowerOrToUpper(string methodName)
         {
-            return string.Equals(methodName, ToLowerMethodName, StringComparison.Ordinal) ||
-                string.Equals(methodName, ToUpperMethodName, StringComparison.Ordinal);
+            return methodName == ToLowerMethodName || methodName == ToUpperMethodName;
         }
     }
 }
diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.cs.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.cs.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.de.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.de.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.es.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.es.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.fr.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.fr.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.it.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.it.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.ja.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.ja.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.ko.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.ko.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">

diff --git a/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.pl.xlf b/...tAnalyzers/Core/Microsoft.NetCore.Analyzers/xlf/MicrosoftNetCoreAnalyzersResources.pl.xlf
@@ -2328,18 +2328,18 @@
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperDescription">
-        <source>Specify culture to help avoid accidental implicit dependence on current culture</source>
-        <target state="new">Specify culture to help avoid accidental implicit dependence on current culture</target>
+        <source>Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</source>
+        <target state="new">Specify culture to help avoid accidental implicit dependency on current culture. Using an invariant version yields consistent results regardless of the culture of an application.</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperMessage">
-        <source>Specify culture to avoid implicit dependence on current culture</source>
-        <target state="new">Specify culture to avoid implicit dependence on current culture</target>
+        <source>Specify a culture or use an invariant version to avoid implicit dependency on current culture</source>
+        <target state="new">Specify a culture or use an invariant version to avoid implicit dependency on current culture</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureForToLowerAndToUpperTitle">
-        <source>Specify culture explicitly</source>
-        <target state="new">Specify culture explicitly</target>
+        <source>Specify a culture or use an invariant version</source>
+        <target state="new">Specify a culture or use an invariant version</target>
         <note />
       </trans-unit>
       <trans-unit id="SpecifyCultureInfoDescription">