Browse Source

Location of global attributes was wrong.

Fixed for tests - should be inserted like the comments for the real
fix.
newNRvisualizers
Mike Krüger 15 years ago
parent
commit
2ba4a181b0
  1. 7
      ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs

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

@ -241,7 +241,6 @@ namespace ICSharpCode.NRefactory.CSharp
{ {
if (optAttributes == null) if (optAttributes == null)
return null; return null;
AttributeSection result = new AttributeSection (); AttributeSection result = new AttributeSection ();
var loc = LocationsBag.GetLocations (optAttributes); var loc = LocationsBag.GetLocations (optAttributes);
if (loc != null) if (loc != null)
@ -267,8 +266,8 @@ namespace ICSharpCode.NRefactory.CSharp
nDecl.AddChild (new CSharpTokenNode (Convert (nspace.OpenBrace), 1), NamespaceDeclaration.Roles.LBrace); nDecl.AddChild (new CSharpTokenNode (Convert (nspace.OpenBrace), 1), NamespaceDeclaration.Roles.LBrace);
AddToNamespace (nDecl); AddToNamespace (nDecl);
namespaceStack.Push (nDecl); namespaceStack.Push (nDecl);
} }
VisitNamespaceUsings (nspace); VisitNamespaceUsings (nspace);
VisitNamespaceBody (nspace); VisitNamespaceBody (nspace);
@ -3252,8 +3251,8 @@ namespace ICSharpCode.NRefactory.CSharp
if (top == null) if (top == null)
return null; return null;
CSharpParser.ConversionVisitor conversionVisitor = new ConversionVisitor (convertTypeSystemMode, top.LocationsBag); CSharpParser.ConversionVisitor conversionVisitor = new ConversionVisitor (convertTypeSystemMode, top.LocationsBag);
conversionVisitor.AddAttributeSection (conversionVisitor.Unit, top.ModuleCompiled);
top.UsingsBag.Global.Accept (conversionVisitor); top.UsingsBag.Global.Accept (conversionVisitor);
conversionVisitor.AddAttributeSection (conversionVisitor.Unit, top.ModuleCompiled);
InsertComments (top, conversionVisitor); InsertComments (top, conversionVisitor);
return conversionVisitor.Unit; return conversionVisitor.Unit;
} }
@ -3325,8 +3324,8 @@ namespace ICSharpCode.NRefactory.CSharp
if (top == null) if (top == null)
return null; return null;
CSharpParser.ConversionVisitor conversionVisitor = new ConversionVisitor (GenerateTypeSystemMode, top.LocationsBag); CSharpParser.ConversionVisitor conversionVisitor = new ConversionVisitor (GenerateTypeSystemMode, top.LocationsBag);
conversionVisitor.AddAttributeSection (conversionVisitor.Unit, top.ModuleCompiled);
top.UsingsBag.Global.Accept (conversionVisitor); top.UsingsBag.Global.Accept (conversionVisitor);
conversionVisitor.AddAttributeSection (conversionVisitor.Unit, top.ModuleCompiled);
InsertComments (top, conversionVisitor); InsertComments (top, conversionVisitor);
if (CompilationUnitCallback != null) if (CompilationUnitCallback != null)
CompilationUnitCallback (top); CompilationUnitCallback (top);

Loading…
Cancel
Save