Browse Source

Rename 'cu' to 'syntaxTree'.

newNRvisualizers
Daniel Grunwald 13 years ago
parent
commit
eaba9798d3
  1. 4
      ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
  2. 12
      ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
  3. 6
      ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
  4. 4
      ICSharpCode.NRefactory.CSharp/Refactoring/DocumentScript.cs
  5. 18
      ICSharpCode.NRefactory.CSharp/Resolver/ResolveAtLocation.cs
  6. 4
      ICSharpCode.NRefactory.ConsistencyCheck/ResolverTest.cs
  7. 6
      ICSharpCode.NRefactory.ConsistencyCheck/RoundtripTest.cs
  8. 24
      ICSharpCode.NRefactory.ConsistencyCheck/VisitorBenchmark.cs
  9. 4
      ICSharpCode.NRefactory.Tests/CSharp/CodeDomConvertVisitorTests.cs
  10. 10
      ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/AttributeSectionTests.cs
  11. 6
      ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/NamespaceDeclarationTests.cs
  12. 36
      ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/PreprocessorDirectiveTests.cs
  13. 56
      ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/UsingDeclarationTests.cs
  14. 12
      ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseSelfTests.cs
  15. 4
      ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs
  16. 4
      ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/PropertyDeclarationTests.cs
  17. 6
      ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeSystemConvertVisitorTests.cs
  18. 4
      ICSharpCode.NRefactory.Tests/CSharp/Resolver/MemberLookupTests.cs
  19. 18
      ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs
  20. 4
      ICSharpCode.NRefactory.Tests/Documentation/CSharpCrefLookupTests.cs
  21. 4
      ICSharpCode.NRefactory.Tests/Documentation/CSharpDocumentationTests.cs
  22. 4
      ICSharpCode.NRefactory.Tests/Documentation/IDStringTests.cs

4
ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs

@ -200,8 +200,8 @@ namespace ICSharpCode.NRefactory.CSharp @@ -200,8 +200,8 @@ namespace ICSharpCode.NRefactory.CSharp
/// </summary>
public ICSharpCode.NRefactory.TypeSystem.DomRegion GetRegion()
{
var cu = (this.Ancestors.LastOrDefault() ?? this) as SyntaxTree;
string fileName = (cu != null ? cu.FileName : null);
var syntaxTree = (this.Ancestors.LastOrDefault() ?? this) as SyntaxTree;
string fileName = (syntaxTree != null ? syntaxTree.FileName : null);
return new ICSharpCode.NRefactory.TypeSystem.DomRegion(fileName, this.StartLocation, this.EndLocation);
}

12
ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

