#5 extract BaseCallbackWarning

Abc-Arbitrage · Apr 2, 2020 · bb86d9d · bb86d9d
1 parent 23b34a3
commit bb86d9d
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 37 deletions.
diff --git a/Abc.MoqComplete/Abc.MoqComplete/CodeAnalysis/AutoMockerSuspiciousCallbackWarning.cs b/Abc.MoqComplete/Abc.MoqComplete/CodeAnalysis/AutoMockerSuspiciousCallbackWarning.cs
@@ -5,27 +5,11 @@
 namespace Abc.MoqComplete.CodeAnalysis
 {
 	[StaticSeverityHighlighting(Severity.WARNING, HighlightingGroupIds.GutterMarksGroup)]
-	public class AutoMockerSuspiciousCallbackWarning : IHighlighting
+	public sealed class AutoMockerSuspiciousCallbackWarning : BaseCallbackWarning
 	{
-		private readonly DocumentRange _documentRange;
-
 		public AutoMockerSuspiciousCallbackWarning(IInvocationExpression element, DocumentRange documentRange)
+			: base("AutoMocker suspicious Callback method call: Generic types do not match", documentRange)
 		{
-			_documentRange = documentRange;
 		}
-
-		public bool IsValid()
-		{
-			return true;
-		}
-
-		public DocumentRange CalculateRange()
-		{
-			return _documentRange;
-		}
-
-		public string ToolTip => "AutoMocker suspicious Callback method call: Generic types do not match";
-
-		public string ErrorStripeToolTip { get; }
 	}
 }
diff --git a/Abc.MoqComplete/Abc.MoqComplete/CodeAnalysis/BaseCallbackWarning.cs b/Abc.MoqComplete/Abc.MoqComplete/CodeAnalysis/BaseCallbackWarning.cs
@@ -0,0 +1,25 @@
+using JetBrains.DocumentModel;
+using JetBrains.ReSharper.Feature.Services.Daemon;
+
+namespace Abc.MoqComplete.CodeAnalysis
+{
+	public abstract class BaseCallbackWarning : IHighlighting
+	{
+		private readonly DocumentRange _documentRange;
+
+		protected BaseCallbackWarning(string toolTip, DocumentRange documentRange)
+		{
+			_documentRange = documentRange;
+			ToolTip = toolTip;
+		}
+
+		public bool IsValid() => true;
+
+		public DocumentRange CalculateRange() => _documentRange;
+
+		/// <inheritdoc />
+		public string ToolTip { get; }
+
+		public string ErrorStripeToolTip { get; }
+	}
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete/CodeAnalysis/SuspiciousCallbackWarning.cs b/Abc.MoqComplete/Abc.MoqComplete/CodeAnalysis/SuspiciousCallbackWarning.cs
@@ -4,21 +4,12 @@
 
 namespace Abc.MoqComplete.CodeAnalysis
 {
-    [StaticSeverityHighlighting(Severity.WARNING, HighlightingGroupIds.GutterMarksGroup)]
-    public class SuspiciousCallbackWarning : IHighlighting
-    {
-        private readonly DocumentRange _documentRange;
-
-        public SuspiciousCallbackWarning(IInvocationExpression element, DocumentRange documentRange)
-        {
-            _documentRange = documentRange;
-        }
-
-        public bool IsValid() => true;
-
-        public DocumentRange CalculateRange() => _documentRange;
-
-        public string ToolTip => "Suspicious Callback method call: Generic types do not match";
-        public string ErrorStripeToolTip { get; }
-    }
-}
+	[StaticSeverityHighlighting(Severity.WARNING, HighlightingGroupIds.GutterMarksGroup)]
+	public sealed class SuspiciousCallbackWarning : BaseCallbackWarning
+	{
+		public SuspiciousCallbackWarning(IInvocationExpression element, DocumentRange documentRange)
+			: base("Suspicious Callback method call: Generic types do not match", documentRange)
+		{
+		}
+	}
+}
diff --git a/Abc.MoqComplete/Abc.MoqComplete/Services/BaseMethodProvider.cs b/Abc.MoqComplete/Abc.MoqComplete/Services/BaseMethodProvider.cs
@@ -42,7 +42,7 @@ public IEnumerable<string> GetMockedMethodParameterTypes(IInvocationExpression i
 		{
 			var mockedMethod = GetMockedMethodFromSetupMethod(invocation);
 			var methodInvocation = GetMockedMethodInvocation(invocation);
-			var substitution = methodInvocation?.Reference?.Resolve()?.Substitution;
+			var substitution = methodInvocation?.Reference?.Resolve().Substitution;
 
 			return mockedMethod.Parameters.Select(p =>
 			{