Browse Source

Fix NullReferenceException in semantic highlighting.

pull/32/merge
Daniel Grunwald 13 years ago
parent
commit
6132821b2a
  1. 5
      ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs
  2. 6
      ICSharpCode.NRefactory.CSharp/Ast/AstNodeCollection.cs

5
ICSharpCode.NRefactory.CSharp/Analysis/SemanticHighlightingVisitor.cs

@ -289,8 +289,11 @@ namespace ICSharpCode.NRefactory.CSharp.Analysis
{ {
if (member.EntityType != EntityType.Method || member.ReturnType.Kind != TypeKind.Void) if (member.EntityType != EntityType.Method || member.ReturnType.Kind != TypeKind.Void)
return false; return false;
while (member.IsOverride) while (member.IsOverride) {
member = (IParameterizedMember)InheritanceHelper.GetBaseMember(member); member = (IParameterizedMember)InheritanceHelper.GetBaseMember(member);
if (member == null)
return false;
}
return IsInactiveConditional(member.Attributes); return IsInactiveConditional(member.Attributes);
} }

6
ICSharpCode.NRefactory.CSharp/Ast/AstNodeCollection.cs

@ -28,7 +28,11 @@ namespace ICSharpCode.NRefactory.CSharp
/// <summary> /// <summary>
/// Represents the children of an AstNode that have a specific role. /// Represents the children of an AstNode that have a specific role.
/// </summary> /// </summary>
public class AstNodeCollection<T> : ICollection<T> where T : AstNode public class AstNodeCollection<T> : ICollection<T>
#if NET_4_5
, IReadOnlyCollection<T>
#endif
where T : AstNode
{ {
readonly AstNode node; readonly AstNode node;
readonly Role<T> role; readonly Role<T> role;

Loading…
Cancel
Save