Merge pull request serilog#1042 from tsimbalar/resharper-green-again

Make Resharper green again
ite-klass · Oct 19, 2017 · c10e625 · c10e625
2 parents 8528ae3 + f41eaf1
commit c10e625
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 18 deletions.
diff --git a/Serilog.sln.DotSettings b/Serilog.sln.DotSettings
@@ -50,6 +50,7 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleNullReferenceException/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PossibleUnintendedReferenceComparison/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=PrivateFieldCanBeConvertedToLocalVariable/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantArgumentDefaultValue/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantAssignment/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBaseConstructorCall/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantBoolCompare/@EntryIndexedValue">ERROR</s:String>

diff --git a/src/Serilog/Capturing/PropertyValueConverter.cs b/src/Serilog/Capturing/PropertyValueConverter.cs
@@ -247,6 +247,7 @@ bool TryConvertValueTuple(object value, Destructuring destructuring, Type valueT
                 definition == typeof(ValueTuple<,,,,>) || definition == typeof(ValueTuple<,,,,,>) ||
                 definition == typeof(ValueTuple<,,,,,,>))
 #else
+            // ReSharper disable once PossibleNullReferenceException
             var defn = definition.FullName;
             if (defn == "System.ValueTuple`1" || defn == "System.ValueTuple`2" ||
                 defn == "System.ValueTuple`3" || defn == "System.ValueTuple`4" ||

diff --git a/src/Serilog/Context/LogContext.cs b/src/Serilog/Context/LogContext.cs
@@ -254,6 +254,8 @@ public DisposableObjectHandle(object o) : base(o)
             public override object InitializeLifetimeService()
             {
                 var lease = (ILease)base.InitializeLifetimeService();
+                // ReSharper disable once PossibleNullReferenceException
+                // not 100% sure this will never occur ...
                 lease.Register(LifeTimeSponsor);
                 return lease;
             }

diff --git a/src/Serilog/Core/Pipeline/MessageTemplateCache.cs b/src/Serilog/Core/Pipeline/MessageTemplateCache.cs
@@ -51,6 +51,8 @@ public MessageTemplate Parse(string messageTemplate)
                 return _innerParser.Parse(messageTemplate);
 
 #if HASHTABLE
+            // ReSharper disable once InconsistentlySynchronizedField
+            // ignored warning because this is by design
             var result = (MessageTemplate)_templates[messageTemplate];
             if (result != null)
                 return result;

diff --git a/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs b/src/Serilog/Settings/KeyValuePairs/KeyValuePairSettings.cs
@@ -148,7 +148,7 @@ where matchCallables.IsMatch(wt.Key)
 
             if (callableDirectives.Any())
             {
-                var configurationAssemblies = LoadConfigurationAssemblies(directives);
+                var configurationAssemblies = LoadConfigurationAssemblies(directives).ToList();
 
                 foreach (var receiverGroup in callableDirectives.GroupBy(d => d.ReceiverType))
                 {

diff --git a/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs b/test/Serilog.Tests/Capturing/PropertyValueConverterTests.cs
@@ -24,7 +24,7 @@ public class PropertyValueConverterTests
         [Fact]
         public async Task MaximumDepthIsEffectiveAndThreadSafe()
         {
-            var _converter = new PropertyValueConverter(3, 1000, 1000, Enumerable.Empty<Type>(), Enumerable.Empty<IDestructuringPolicy>(), false);
+            var converter = new PropertyValueConverter(3, 1000, 1000, Enumerable.Empty<Type>(), Enumerable.Empty<IDestructuringPolicy>(), false);
 
             var barrier = new Barrier(participantCount: 3);
 
@@ -63,7 +63,7 @@ void DoThreadTest(object logObject, Action<string> assertAction)
                 {
                     barrier.SignalAndWait();
 
-                    var propValue = _converter.CreatePropertyValue(logObject, true);
+                    var propValue = converter.CreatePropertyValue(logObject, true);
 
                     Assert.IsType<StructureValue>(propValue);
 

diff --git a/test/Serilog.Tests/Context/LogContextTests.cs b/test/Serilog.Tests/Context/LogContextTests.cs
@@ -31,7 +31,9 @@ static LogContextTests()
         public LogContextTests()
         {
 #if REMOTING
+            // ReSharper disable AssignNullToNotNullAttribute
             CallContext.LogicalSetData(typeof(LogContext).FullName, null);
+            // ReSharper restore AssignNullToNotNullAttribute
 #endif
         }
 
@@ -266,7 +268,9 @@ public void DoesNotPreventCrossDomainCalls()
             {
                 domain = AppDomain.CreateDomain("LogContextTests", null, AppDomain.CurrentDomain.SetupInformation);
 
+                // ReSharper disable AssignNullToNotNullAttribute
                 var callable = (RemotelyCallable)domain.CreateInstanceAndUnwrap(typeof(RemotelyCallable).Assembly.FullName, typeof(RemotelyCallable).FullName);
+                // ReSharper restore AssignNullToNotNullAttribute
 
                 using (LogContext.PushProperty("Anything", 1001))
                     Assert.True(callable.IsCallable());
@@ -381,4 +385,4 @@ public bool IsCallable()
         }
     }
 #endif
-}
+}
diff --git a/test/Serilog.Tests/MethodOverloadConventionTests.cs b/test/Serilog.Tests/MethodOverloadConventionTests.cs
@@ -305,9 +305,7 @@ public void ValidateIsEnabledMethods(Type loggerType)
             Assert.Equal(parameter.Name, "level");
             Assert.Equal(parameter.ParameterType, typeof(LogEventLevel));
 
-            CollectingSink sink;
-
-            var logger = GetLogger(loggerType, out sink, LogEventLevel.Information);
+            var logger = GetLogger(loggerType, out _, LogEventLevel.Information);
 
             var falseResult = InvokeMethod(method, logger, new object[] { LogEventLevel.Verbose });
 
@@ -503,6 +501,7 @@ void ForContextMethod4(MethodInfo method)
             TestForContextResult(method, logger, normalResult: enrichedLogger);
         }
 
+        // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
         void TestForContextResult(MethodInfo method, ILogger logger, object normalResult)
         {
             Assert.NotNull(normalResult);
@@ -761,10 +760,7 @@ static void InvokeConventionMethod(
 
         static void InvokeConventionMethod(MethodInfo method, Type[] typeArgs, object[] parameters)
         {
-            CollectingSink sink;
-            LogEventLevel level;
-
-            InvokeConventionMethod(method, typeArgs, parameters, out level, out sink);
+            InvokeConventionMethod(method, typeArgs, parameters, out _, out _);
         }
 
         static void InvokeConventionMethodAndTest(MethodInfo method, Type[] typeArgs, object[] parameters)
@@ -889,6 +885,7 @@ static object InvokeMethod(
             return method.Invoke(instance, parameters);
         }
 
+        // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
         static void EvaluateSingleResult(LogEventLevel level, CollectingSink results)
         {
             //evaluate single log event
@@ -901,9 +898,7 @@ static void EvaluateSingleResult(LogEventLevel level, CollectingSink results)
 
         static ILogger GetLogger(Type loggerType)
         {
-            CollectingSink sink;
-
-            return GetLogger(loggerType, out sink);
+            return GetLogger(loggerType, out _);
         }
 
         static ILogger GetLogger(Type loggerType, out CollectingSink sink, LogEventLevel level = LogEventLevel.Verbose)
@@ -940,4 +935,4 @@ static ILogger GetLogger(Type loggerType, out CollectingSink sink, LogEventLevel
             throw new ArgumentException($"Logger Type of {loggerType} is not supported");
         }
     }
-}
+}
diff --git a/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs b/test/Serilog.Tests/Parsing/MessageTemplateParserTests.cs
@@ -11,6 +11,7 @@ static MessageTemplateToken[] Parse(string messsageTemplate)
             return new MessageTemplateParser().Parse(messsageTemplate).Tokens.ToArray();
         }
 