@ -1027,15 +1027,15 @@ namespace ICSharpCode.NRefactory.CSharp.Completion @@ -1027,15 +1027,15 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
IEnumerable<ICompletionData> HandleEnumContext()
{
var cu = ParseStub("a", false);
if (cu == null) {
var syntaxTree = ParseStub("a", false);
if (syntaxTree == null) {
return null;
}
var curType = cu.GetNodeAt<TypeDeclaration>(location);
var curType = syntaxTree.GetNodeAt<TypeDeclaration>(location);
if (curType == null || curType.ClassType != ClassType.Enum) {
cu = ParseStub("a {}", false);
var node = cu.GetNodeAt<AstType>(location);
syntaxTree = ParseStub("a {}", false);
var node = syntaxTree.GetNodeAt<AstType>(location);
if (node != null) {
var wrapper = new CompletionDataWrapper(this);
AddKeywords(wrapper, validEnumBaseTypes);
@ -1043,7 +1043,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion @@ -1043,7 +1043,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
}
}
var member = cu.GetNodeAt<EnumMemberDeclaration>(location);
var member = syntaxTree.GetNodeAt<EnumMemberDeclaration>(location);
if (member != null && member.NameToken.EndLocation < location) {
return DefaultControlSpaceItems();
}

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

@ -3806,10 +3806,10 @@ namespace ICSharpCode.NRefactory.CSharp @@ -3806,10 +3806,10 @@ namespace ICSharpCode.NRefactory.CSharp
public IEnumerable<EntityDeclaration> ParseTypeMembers (TextReader reader, int lineModifier = 0)
{
string code = "unsafe partial class MyClass { " + Environment.NewLine + reader.ReadToEnd () + "}";
var cu = Parse (new StringReader (code), "parsed.cs", lineModifier - 1);
if (cu == null)
var syntaxTree = Parse (new StringReader (code), "parsed.cs", lineModifier - 1);
if (syntaxTree == null)
return Enumerable.Empty<EntityDeclaration> ();
var td = cu.FirstChild as TypeDeclaration;
var td = syntaxTree.FirstChild as TypeDeclaration;
if (td != null) {
var members = td.Members.ToArray();
// detach members from parent

4
ICSharpCode.NRefactory.CSharp/Refactoring/DocumentScript.cs

@ -98,9 +98,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -98,9 +98,9 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
public override void FormatText(AstNode node)
{
var segment = GetSegment(node);
var cu = SyntaxTree.Parse(currentDocument, "dummy.cs");
var syntaxTree = SyntaxTree.Parse(currentDocument, "dummy.cs");
var formatter = new AstFormattingVisitor(FormattingOptions, currentDocument, Options);
cu.AcceptVisitor(formatter);
syntaxTree.AcceptVisitor(formatter);
formatter.ApplyChanges(segment.Offset, segment.Length);
}

18
ICSharpCode.NRefactory.CSharp/Resolver/ResolveAtLocation.cs

@ -30,27 +30,27 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver @@ -30,27 +30,27 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
/// </summary>
public static class ResolveAtLocation
{
public static ResolveResult Resolve (ICompilation compilation, CSharpParsedFile parsedFile, CompilationUnit cu, TextLocation location,
public static ResolveResult Resolve (ICompilation compilation, CSharpParsedFile parsedFile, SyntaxTree syntaxTree, TextLocation location,
CancellationToken cancellationToken = default(CancellationToken))
{
return Resolve (new Lazy<ICompilation>(() => compilation), parsedFile, cu, location, cancellationToken);
return Resolve (new Lazy<ICompilation>(() => compilation), parsedFile, syntaxTree, location, cancellationToken);
}
public static ResolveResult Resolve(Lazy<ICompilation> compilation, CSharpParsedFile parsedFile, CompilationUnit cu, TextLocation location,
public static ResolveResult Resolve(Lazy<ICompilation> compilation, CSharpParsedFile parsedFile, SyntaxTree syntaxTree, TextLocation location,
CancellationToken cancellationToken = default(CancellationToken))
{
AstNode node;
return Resolve(compilation, parsedFile, cu, location, out node, cancellationToken);
return Resolve(compilation, parsedFile, syntaxTree, location, out node, cancellationToken);
}
public static ResolveResult Resolve (ICompilation compilation, CSharpParsedFile parsedFile, CompilationUnit cu, TextLocation location, out AstNode node,
public static ResolveResult Resolve (ICompilation compilation, CSharpParsedFile parsedFile, SyntaxTree syntaxTree, TextLocation location, out AstNode node,
CancellationToken cancellationToken = default(CancellationToken))
{
return Resolve (new Lazy<ICompilation>(() => compilation), parsedFile, cu, location, out node, cancellationToken);
return Resolve (new Lazy<ICompilation>(() => compilation), parsedFile, syntaxTree, location, out node, cancellationToken);
}
public static ResolveResult Resolve(Lazy<ICompilation> compilation, CSharpParsedFile parsedFile, CompilationUnit cu, TextLocation location, out AstNode node,
public static ResolveResult Resolve(Lazy<ICompilation> compilation, CSharpParsedFile parsedFile, SyntaxTree syntaxTree, TextLocation location, out AstNode node,
CancellationToken cancellationToken = default(CancellationToken))
{
node = cu.GetNodeAt(location);
node = syntaxTree.GetNodeAt(location);
if (node == null || node is ArrayInitializerExpression)
return null;
if (CSharpAstResolver.IsUnresolvableNode(node)) {
@ -96,7 +96,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver @@ -96,7 +96,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
}
// TODO: I think we should provide an overload so that an existing CSharpAstResolver can be reused
CSharpAstResolver resolver = new CSharpAstResolver(compilation.Value, cu, parsedFile);
CSharpAstResolver resolver = new CSharpAstResolver(compilation.Value, syntaxTree, parsedFile);
ResolveResult rr = resolver.Resolve(node, cancellationToken);
if (rr is MethodGroupResolveResult && parentInvocation != null)
return resolver.Resolve(parentInvocation);

4
ICSharpCode.NRefactory.ConsistencyCheck/ResolverTest.cs

@ -88,9 +88,9 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck @@ -88,9 +88,9 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
}
}
public virtual void Validate(CSharpAstResolver resolver, SyntaxTree cu)
public virtual void Validate(CSharpAstResolver resolver, SyntaxTree syntaxTree)
{
foreach (AstNode node in cu.DescendantsAndSelf.Except(resolvedNodes.Keys)) {
foreach (AstNode node in syntaxTree.DescendantsAndSelf.Except(resolvedNodes.Keys)) {
if (!CSharpAstResolver.IsUnresolvableNode(node)) {
Console.WriteLine("Forgot to resolve " + node);
}

6
ICSharpCode.NRefactory.ConsistencyCheck/RoundtripTest.cs

@ -63,13 +63,13 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck @@ -63,13 +63,13 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
public static void Roundtrip(CSharpParser parser, string fileName, string code)
{
// 1. Parse
SyntaxTree cu = parser.Parse(code, fileName);
SyntaxTree syntaxTree = parser.Parse(code, fileName);
if (parser.HasErrors)
throw new InvalidOperationException("There were parse errors.");
// 2. Output
StringWriter w = new StringWriter();
cu.AcceptVisitor(new CSharpOutputVisitor(w, FormattingOptionsFactory.CreateMono ()));
syntaxTree.AcceptVisitor(new CSharpOutputVisitor(w, FormattingOptionsFactory.CreateMono ()));
string generatedCode = w.ToString().TrimEnd();
// 3. Compare output with original (modulo whitespaces)
@ -108,7 +108,7 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck @@ -108,7 +108,7 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
}
// 5. Compare AST1 with AST2
if (!cu.IsMatch(generatedCU))
if (!syntaxTree.IsMatch(generatedCU))
throw new InvalidOperationException("AST match failed for " + fileName + ".");
}
}

24
ICSharpCode.NRefactory.ConsistencyCheck/VisitorBenchmark.cs

@ -34,26 +34,26 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck @@ -34,26 +34,26 @@ namespace ICSharpCode.NRefactory.ConsistencyCheck
{
files = files.ToList();
RunTest("recursive method using for", files, (cu, list) => WalkTreeFor(cu, list));
RunTest("recursive method using foreach", files, (cu, list) => WalkTreeForEach(cu, list));
RunTest("non-recursive loop", files, (cu, list) => WalkTreeNonRecursive(cu, list));
RunTest("foreach over Descendants.OfType()", files, (cu, list) => {
foreach (var node in cu.Descendants.OfType<IdentifierExpression>()) {
RunTest("recursive method using for", files, (syntaxTree, list) => WalkTreeFor(syntaxTree, list));
RunTest("recursive method using foreach", files, (syntaxTree, list) => WalkTreeForEach(syntaxTree, list));
RunTest("non-recursive loop", files, (syntaxTree, list) => WalkTreeNonRecursive(syntaxTree, list));
RunTest("foreach over Descendants.OfType()", files, (syntaxTree, list) => {
foreach (var node in syntaxTree.Descendants.OfType<IdentifierExpression>()) {
list.Add(node);
}
});
RunTest("DepthFirstAstVisitor", files, (cu, list) => cu.AcceptVisitor(new DepthFirst(list)));
RunTest("DepthFirstAstVisitor<object>", files, (cu, list) => cu.AcceptVisitor(new DepthFirst<object>(list)));
RunTest("DepthFirstAstVisitor<object, object>", files, (cu, list) => cu.AcceptVisitor(new DepthFirst<object, object>(list), null));
RunTest("ObservableAstVisitor", files, (cu, list) => {
RunTest("DepthFirstAstVisitor", files, (syntaxTree, list) => syntaxTree.AcceptVisitor(new DepthFirst(list)));
RunTest("DepthFirstAstVisitor<object>", files, (syntaxTree, list) => syntaxTree.AcceptVisitor(new DepthFirst<object>(list)));
RunTest("DepthFirstAstVisitor<object, object>", files, (syntaxTree, list) => syntaxTree.AcceptVisitor(new DepthFirst<object, object>(list), null));
RunTest("ObservableAstVisitor", files, (syntaxTree, list) => {
var visitor = new ObservableAstVisitor();
visitor.EnterIdentifierExpression += list.Add;
cu.AcceptVisitor(visitor);
syntaxTree.AcceptVisitor(visitor);
});
RunTest("ObservableAstVisitor<object, object>", files, (cu, list) => {
RunTest("ObservableAstVisitor<object, object>", files, (syntaxTree, list) => {
var visitor = new ObservableAstVisitor<object, object>();
visitor.IdentifierExpressionVisited += (id, data) => list.Add(id);
cu.AcceptVisitor(visitor, null);
syntaxTree.AcceptVisitor(visitor, null);
});
}

4
ICSharpCode.NRefactory.Tests/CSharp/CodeDomConvertVisitorTests.cs

@ -110,9 +110,9 @@ namespace ICSharpCode.NRefactory.CSharp @@ -110,9 +110,9 @@ namespace ICSharpCode.NRefactory.CSharp
string ConvertTypeDeclaration(string code)
{
CSharpParser parser = new CSharpParser();
var cu = parser.Parse(new StringReader(code), "program.cs");
var syntaxTree = parser.Parse(new StringReader(code), "program.cs");
Assert.IsFalse(parser.HasErrors);
return ConvertTypeDeclaration((EntityDeclaration)cu.Children.Single());
return ConvertTypeDeclaration((EntityDeclaration)syntaxTree.Children.Single());
}
#endregion

10
ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/AttributeSectionTests.cs

@ -197,27 +197,27 @@ public class Form1 { @@ -197,27 +197,27 @@ public class Form1 {
[Test]
public void AssemblyAttributeBeforeNamespace()
{
var cu = new CSharpParser().Parse(new StringReader("using System; [assembly: Attr] namespace X {}"), "code.cs");
var syntaxTree = new CSharpParser().Parse(new StringReader("using System; [assembly: Attr] namespace X {}"), "code.cs");
Assert.AreEqual(
new Type[] {
typeof(UsingDeclaration),
typeof(AttributeSection),
typeof(NamespaceDeclaration)
}, cu.Children.Select(c => c.GetType()).ToArray());
}, syntaxTree.Children.Select(c => c.GetType()).ToArray());
}
[Ignore("Fixme!")]
[Test]
public void AssemblyAttributeBeforeClass()
{
var cu = new CSharpParser().Parse(new StringReader("using System; [assembly: Attr] class X {}"), "code.cs");
var syntaxTree = new CSharpParser().Parse(new StringReader("using System; [assembly: Attr] class X {}"), "code.cs");
Assert.AreEqual(
new Type[] {
typeof(UsingDeclaration),
typeof(AttributeSection),
typeof(TypeDeclaration)
}, cu.Children.Select(c => c.GetType()).ToArray());
Assert.That(((TypeDeclaration)cu.LastChild).Attributes, Is.Empty);
}, syntaxTree.Children.Select(c => c.GetType()).ToArray());
Assert.That(((TypeDeclaration)syntaxTree.LastChild).Attributes, Is.Empty);
}
}
}

6
ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/NamespaceDeclarationTests.cs

@ -53,15 +53,15 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope @@ -53,15 +53,15 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
public void ExternAliasTest()
{
string program = "extern alias X; extern alias Y; using X::System; namespace TestNamespace { extern alias Z; using Y::System; }";
var cu = new CSharpParser().Parse(new StringReader(program), "code.cs");
var syntaxTree = new CSharpParser().Parse(new StringReader(program), "code.cs");
Assert.AreEqual(
new Type[] {
typeof(ExternAliasDeclaration),
typeof(ExternAliasDeclaration),
typeof(UsingDeclaration),
typeof(NamespaceDeclaration)
}, cu.Children.Select(c => c.GetType()).ToArray());
var namespaceMembers = ((NamespaceDeclaration)cu.LastChild).Members;
}, syntaxTree.Children.Select(c => c.GetType()).ToArray());
var namespaceMembers = ((NamespaceDeclaration)syntaxTree.LastChild).Members;
Assert.AreEqual(
new Type[] {
typeof(ExternAliasDeclaration),

36
ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/PreprocessorDirectiveTests.cs

@ -145,7 +145,7 @@ class B { } @@ -145,7 +145,7 @@ class B { }
public void ElifBothFalse()
{
CSharpParser parser = new CSharpParser();
var cu = parser.Parse(elifProgram, "elif.cs");
var syntaxTree = parser.Parse(elifProgram, "elif.cs");
Assert.IsFalse(parser.HasErrors);
Assert.AreEqual(new Role[] {
@ -154,13 +154,13 @@ class B { } @@ -154,13 +154,13 @@ class B { }
Roles.PreProcessorDirective,
Roles.Comment,
Roles.PreProcessorDirective
}, cu.Children.Select(c => c.Role).ToArray());
var aaa = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
}, syntaxTree.Children.Select(c => c.Role).ToArray());
var aaa = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
Assert.IsFalse(aaa.Take);
Assert.AreEqual(PreProcessorDirectiveType.If, aaa.Type);
Assert.AreEqual("AAA", aaa.Argument);
var bbb = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
var bbb = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
Assert.IsFalse(bbb.Take);
Assert.AreEqual(PreProcessorDirectiveType.Elif, bbb.Type);
Assert.AreEqual("BBB", bbb.Argument);
@ -172,7 +172,7 @@ class B { } @@ -172,7 +172,7 @@ class B { }
{
CSharpParser parser = new CSharpParser();
parser.CompilerSettings.ConditionalSymbols.Add("AAA");
var cu = parser.Parse(elifProgram, "elif.cs");
var syntaxTree = parser.Parse(elifProgram, "elif.cs");
Assert.IsFalse(parser.HasErrors);
Assert.AreEqual(new Role[] {
@ -181,13 +181,13 @@ class B { } @@ -181,13 +181,13 @@ class B { }
Roles.PreProcessorDirective,
Roles.Comment,
Roles.PreProcessorDirective
}, cu.Children.Select(c => c.Role).ToArray());
var aaa = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
}, syntaxTree.Children.Select(c => c.Role).ToArray());
var aaa = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
Assert.IsTrue(aaa.Take);
Assert.AreEqual(PreProcessorDirectiveType.If, aaa.Type);
Assert.AreEqual("AAA", aaa.Argument);
var bbb = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
var bbb = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
Assert.IsFalse(bbb.Take);
Assert.AreEqual(PreProcessorDirectiveType.Elif, bbb.Type);
Assert.AreEqual("BBB", bbb.Argument);
@ -199,7 +199,7 @@ class B { } @@ -199,7 +199,7 @@ class B { }
{
CSharpParser parser = new CSharpParser();
parser.CompilerSettings.ConditionalSymbols.Add("AAA");
var cu = parser.Parse(elifProgram, "elif.cs");
var syntaxTree = parser.Parse(elifProgram, "elif.cs");
Assert.IsFalse(parser.HasErrors);
Assert.AreEqual(new Role[] {
@ -208,13 +208,13 @@ class B { } @@ -208,13 +208,13 @@ class B { }
Roles.PreProcessorDirective,
Roles.Comment,
Roles.PreProcessorDirective
}, cu.Children.Select(c => c.Role).ToArray());
var aaa = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
}, syntaxTree.Children.Select(c => c.Role).ToArray());
var aaa = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
Assert.IsTrue(aaa.Take);
Assert.AreEqual(PreProcessorDirectiveType.If, aaa.Type);
Assert.AreEqual("AAA", aaa.Argument);
var bbb = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
var bbb = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
Assert.IsFalse(bbb.Take);
Assert.AreEqual(PreProcessorDirectiveType.Elif, bbb.Type);
Assert.AreEqual("BBB", bbb.Argument);
@ -225,7 +225,7 @@ class B { } @@ -225,7 +225,7 @@ class B { }
{
CSharpParser parser = new CSharpParser();
parser.CompilerSettings.ConditionalSymbols.Add("BBB");
var cu = parser.Parse(elifProgram, "elif.cs");
var syntaxTree = parser.Parse(elifProgram, "elif.cs");
Assert.IsFalse(parser.HasErrors);
Assert.AreEqual(new Role[] {
@ -234,13 +234,13 @@ class B { } @@ -234,13 +234,13 @@ class B { }
Roles.PreProcessorDirective,
NamespaceDeclaration.MemberRole,
Roles.PreProcessorDirective
}, cu.Children.Select(c => c.Role).ToArray());
var aaa = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
}, syntaxTree.Children.Select(c => c.Role).ToArray());
var aaa = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(0);
Assert.IsFalse(aaa.Take);
Assert.AreEqual(PreProcessorDirectiveType.If, aaa.Type);
Assert.AreEqual("AAA", aaa.Argument);
var bbb = cu.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
var bbb = syntaxTree.GetChildrenByRole(Roles.PreProcessorDirective).ElementAt(1);
Assert.IsTrue(bbb.Take);
Assert.AreEqual(PreProcessorDirectiveType.Elif, bbb.Type);
Assert.AreEqual("BBB", bbb.Argument);
@ -261,8 +261,8 @@ class C {}"; @@ -261,8 +261,8 @@ class C {}";
CSharpParser parser = new CSharpParser();
parser.CompilerSettings.ConditionalSymbols.Add("AAA");
parser.CompilerSettings.ConditionalSymbols.Add("BBB");
var cu = parser.Parse(program, "elif.cs");
Assert.AreEqual(new[] { "BBB", "CCC" }, cu.ConditionalSymbols);
var syntaxTree = parser.Parse(program, "elif.cs");
Assert.AreEqual(new[] { "BBB", "CCC" }, syntaxTree.ConditionalSymbols);
}
}
}

56
ICSharpCode.NRefactory.Tests/CSharp/Parser/GeneralScope/UsingDeclarationTests.cs

@ -31,8 +31,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope @@ -31,8 +31,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
{
string program = "using\n";
CSharpParser parser = new CSharpParser();
SyntaxTree cu = parser.Parse (program, "parsed.cs");
Assert.AreEqual(0, cu.Children.Count());
SyntaxTree syntaxTree = parser.Parse (program, "parsed.cs");
Assert.AreEqual(0, syntaxTree.Children.Count());
Assert.IsTrue(parser.HasErrors);
}
@ -42,18 +42,18 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope @@ -42,18 +42,18 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
string program = "using System;\n" +
"using My.Name.Space;\n";
CSharpParser parser = new CSharpParser();
SyntaxTree cu = parser.Parse(new StringReader(program), "parsed.cs");
SyntaxTree syntaxTree = parser.Parse(new StringReader(program), "parsed.cs");
Assert.IsFalse(parser.HasErrors);
Assert.AreEqual(2, cu.Children.Count());
Assert.IsTrue(cu.Children.ElementAt(0) is UsingDeclaration);
Assert.IsFalse(cu.Children.ElementAt(0) is UsingAliasDeclaration);
UsingDeclaration ud = (UsingDeclaration)cu.Children.ElementAt(0);
Assert.AreEqual(2, syntaxTree.Children.Count());
Assert.IsTrue(syntaxTree.Children.ElementAt(0) is UsingDeclaration);
Assert.IsFalse(syntaxTree.Children.ElementAt(0) is UsingAliasDeclaration);
UsingDeclaration ud = (UsingDeclaration)syntaxTree.Children.ElementAt(0);
Assert.AreEqual("System", ud.Namespace);
Assert.IsTrue(cu.Children.ElementAt(1) is UsingDeclaration);
Assert.IsFalse(cu.Children.ElementAt(1) is UsingAliasDeclaration);
ud = (UsingDeclaration)cu.Children.ElementAt(1);
Assert.IsTrue(syntaxTree.Children.ElementAt(1) is UsingDeclaration);
Assert.IsFalse(syntaxTree.Children.ElementAt(1) is UsingAliasDeclaration);
ud = (UsingDeclaration)syntaxTree.Children.ElementAt(1);
Assert.AreEqual("My.Name.Space", ud.Namespace);
}
@ -64,23 +64,23 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope @@ -64,23 +64,23 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
"using myAlias=My.Name.Space;\n" +
"using StringCollection = System.Collections.Generic.List<string>;\n";
CSharpParser parser = new CSharpParser();
SyntaxTree cu = parser.Parse(new StringReader(program), "parsed.cs");
SyntaxTree syntaxTree = parser.Parse(new StringReader(program), "parsed.cs");
Assert.IsFalse(parser.HasErrors);
Assert.AreEqual(3, cu.Children.Count());
Assert.AreEqual(3, syntaxTree.Children.Count());
Assert.IsTrue(cu.Children.ElementAt(0) is UsingAliasDeclaration);
UsingAliasDeclaration ud = (UsingAliasDeclaration)cu.Children.ElementAt(0);
Assert.IsTrue(syntaxTree.Children.ElementAt(0) is UsingAliasDeclaration);
UsingAliasDeclaration ud = (UsingAliasDeclaration)syntaxTree.Children.ElementAt(0);
Assert.AreEqual("TESTME", ud.Alias);
Assert.AreEqual("System", ud.Import.ToString());
Assert.IsTrue(cu.Children.ElementAt(1) is UsingAliasDeclaration);
ud = (UsingAliasDeclaration)cu.Children.ElementAt(1);
Assert.IsTrue(syntaxTree.Children.ElementAt(1) is UsingAliasDeclaration);
ud = (UsingAliasDeclaration)syntaxTree.Children.ElementAt(1);
Assert.AreEqual("myAlias", ud.Alias);
Assert.AreEqual("My.Name.Space", ud.Import.ToString());
Assert.IsTrue(cu.Children.ElementAt(2) is UsingAliasDeclaration);
ud = (UsingAliasDeclaration)cu.Children.ElementAt(2);
Assert.IsTrue(syntaxTree.Children.ElementAt(2) is UsingAliasDeclaration);
ud = (UsingAliasDeclaration)syntaxTree.Children.ElementAt(2);
Assert.AreEqual("StringCollection", ud.Alias);
Assert.AreEqual("System.Collections.Generic.List<string>", ud.Import.ToString());
}
@ -92,24 +92,24 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope @@ -92,24 +92,24 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.GeneralScope
"using myAlias=global::My.Name.Space;\n" +
"using a::b.c;\n";
CSharpParser parser = new CSharpParser();
SyntaxTree cu = parser.Parse(new StringReader(program), "parsed.cs");
SyntaxTree syntaxTree = parser.Parse(new StringReader(program), "parsed.cs");
Assert.IsFalse(parser.HasErrors);
Assert.AreEqual(3, cu.Children.Count());
Assert.AreEqual(3, syntaxTree.Children.Count());
Assert.IsTrue(cu.Children.ElementAt(0) is UsingDeclaration);
Assert.IsFalse(cu.Children.ElementAt(0) is UsingAliasDeclaration);
UsingDeclaration ud = (UsingDeclaration)cu.Children.ElementAt(0);
Assert.IsTrue(syntaxTree.Children.ElementAt(0) is UsingDeclaration);
Assert.IsFalse(syntaxTree.Children.ElementAt(0) is UsingAliasDeclaration);
UsingDeclaration ud = (UsingDeclaration)syntaxTree.Children.ElementAt(0);
Assert.AreEqual("global::System", ud.Namespace);
Assert.IsTrue(cu.Children.ElementAt(1) is UsingAliasDeclaration);
UsingAliasDeclaration uad = (UsingAliasDeclaration)cu.Children.ElementAt(1);
Assert.IsTrue(syntaxTree.Children.ElementAt(1) is UsingAliasDeclaration);
UsingAliasDeclaration uad = (UsingAliasDeclaration)syntaxTree.Children.ElementAt(1);
Assert.AreEqual("myAlias", uad.Alias);
Assert.AreEqual("global::My.Name.Space", uad.Import.ToString());
Assert.IsTrue(cu.Children.ElementAt(2) is UsingDeclaration);
Assert.IsFalse(cu.Children.ElementAt(2) is UsingAliasDeclaration);
ud = (UsingDeclaration)cu.Children.ElementAt(2);
Assert.IsTrue(syntaxTree.Children.ElementAt(2) is UsingDeclaration);
Assert.IsFalse(syntaxTree.Children.ElementAt(2) is UsingAliasDeclaration);
ud = (UsingDeclaration)syntaxTree.Children.ElementAt(2);
Assert.AreEqual("a::b.c", ud.Namespace);
}
}

12
ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseSelfTests.cs

@ -50,11 +50,11 @@ namespace ICSharpCode.NRefactory.CSharp.Parser @@ -50,11 +50,11 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
CSharpParser parser = new CSharpParser();
parser.GenerateTypeSystemMode = true;
foreach (string fileName in fileNames) {
SyntaxTree cu;
SyntaxTree syntaxTree;
using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.SequentialScan)) {
cu = parser.Parse(fs, fileName);
syntaxTree = parser.Parse(fs, fileName);
}
var parsedFile = cu.ToTypeSystem();
var parsedFile = syntaxTree.ToTypeSystem();
foreach (var td in parsedFile.GetAllTypeDefinitions()) {
Assert.AreSame(parsedFile, td.ParsedFile);
foreach (var member in td.Members) {
@ -76,12 +76,12 @@ namespace ICSharpCode.NRefactory.CSharp.Parser @@ -76,12 +76,12 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
CSharpParser parser = new CSharpParser();
foreach (string fileName in fileNames) {
this.currentDocument = new ReadOnlyDocument(File.ReadAllText(fileName));
SyntaxTree cu = parser.Parse(currentDocument.CreateReader(), fileName);
SyntaxTree syntaxTree = parser.Parse(currentDocument.CreateReader(), fileName);
if (parser.HasErrors)
continue;
this.currentFileName = fileName;
CheckPositionConsistency(cu);
CheckMissingTokens(cu);
CheckPositionConsistency(syntaxTree);
CheckMissingTokens(syntaxTree);
}
}

4
ICSharpCode.NRefactory.Tests/CSharp/Parser/ParseUtil.cs

@ -33,13 +33,13 @@ namespace ICSharpCode.NRefactory.CSharp.Parser @@ -33,13 +33,13 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
public static T ParseGlobal<T>(string code, bool expectErrors = false) where T : AstNode
{
CSharpParser parser = new CSharpParser();
SyntaxTree cu = parser.Parse(new StringReader(code), "parsed.cs");
SyntaxTree syntaxTree = parser.Parse(new StringReader(code), "parsed.cs");
foreach (var error in parser.Errors)
Console.WriteLine (error.Message);
Assert.AreEqual(expectErrors, parser.HasErrors, "HasErrors");
AstNode node = cu.Children.Single();
AstNode node = syntaxTree.Children.Single();
Type type = typeof(T);
Assert.IsTrue(type.IsAssignableFrom(node.GetType()), String.Format("Parsed node was {0} instead of {1} ({2})", node.GetType(), type, node));
return (T)node;

4
ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeMembers/PropertyDeclarationTests.cs

@ -72,8 +72,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.TypeMembers @@ -72,8 +72,8 @@ namespace ICSharpCode.NRefactory.CSharp.Parser.TypeMembers
int line4Pos = code.IndexOf("\t\tset");
CSharpParser parser = new CSharpParser();
SyntaxTree cu = parser.Parse(new StringReader(code), "parsed.cs");
PropertyDeclaration pd = (PropertyDeclaration)cu.Children.Single().GetChildByRole(Roles.TypeMemberRole);
SyntaxTree syntaxTree = parser.Parse(new StringReader(code), "parsed.cs");
PropertyDeclaration pd = (PropertyDeclaration)syntaxTree.Children.Single().GetChildByRole(Roles.TypeMemberRole);
Assert.AreEqual(new TextLocation(2, code.IndexOf("{\n\t\tget") - line2Pos + 1), pd.GetChildByRole(Roles.LBrace).StartLocation);
Assert.AreEqual(new TextLocation(5, 3), pd.EndLocation);
Assert.AreEqual(new TextLocation(3, code.IndexOf("{ return") - line3Pos + 1), pd.Getter.Body.StartLocation);

6
ICSharpCode.NRefactory.Tests/CSharp/Parser/TypeSystemConvertVisitorTests.cs

@ -42,12 +42,12 @@ namespace ICSharpCode.NRefactory.CSharp.Parser @@ -42,12 +42,12 @@ namespace ICSharpCode.NRefactory.CSharp.Parser
const string fileName = "TypeSystemTests.TestCase.cs";
CSharpParser parser = new CSharpParser();
SyntaxTree cu;
SyntaxTree syntaxTree;
using (Stream s = typeof(TypeSystemTests).Assembly.GetManifestResourceStream(typeof(TypeSystemTests), fileName)) {
cu = parser.Parse(s, fileName);
syntaxTree = parser.Parse(s, fileName);
}
var parsedFile = cu.ToTypeSystem();
var parsedFile = syntaxTree.ToTypeSystem();
return new CSharpProjectContent()
.UpdateProjectContent(null, parsedFile)
.AddAssemblyReferences(new[] { CecilLoaderTests.Mscorlib })

4
ICSharpCode.NRefactory.Tests/CSharp/Resolver/MemberLookupTests.cs

@ -40,8 +40,8 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver @@ -40,8 +40,8 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
CSharpParsedFile Parse(string program)
{
SyntaxTree cu = new CSharpParser().Parse(new StringReader(program), "test.cs");
CSharpParsedFile parsedFile = cu.ToTypeSystem();
SyntaxTree syntaxTree = new CSharpParser().Parse(new StringReader(program), "test.cs");
CSharpParsedFile parsedFile = syntaxTree.ToTypeSystem();
project = project.UpdateProjectContent(null, parsedFile);
compilation = project.CreateCompilation();
return parsedFile;

18
ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolverTestBase.cs

@ -161,19 +161,19 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver @@ -161,19 +161,19 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
protected Tuple<CSharpAstResolver, AstNode> PrepareResolver(string code)
{
SyntaxTree cu = new CSharpParser().Parse(new StringReader(code.Replace("$", "")), "code.cs");
SyntaxTree syntaxTree = new CSharpParser().Parse(new StringReader(code.Replace("$", "")), "code.cs");
TextLocation[] dollars = FindDollarSigns(code).ToArray();
Assert.AreEqual(2, dollars.Length, "Expected 2 dollar signs marking start+end of desired node");
SetUp();
CSharpParsedFile parsedFile = cu.ToTypeSystem();
CSharpParsedFile parsedFile = syntaxTree.ToTypeSystem();
project = project.UpdateProjectContent(null, parsedFile);
compilation = project.CreateCompilation();
CSharpAstResolver resolver = new CSharpAstResolver(compilation, cu, parsedFile);
return Tuple.Create(resolver, FindNode(cu, dollars[0], dollars[1]));
CSharpAstResolver resolver = new CSharpAstResolver(compilation, syntaxTree, parsedFile);
return Tuple.Create(resolver, FindNode(syntaxTree, dollars[0], dollars[1]));
}
protected ResolveResult Resolve(string code)
@ -212,10 +212,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver @@ -212,10 +212,10 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
return (T)rr;
}
protected AstNode FindNode(SyntaxTree cu, TextLocation start, TextLocation end)
protected AstNode FindNode(SyntaxTree syntaxTree, TextLocation start, TextLocation end)
{
FindNodeVisitor fnv = new FindNodeVisitor(start, end);
cu.AcceptVisitor(fnv);
syntaxTree.AcceptVisitor(fnv);
Assert.IsNotNull(fnv.ResultNode, "Did not find DOM node at the specified location");
return fnv.ResultNode;
}
@ -246,18 +246,18 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver @@ -246,18 +246,18 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver
protected ResolveResult ResolveAtLocation(string code)
{
SyntaxTree cu = new CSharpParser().Parse(new StringReader(code.Replace("$", "")), "test.cs");
SyntaxTree syntaxTree = new CSharpParser().Parse(new StringReader(code.Replace("$", "")), "test.cs");
TextLocation[] dollars = FindDollarSigns(code).ToArray();
Assert.AreEqual(1, dollars.Length, "Expected 1 dollar signs marking the location");
SetUp();
CSharpParsedFile parsedFile = cu.ToTypeSystem();
CSharpParsedFile parsedFile = syntaxTree.ToTypeSystem();
project = project.UpdateProjectContent(null, parsedFile);
compilation = project.CreateCompilation();
ResolveResult rr = Resolver.ResolveAtLocation.Resolve(compilation, parsedFile, cu, dollars[0]);
ResolveResult rr = Resolver.ResolveAtLocation.Resolve(compilation, parsedFile, syntaxTree, dollars[0]);
return rr;
}

4
ICSharpCode.NRefactory.Tests/Documentation/CSharpCrefLookupTests.cs

@ -55,8 +55,8 @@ class Impl<T> : IGeneric<List<string>[,], T> { @@ -55,8 +55,8 @@ class Impl<T> : IGeneric<List<string>[,], T> {
}";
var pc = new CSharpProjectContent().AddAssemblyReferences(new[] { CecilLoaderTests.Mscorlib });
var cu = new CSharpParser().Parse(new StringReader(program), "program.cs");
var compilation = pc.UpdateProjectContent(null, cu.ToTypeSystem()).CreateCompilation();
var syntaxTree = new CSharpParser().Parse(new StringReader(program), "program.cs");
var compilation = pc.UpdateProjectContent(null, syntaxTree.ToTypeSystem()).CreateCompilation();
var typeDefinition = compilation.MainAssembly.TopLevelTypeDefinitions.First();
IEntity entity = typeDefinition.Documentation.ResolveCref(cref);
Assert.IsNotNull(entity, "ResolveCref() returned null.");

4
ICSharpCode.NRefactory.Tests/Documentation/CSharpDocumentationTests.cs

@ -35,8 +35,8 @@ namespace ICSharpCode.NRefactory.Documentation @@ -35,8 +35,8 @@ namespace ICSharpCode.NRefactory.Documentation
void Init(string program)
{
var pc = new CSharpProjectContent().AddAssemblyReferences(new[] { CecilLoaderTests.Mscorlib });
var cu = new CSharpParser().Parse(new StringReader(program), "program.cs");
compilation = pc.UpdateProjectContent(null, cu.ToTypeSystem()).CreateCompilation();
var syntaxTree = new CSharpParser().Parse(new StringReader(program), "program.cs");
compilation = pc.UpdateProjectContent(null, syntaxTree.ToTypeSystem()).CreateCompilation();
typeDefinition = compilation.MainAssembly.TopLevelTypeDefinitions.FirstOrDefault();
}

4
ICSharpCode.NRefactory.Tests/Documentation/IDStringTests.cs

@ -50,8 +50,8 @@ namespace ICSharpCode.NRefactory.Documentation @@ -50,8 +50,8 @@ namespace ICSharpCode.NRefactory.Documentation
{
pc = new IDStringTestProjectContent();
var cu = new CSharpParser().Parse(new StringReader(program), "program.cs");
foreach (var type in cu.ToTypeSystem().TopLevelTypeDefinitions) {
var syntaxTree = new CSharpParser().Parse(new StringReader(program), "program.cs");
foreach (var type in syntaxTree.ToTypeSystem().TopLevelTypeDefinitions) {
pc.AddTypeDefinition(type);
}
compilation = new SimpleCompilation(pc, CecilLoaderTests.Mscorlib);

Loading…
Cancel
Save