Fix potential NullReferenceException in OperatorIsCanBeUsedIssue.

1 files changed, 6 insertions, 17 deletions

diff --git a/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs b/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs
index 47e86ec0..bed5eb33 100644
--- a/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs
+++ b/ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Synced/CodeQuality/OperatorIsCanBeUsedIssue.cs
@@ -24,6 +24,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.using System;
 
+using System.Linq;
 using ICSharpCode.NRefactory.PatternMatching;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.NRefactory.Semantics;
@@ -64,25 +65,13 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
 				if (!m.Success)
 					return;
 
-				Expression identifier = null;
-				AstType type = null;
-
-				if (binaryOperatorExpression.Left is TypeOfExpression && binaryOperatorExpression.Right is InvocationExpression) {
-					type = (binaryOperatorExpression.Left as TypeOfExpression).Type;
-					var right = binaryOperatorExpression.Right as InvocationExpression;
-					identifier = (right.Target as MemberReferenceExpression).Target;
-				} else if (binaryOperatorExpression.Right is TypeOfExpression && binaryOperatorExpression.Left is InvocationExpression) {
-					type = (binaryOperatorExpression.Right as TypeOfExpression).Type;
-					var left = binaryOperatorExpression.Left as InvocationExpression;
-					identifier = (left.Target as MemberReferenceExpression).Target;
-				} else
-					return;
-
-				if (identifier == null || type == null)
+				Expression identifier = m.Get<Expression>("a").Single();
+				AstType type = m.Get<AstType>("b").Single();
+				
+				var typeResolved = ctx.Resolve(type) as TypeResolveResult;
+				if (typeResolved == null)
 					return;
 
-				var typeResolved = ctx.Resolve(type) as TypeResolveResult; 
-
 				if (typeResolved.Type.Kind == TypeKind.Class) {
 					if (!typeResolved.Type.GetDefinition().IsSealed) {
 						return;