+        // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
         static void AssertParsedAs(string message, params MessageTemplateToken[] messageTemplateTokens)
         {
             var parsed = Parse(message);

diff --git a/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs b/test/Serilog.Tests/Settings/KeyValuePairSettingsTests.cs
@@ -313,12 +313,14 @@ public void LoggingLevelSwitchCanBeUsedForMinimumLevelOverrides()
             systemLogger.Write(Some.WarningEvent());
             Assert.False(evt is null, "LoggingLevelSwitch initial level was Warning for logger System.*. It should log Warning messages for SourceContext System.Bar");
 
+            // ReSharper disable HeuristicUnreachableCode
             evt = null;
             var controlSwitch = DummyWithLevelSwitchSink.ControlLevelSwitch;
 
             controlSwitch.MinimumLevel = LogEventLevel.Information;
             systemLogger.Write(Some.InformationEvent());
             Assert.False(evt is null, "LoggingLevelSwitch level was changed to Information for logger System.*. It should now log Information events for SourceContext System.Bar.");
+            // ReSharper restore HeuristicUnreachableCode
         }
 
     }

diff --git a/test/Serilog.Tests/Settings/SettingValueConversionsTests.cs b/test/Serilog.Tests/Settings/SettingValueConversionsTests.cs
@@ -33,8 +33,8 @@ public void EmptyStringValuesConvertToNullIfTargetIsNullable()
         [Fact]
         public void ValuesConvertToNullableTimeSpan()
         {
-            var result = (System.TimeSpan?)SettingValueConversions.ConvertToType("00:01:00", typeof(System.TimeSpan?));
-            Assert.Equal(System.TimeSpan.FromMinutes(1), result);
+            var result = (TimeSpan?)SettingValueConversions.ConvertToType("00:01:00", typeof(TimeSpan?));
+            Assert.Equal(TimeSpan.FromMinutes(1), result);
         }
 
         [Fact]

