Browse Source

Fixed anonymous type null reference exception.

newNRvisualizers
Mike Krüger 14 years ago
parent
commit
45fb111271
  1. 4
      ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
  2. 2
      ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs

4
ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs

@ -336,7 +336,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion @@ -336,7 +336,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
wrapper.Append ('}');
TextLocation memberLocation;
if (currentMember != null && currentType.Kind != TypeKind.Enum) {
if (currentMember != null && currentType != null && currentType.Kind != TypeKind.Enum) {
memberLocation = currentMember.Region.Begin;
} else if (currentType != null) {
memberLocation = currentType.Region.Begin;
@ -365,7 +365,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion @@ -365,7 +365,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
protected Tuple<string, bool> GetMemberTextToCaret ()
{
int startOffset;
if (currentMember != null && currentType.Kind != TypeKind.Enum) {
if (currentMember != null && currentType != null && currentType.Kind != TypeKind.Enum) {
startOffset = document.GetOffset (currentMember.Region.BeginLine, currentMember.Region.BeginColumn);
} else if (currentType != null) {
startOffset = document.GetOffset (currentType.Region.BeginLine, currentType.Region.BeginColumn);

2
ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs

@ -2579,6 +2579,8 @@ namespace ICSharpCode.NRefactory.CSharp @@ -2579,6 +2579,8 @@ namespace ICSharpCode.NRefactory.CSharp
if (newAnonymousType.Parameters == null)
return result;
foreach (var par in newAnonymousType.Parameters) {
if (par == null)
continue;
var location = LocationsBag.GetLocations (par);
if (location == null) {

Loading…
Cancel
Save