Merge pull request #468 from sharwell/fix-464

Fix InvalidCastException in PrefixLocalCallsWithThis
DotNetAnalyzers · Feb 9, 2015 · f57ad1b · f57ad1b
2 parents e67cb76 + 97b2a1f
commit f57ad1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1101UnitTests.cs b/StyleCop.Analyzers/StyleCop.Analyzers.Test/ReadabilityRules/SA1101UnitTests.cs
@@ -121,6 +121,10 @@ public void InstanceMethodName(int ParameterName)
                     BaseInstanceFieldName = BaseInstanceFieldName,
                     BaseInstancePropertyName = BaseInstancePropertyName,
                 }
+
+                // the following line is a regression test for #464
+                // https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/464
+                var conditional = this?.BaseInstanceFieldName;
             }
         }
         ";
@@ -232,6 +236,10 @@ public void InstanceMethodName(int ParameterName)
                     BaseInstanceFieldName = this.BaseInstanceFieldName,
                     BaseInstancePropertyName = this.BaseInstancePropertyName,
                 }
+
+                // the following line is a regression test for #464
+                // https://github.com/DotNetAnalyzers/StyleCopAnalyzers/issues/464
+                var conditional = this?.BaseInstanceFieldName;
             }
         }
         ";

diff --git a/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1101PrefixLocalCallsWithThis.cs b/StyleCop.Analyzers/StyleCop.Analyzers/ReadabilityRules/SA1101PrefixLocalCallsWithThis.cs
@@ -113,6 +113,10 @@ private void HandleIdentifierName(SyntaxNodeAnalysisContext context)
 
                 break;
 
+            case SyntaxKind.MemberBindingExpression:
+                // this doesn't need to be handled
+                return;
+
             default:
                 break;
             }
-Original file line number
+Diff line change
@@ Expand Up @@
                     break;
+                case SyntaxKind.MemberBindingExpression:
+                    // this doesn't need to be handled
+                    return;
                 default:
                     break;
                 }
@@ Expand Down @@