diff --git a/test/TestDummies/DummyRollingFileAuditSink.cs b/test/TestDummies/DummyRollingFileAuditSink.cs
@@ -8,7 +8,9 @@ namespace TestDummies
     public class DummyRollingFileAuditSink : ILogEventSink
     {
         [ThreadStatic]
+        // ReSharper disable ThreadStaticFieldHasInitializer
         public static List<LogEvent> Emitted = new List<LogEvent>();
+        // ReSharper restore ThreadStaticFieldHasInitializer
 
         public void Emit(LogEvent logEvent)
         {

diff --git a/test/TestDummies/DummyRollingFileSink.cs b/test/TestDummies/DummyRollingFileSink.cs
@@ -8,7 +8,9 @@ namespace TestDummies
     public class DummyRollingFileSink : ILogEventSink
     {
         [ThreadStatic]
+        // ReSharper disable ThreadStaticFieldHasInitializer
         public static List<LogEvent> Emitted = new List<LogEvent>();
+        // ReSharper restore ThreadStaticFieldHasInitializer
 
         public void Emit(LogEvent logEvent)
         {

diff --git a/test/TestDummies/DummyWithLevelSwitchSink.cs b/test/TestDummies/DummyWithLevelSwitchSink.cs
@@ -16,7 +16,9 @@ public DummyWithLevelSwitchSink(LoggingLevelSwitch loggingControlLevelSwitch)
         public static LoggingLevelSwitch ControlLevelSwitch;
 
         [ThreadStatic]
+        // ReSharper disable ThreadStaticFieldHasInitializer
         public static List<LogEvent> Emitted = new List<LogEvent>();
+        // ReSharper restore ThreadStaticFieldHasInitializer
 
         public void Emit(LogEvent logEvent)
         {

diff --git a/test/TestDummies/DummyWrappingSink.cs b/test/TestDummies/DummyWrappingSink.cs
@@ -8,7 +8,9 @@ namespace TestDummies
     public class DummyWrappingSink : ILogEventSink
     {
         [ThreadStatic]
+        // ReSharper disable ThreadStaticFieldHasInitializer
         public static List<LogEvent> Emitted = new List<LogEvent>();
+        // ReSharper restore ThreadStaticFieldHasInitializer
 
         private readonly ILogEventSink _sink;
 
@@ -23,4 +25,4 @@ public void Emit(LogEvent logEvent)
             _sink.Emit(logEvent);
         }
     }
-}
+}