Merge branch 'feature/v5.3.1'

Author: michael-damatov

Sources/ReCommendedExtension.Tests/ReCommendedExtension.Tests.csproj

@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Lifetimes" Version="2020.3.2" />
-    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.3.0">
+    <PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

Sources/ReCommendedExtension/Analyzers/Annotation/AnnotationAnalyzer.cs

@@ -273,10 +273,7 @@ where Equals(attributeInstance.GetClrName(), ClrTypeNames.SuppressMessageAttribu
                     new MissingSuppressionJustificationWarning(
                         attributesOwnerDeclaration,
                         suppressMessageAttribute.Attribute,
-                        string.Format(
-                            "Suppression justification is missing for {0}:{1}.",
-                            suppressMessageAttribute.Category,
-                            suppressMessageAttribute.CheckId)));
+                        $"Suppression justification is missing for {suppressMessageAttribute.Category}:{suppressMessageAttribute.CheckId}."));
             }
 
             if (!ExcludeFromCodeCoverageJustificationPropertyExists(attributesOwnerDeclaration.GetPsiModule()))
@@ -337,7 +334,7 @@ from attribute in attributesOwnerDeclaration.Attributes
                             new ConflictingAnnotationWarning(
                                 attributesOwnerDeclaration,
                                 attribute,
-                                string.Format("Annotation conflicts with '{0}' annotation.", conflictingAnnotation)));
+                                $"Annotation conflicts with '{conflictingAnnotation}' annotation."));
                     }
                 }
             }
@@ -580,7 +577,7 @@ where conditions.Count > 0
                         attributesOwnerDeclaration,
                         conditionalAttribute.Attribute,
                         conditionalAttribute.Conditions.Count == 1
-                            ? string.Format("Attribute will be ignored if the '{0}' condition is not defined.", conditionalAttribute.Conditions[0])
+                            ? $"Attribute will be ignored if the '{conditionalAttribute.Conditions[0]}' condition is not defined."
                             : string.Format(
                                 "Attribute will be ignored if none of the following conditions is defined: {0}.",
                                 string.Join(", ", from condition in conditionalAttribute.Conditions orderby condition select $"'{condition}'"))));
