pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

try revert critical method

newNRvisualizers
Alex Mizuki 14 years ago
parent
9d29131bc0
commit
aff71a5d53
1 changed files with 78 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs

82
ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
Unescape View File

@ -2706,70 +2706,82 @@ namespace ICSharpCode.NRefactory.CSharp
return result; return result;
} }
ArrayInitializerExpression ConvertCollectionOrObjectInitializers (CollectionOrObjectInitializers minit) ArrayInitializerExpression ConvertCollectionOrObjectInitializers(CollectionOrObjectInitializers minit)
{ {
if (minit == null) if (minit == null)
return null; return null;
var init = new ArrayInitializerExpression (); var init = new ArrayInitializerExpression();
AddConvertCollectionOrObjectInitializers (init, minit); AddConvertCollectionOrObjectInitializers(init, minit);
return init; return init;
} }
void AddConvertCollectionOrObjectInitializers (Expression init, CollectionOrObjectInitializers minit) void AddConvertCollectionOrObjectInitializers(Expression init, CollectionOrObjectInitializers minit)
{ {
var initLoc = LocationsBag.GetLocations (minit); var initLoc = LocationsBag.GetLocations(minit);
var commaLoc = LocationsBag.GetLocations (minit.Initializers); var commaLoc = LocationsBag.GetLocations(minit.Initializers);
int curComma = 0; int curComma = 0;
if (initLoc != null) if (initLoc != null)
init.AddChild (new CSharpTokenNode (Convert (initLoc [0])), Roles.LBrace); init.AddChild(new CSharpTokenNode(Convert(initLoc[0])), Roles.LBrace);
foreach (var expr in minit.Initializers) { foreach (var expr in minit.Initializers)
{
var collectionInit = expr as CollectionElementInitializer; var collectionInit = expr as CollectionElementInitializer;
if (collectionInit != null) { if (collectionInit != null)
var parent = new ArrayInitializerExpression (); {
var parent = new ArrayInitializerExpression();
parent.AddChild (new CSharpTokenNode (Convert (expr.Location)), Roles.LBrace); var braceLocs = LocationsBag.GetLocations(expr);
if (braceLocs != null)
parent.AddChild(new CSharpTokenNode(Convert(braceLocs[0])), Roles.LBrace);
for (int i = 0; i < collectionInit.Arguments.Count; i++) { for (int i = 0; i < collectionInit.Arguments.Count; i++)
var arg = collectionInit.Arguments [i] as CollectionElementInitializer.ElementInitializerArgument; {
var arg = collectionInit.Arguments[i] as CollectionElementInitializer.ElementInitializerArgument;
if (arg == null) if (arg == null)
continue; continue;
parent.AddChild ((ICSharpCode.NRefactory.CSharp.Expression)arg.Expr.Accept (this), Roles.Expression); parent.AddChild((ICSharpCode.NRefactory.CSharp.Expression)arg.Expr.Accept(this), Roles.Expression);
} }
var braceLocs = LocationsBag.GetLocations (expr);
if (braceLocs != null) if (braceLocs != null)
parent.AddChild (new CSharpTokenNode (Convert (braceLocs [0])), Roles.RBrace); parent.AddChild(new CSharpTokenNode(Convert(braceLocs[1])), Roles.RBrace);
init.AddChild (parent, Roles.Expression); init.AddChild(parent, Roles.Expression);
} else { }
else
{
var eleInit = expr as ElementInitializer; var eleInit = expr as ElementInitializer;
if (eleInit != null) { if (eleInit != null)
var nexpr = new NamedExpression (); {
nexpr.AddChild (Identifier.Create (eleInit.Name, Convert (eleInit.Location)), Roles.Identifier); var nexpr = new NamedExpression();
var assignLoc = LocationsBag.GetLocations (eleInit); nexpr.AddChild(Identifier.Create(eleInit.Name, Convert(eleInit.Location)), Roles.Identifier);
var assignLoc = LocationsBag.GetLocations(eleInit);
if (assignLoc != null) if (assignLoc != null)
nexpr.AddChild (new CSharpTokenNode (Convert (assignLoc [0])), Roles.Assign); nexpr.AddChild(new CSharpTokenNode(Convert(assignLoc[0])), Roles.Assign);
if (eleInit.Source != null) { if (eleInit.Source != null)
if (eleInit.Source is CollectionOrObjectInitializers) { {
var arrInit = new ArrayInitializerExpression (); if (eleInit.Source is CollectionOrObjectInitializers)
AddConvertCollectionOrObjectInitializers (arrInit, eleInit.Source as CollectionOrObjectInitializers); {
nexpr.AddChild (arrInit, Roles.Expression); var arrInit = new ArrayInitializerExpression();
} else { AddConvertCollectionOrObjectInitializers(arrInit, eleInit.Source as CollectionOrObjectInitializers);
nexpr.AddChild ((Expression)eleInit.Source.Accept (this), Roles.Expression); nexpr.AddChild(arrInit, Roles.Expression);
}
else
{
nexpr.AddChild((Expression)eleInit.Source.Accept(this), Roles.Expression);
} }
} }
init.AddChild (nexpr, Roles.Expression); init.AddChild(nexpr, Roles.Expression);
} }
} }
if (commaLoc != null && curComma < commaLoc.Count) if (commaLoc != null && curComma < commaLoc.Count)
init.AddChild (new CSharpTokenNode (Convert (commaLoc [curComma++])), Roles.Comma); init.AddChild(new CSharpTokenNode(Convert(commaLoc[curComma++])), Roles.Comma);
} }
if (initLoc != null) { if (initLoc != null)
{
if (initLoc.Count == 3) // optional comma if (initLoc.Count == 3) // optional comma
init.AddChild (new CSharpTokenNode (Convert (initLoc [1])), Roles.Comma); init.AddChild(new CSharpTokenNode(Convert(initLoc[1])), Roles.Comma);
init.AddChild (new CSharpTokenNode (Convert (initLoc [initLoc.Count - 1])), Roles.RBrace); init.AddChild(new CSharpTokenNode(Convert(initLoc[initLoc.Count - 1])), Roles.RBrace);
} }
} }

Write Preview
Loading…
Cancel
Save