[Formatting] Checked token for null, before using the parent.

icsharpcode · Apr 18, 2012 · 1a1487f · 1a1487f
1 parent 6d1e90b
commit 1a1487f
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs b/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
@@ -874,8 +874,10 @@ void FormatParameters(AstNode node)
 				}
 				ForceSpacesBeforeRemoveNewLines(rParToken, spaceWithinMethodCallParentheses);
 			}
-			foreach (CSharpTokenNode comma in rParToken.Parent.Children.Where(n => n.Role == Roles.Comma)) {
+			if (!rParToken.IsNull) {
-				ForceSpacesBefore(comma, spaceBeforeMethodCallParameterComma);
+				foreach (CSharpTokenNode comma in rParToken.Parent.Children.Where(n => n.Role == Roles.Comma)) {
+					ForceSpacesBefore(comma, spaceBeforeMethodCallParameterComma);
+				}
 			}
 		}
 
@@ -1777,8 +1779,10 @@ void FormatArguments(AstNode node)
 				}
 				ForceSpacesBeforeRemoveNewLines(rParToken, spaceWithinMethodCallParentheses);
 			}
-			foreach (CSharpTokenNode comma in rParToken.Parent.Children.Where(n => n.Role == Roles.Comma)) {
+			if (!rParToken.IsNull) {
-				ForceSpacesBefore(comma, spaceBeforeMethodCallParameterComma);
+				foreach (CSharpTokenNode comma in rParToken.Parent.Children.Where(n => n.Role == Roles.Comma)) {
+					ForceSpacesBefore(comma, spaceBeforeMethodCallParameterComma);
+				}
 			}
 		}