@@ -756,7 +753,7 @@ void AnalyzeOther(
                 case ValueAnalysisMode.PESSIMISTIC:
                     foreach (var attributeMark in GetAttributeMarks(attributesOwnerDeclaration))
                     {
-                        if (attributeMark != null && attributeMark.AnnotationNullableValue == CodeAnnotationNullableValue.CAN_BE_NULL)
+                        if (attributeMark?.AnnotationNullableValue == CodeAnnotationNullableValue.CAN_BE_NULL)
                         {
                             consumer.AddHighlighting(
                                 new RedundantAnnotationSuggestion(

Sources/ReCommendedExtension/Analyzers/ArgumentExceptionConstructorArgument/ArgumentExceptionConstructorArgumentAnalyzer.cs

@@ -32,8 +32,7 @@ protected override void Run(IObjectCreationExpression element, ElementProblemAna
                             {
                                 case ILiteralExpression literalExpression:
                                     var literalText = literalExpression.Literal?.GetText();
-                                    if (literalText != null &&
-                                        literalText.Length > 2 &&
+                                    if (literalText?.Length > 2 &&
                                         literalText[0] == '\"' &&
                                         literalText[literalText.Length - 1] == '\"' &&
                                         parameters.Any(p => p.AssertNotNull().ShortName == literalText.Substring(1, literalText.Length - 2)))

Sources/ReCommendedExtension/Analyzers/ArrayWithDefaultValuesInitialization/ArrayWithDefaultValuesInitializationAnalyzer.cs

@@ -14,7 +14,7 @@ namespace ReCommendedExtension.Analyzers.ArrayWithDefaultValuesInitialization
     public sealed class ArrayWithDefaultValuesInitializationAnalyzer : ElementProblemAnalyzer<IArrayInitializer>
     {
         [NotNull]
-        static string CreateHighlightingMessage([NotNull] string suggestedCode) => string.Format("Use '{0}'.", suggestedCode);
+        static string CreateHighlightingMessage([NotNull] string suggestedCode) => $"Use '{suggestedCode}'.";
 
         protected override void Run(IArrayInitializer element, ElementProblemAnalyzerData data, IHighlightingConsumer consumer)
         {

Sources/ReCommendedExtension/Analyzers/ArrayWithDefaultValuesInitialization/ReplaceWithNewArrayWithLengthFix.cs

@@ -31,7 +31,7 @@ public override string Text
             {
                 Debug.Assert(CSharpLanguage.Instance != null);
 
-                return string.Format("Replace array initialization with '{0}'", highlighting.SuggestedCode);
+                return $"Replace array initialization with '{highlighting.SuggestedCode}'";
             }
         }
 

Sources/ReCommendedExtension/Analyzers/AsyncVoid/AsyncVoidAnalyzer.cs

@@ -83,10 +83,7 @@ static void Analyze([NotNull] IMethodDeclaration methodDeclaration, [NotNull] IH
                 {
                     consumer.AddHighlighting(
                         new AvoidAsyncVoidWarning(
-                            string.Format(
-                                "'async void' method used {0} time{1} not as a direct event handler.",
-                                count.ToString(),
-                                count == 1 ? "" : "s"),
+                            $"'async void' method used {count.ToString()} time{(count == 1 ? "" : "s")} not as a direct event handler.",
                             methodDeclaration));
                 }
             }
@@ -113,10 +110,7 @@ static void Analyze([NotNull] ILocalFunctionDeclaration localFunctionDeclaration
             {
                 consumer.AddHighlighting(
                     new AvoidAsyncVoidWarning(
-                        string.Format(
-                            "'async void' local function used {0} time{1} not as a direct event handler.",
-                            count.ToString(),
-                            count == 1 ? "" : "s"),
+                        $"'async void' local function used {count.ToString()} time{(count == 1 ? "" : "s")} not as a direct event handler.",
                         localFunctionDeclaration));
             }
         }

Sources/ReCommendedExtension/Analyzers/ConditionalInvocation/ConditionalInvocationAnalyzer.cs

@@ -50,22 +50,21 @@ where attributeInstance.AssertNotNull().PositionParameterCount == 1
             {
                 foreach (var treeNode in file.Descendants())
                 {
-                    if (treeNode is IDefineDirective defineDirective)
+                    switch (treeNode)
                     {
-                        if (!string.IsNullOrEmpty(defineDirective.SymbolName))
-                        {
-                            currentConditions.Add(defineDirective.SymbolName);
-                        }
-                        continue;
-                    }
+                        case IDefineDirective defineDirective:
+                            if (!string.IsNullOrEmpty(defineDirective.SymbolName))
+                            {
+                                currentConditions.Add(defineDirective.SymbolName);
+                            }
+                            continue;
 
-                    if (treeNode is IUndefDirective undefDirective)
-                    {
-                        if (!string.IsNullOrEmpty(undefDirective.SymbolName))
-                        {
-                            currentConditions.Remove(undefDirective.SymbolName);
-                        }
-                        continue;
+                        case IUndefDirective undefDirective:
+                            if (!string.IsNullOrEmpty(undefDirective.SymbolName))
+                            {
+                                currentConditions.Remove(undefDirective.SymbolName);
+                            }
+                            continue;
                     }
 
                     if (treeNode == invocationExpression ||
@@ -92,7 +91,7 @@ protected override void Run(IInvocationExpression element, ElementProblemAnalyze
                 consumer.AddHighlighting(
                     new ConditionalInvocationHint(
                         conditions.Count == 1
-                            ? string.Format("Method invocation will be skipped if the '{0}' condition is not defined.", conditions[0])
+                            ? $"Method invocation will be skipped if the '{conditions[0]}' condition is not defined."
                             : string.Format(
                                 "Method invocation will be skipped if none of the following conditions is defined: {0}.",
                                 string.Join(", ", from condition in conditions orderby condition select $"'{condition}'")),

Sources/ReCommendedExtension/Analyzers/EmptyArrayInitialization/EmptyArrayInitializationAnalyzer.cs

@@ -33,11 +33,7 @@ static string CreateHighlightingMessage([NotNull] IType arrayElementType)
         {
             Debug.Assert(CSharpLanguage.Instance != null);
 
-            return string.Format(
-                "Use '{0}.{1}<{2}>()'.",
-                nameof(Array),
-                nameof(Array.Empty),
-                arrayElementType.GetPresentableName(CSharpLanguage.Instance));
+            return $"Use '{nameof(Array)}.{nameof(Array.Empty)}<{arrayElementType.GetPresentableName(CSharpLanguage.Instance)}>()'.";
         }
 
         protected override void Run(ICSharpTreeNode element, ElementProblemAnalyzerData data, IHighlightingConsumer consumer)

Sources/ReCommendedExtension/Analyzers/LocalSuppression/LocalSuppressionAnalyzer.cs

@@ -13,9 +13,9 @@ static int GetLeadingWhitespaceCharacterCount([NotNull] string commentText)
         {
             var leadingWhitespaceCharacters = 0;
 
-            for (var i = 0; i < commentText.Length; i++)
+            foreach (var c in commentText)
             {
-                switch (commentText[i])
+                switch (c)
                 {
                     case ' ':
                     case '\t':

Sources/ReCommendedExtension/Analyzers/ValueTask/ValueTaskAnalyzer.cs

@@ -36,15 +36,15 @@ sealed class Inspector : CSharpControlFlowGraphInspector
             {
                 var declaration = controlFlowGraph.Declaration;
                 Debug.Assert(declaration != null);
-                
+
                 var containingFile = (ICSharpFile)declaration.GetContainingFile();
 
                 var forceClosuresCollection = false;
                 if ((uint)analysisMode > 0U && shouldDisableValueAnalysisIfNullableWarningsEnabled)
                 {
                     var file = containingFile;
                     var treeTextRange = declaration.GetTreeTextRange();
-                    ref TreeTextRange local = ref treeTextRange;
+                    ref var local = ref treeTextRange;
                     if (file.IsNullableWarningsEnabledEverywhereIn(in local))
                     {
                         analysisMode = ValueAnalysisMode.OFF;
@@ -321,14 +321,15 @@ static void AnalyzeBlockingAttempt([NotNull] IInvocationExpression invocationExp
 
         protected override void Run(ICSharpTreeNode element, ElementProblemAnalyzerData data, IHighlightingConsumer consumer)
         {
-            if (element is ICSharpDeclaration declaration)
+            switch (element)
             {
-                AnalyzeMultipleConsumptions(declaration, consumer, data.GetValueAnalysisMode());
-            }
+                case ICSharpDeclaration declaration:
+                    AnalyzeMultipleConsumptions(declaration, consumer, data.GetValueAnalysisMode());
+                    break;
 
-            if (element is IInvocationExpression invocationExpression)
-            {
-                AnalyzeBlockingAttempt(invocationExpression, consumer);
+                case IInvocationExpression invocationExpression:
+                    AnalyzeBlockingAttempt(invocationExpression, consumer);
+                    break;
             }
         }
     }