From b7a17c206e194d2fa39e25212d67285d97f407a3 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sat, 3 Sep 2011 14:47:06 +0200 Subject: [PATCH] Adjust unit tests to InvocationResolveResult changes. --- ICSharpCode.NRefactory.CSharp/.gitignore | 3 ++ .../ICSharpCode.NRefactory.CSharp.csproj | 2 +- .../Resolver/OverloadResolution.cs | 16 +++++++- .../CSharp/Resolver/AttributeTests.cs | 6 +-- .../CSharp/Resolver/BinaryOperatorTests.cs | 2 +- .../CSharp/Resolver/ExtensionMethodTests.cs | 20 +++++----- .../CSharp/Resolver/InvocationTests.cs | 38 +++++++++---------- .../CSharp/Resolver/LambdaTests.cs | 2 +- .../CSharp/Resolver/LinqTests.cs | 8 ++-- .../CSharp/Resolver/NameLookupTests.cs | 8 ++-- .../CSharp/Resolver/ObjectCreationTests.cs | 10 ++--- .../CSharp/Resolver/ResolveAtLocationTests.cs | 2 +- .../Visitors/CSharpToVBConverterVisitor.cs | 12 ++---- .../ICSharpCode.NRefactory.csproj | 2 +- 14 files changed, 71 insertions(+), 60 deletions(-) create mode 100644 ICSharpCode.NRefactory.CSharp/.gitignore diff --git a/ICSharpCode.NRefactory.CSharp/.gitignore b/ICSharpCode.NRefactory.CSharp/.gitignore new file mode 100644 index 0000000000..9ce745d95d --- /dev/null +++ b/ICSharpCode.NRefactory.CSharp/.gitignore @@ -0,0 +1,3 @@ + +bin/ +obj/ \ No newline at end of file diff --git a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj index 47cf572d96..9bcb8789e4 100644 --- a/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj +++ b/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj @@ -27,7 +27,7 @@ true Full False - True + False DEBUG;TRACE;FULL_AST diff --git a/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs b/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs index 80d47d5df3..7ce0e04064 100644 --- a/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs +++ b/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs @@ -764,7 +764,21 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver public CSharpInvocationResolveResult CreateResolveResult(ResolveResult targetResolveResult) { - throw new NotImplementedException(); + IParameterizedMember member = GetBestCandidateWithSubstitutedTypeArguments(); + if (member == null) + throw new InvalidOperationException(); + + return new CSharpInvocationResolveResult( + targetResolveResult, + member, + member.EntityType == EntityType.Constructor ? member.DeclaringType : member.ReturnType.Resolve(context), + GetArgumentsWithConversions(), + this.BestCandidateErrors, + this.IsExtensionMethodInvocation, + this.BestCandidateIsExpandedForm, + member is ILiftedOperator, + isDelegateInvocation: false, + argumentToParameterMap: this.GetArgumentToParameterMap()); } } } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/AttributeTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/AttributeTests.cs index 5f7d2a8dc7..4ca5717670 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/AttributeTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/AttributeTests.cs @@ -56,7 +56,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver public void AttributeConstructor1() { string program = "using System; [$LoaderOptimization(3)$] class Test { }"; - var mrr = Resolve(program); + var mrr = Resolve(program); Assert.AreEqual("System.LoaderOptimizationAttribute..ctor", mrr.Member.FullName); Assert.AreEqual("System.Byte", mrr.Member.Parameters[0].Type.Resolve(context).FullName); } @@ -65,7 +65,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver public void AttributeConstructor2() { string program = "using System; [$LoaderOptimization(LoaderOptimization.NotSpecified)$] class Test { }"; - var mrr = Resolve(program); + var mrr = Resolve(program); Assert.AreEqual("System.LoaderOptimizationAttribute..ctor", mrr.Member.FullName); Assert.AreEqual("System.LoaderOptimization", mrr.Member.Parameters[0].Type.Resolve(context).FullName); } @@ -75,7 +75,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver { string program = "using System; [$Obsolete$] class Test {}"; - var result = Resolve(program); + var result = Resolve(program); Assert.AreEqual("System.ObsoleteAttribute..ctor", result.Member.FullName); } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs index 740cf46081..3d0192e7db 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/BinaryOperatorTests.cs @@ -534,7 +534,7 @@ class Test { } } "; - var irr = Resolve(program); + var irr = Resolve(program); Assert.IsTrue(irr.IsError); // cannot convert from A to S Assert.AreEqual("A.op_Addition", irr.Member.FullName); Assert.AreEqual("S", irr.Type.ReflectionName); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs index c803f01bf6..26fcec5e46 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ExtensionMethodTests.cs @@ -51,25 +51,25 @@ namespace XN { "; InvocationResolveResult mrr; - mrr = Resolve(program.Replace("$", "$a.F(1)$")); + mrr = Resolve(program.Replace("$", "$a.F(1)$")); Assert.AreEqual("XN.XC.F", mrr.Member.FullName); Assert.AreEqual("System.Int32", mrr.Member.Parameters[1].Type.Resolve(context).FullName); - mrr = Resolve(program.Replace("$", "$a.F(\"text\")$")); + mrr = Resolve(program.Replace("$", "$a.F(\"text\")$")); Assert.AreEqual("XN.XC.F", mrr.Member.FullName); Assert.AreEqual("System.String", mrr.Member.Parameters[1].Type.Resolve(context).FullName); - mrr = Resolve(program.Replace("$", "$b.F(1)$")); + mrr = Resolve(program.Replace("$", "$b.F(1)$")); Assert.AreEqual("B.F", mrr.Member.FullName); - mrr = Resolve(program.Replace("$", "$b.F(\"text\")$")); + mrr = Resolve(program.Replace("$", "$b.F(\"text\")$")); Assert.AreEqual("XN.XC.F", mrr.Member.FullName); Assert.AreEqual("System.String", mrr.Member.Parameters[1].Type.Resolve(context).FullName); - mrr = Resolve(program.Replace("$", "$c.F(1)$")); + mrr = Resolve(program.Replace("$", "$c.F(1)$")); Assert.AreEqual("C.F", mrr.Member.FullName); - mrr = Resolve(program.Replace("$", "$c.F(\"text\")$")); + mrr = Resolve(program.Replace("$", "$c.F(\"text\")$")); Assert.AreEqual("C.F", mrr.Member.FullName); } @@ -88,16 +88,16 @@ public static class XC { public static IEnumerable Filter(this IEnumerable source, Predicate predicate) { throw new NotImplementedException(); } } "; - InvocationResolveResult mrr; + CSharpInvocationResolveResult mrr; - mrr = Resolve(program.Replace("$", "$\"text\".ToInt32()$")); + mrr = Resolve(program.Replace("$", "$\"text\".ToInt32()$")); Assert.AreEqual("XC.ToInt32", mrr.Member.FullName); - mrr = Resolve(program.Replace("$", "$args.Slice(1, 2)$")); + mrr = Resolve(program.Replace("$", "$args.Slice(1, 2)$")); Assert.AreEqual("XC.Slice", mrr.Member.FullName); Assert.AreEqual("System.String[]", mrr.Type.ReflectionName); - mrr = Resolve(program.Replace("$", "$args.Filter(delegate { return true; })$")); + mrr = Resolve(program.Replace("$", "$args.Filter(delegate { return true; })$")); Assert.AreEqual("XC.Filter", mrr.Member.FullName); Assert.AreEqual("System.Collections.Generic.IEnumerable`1[[System.String]]", mrr.Type.ReflectionName); } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs index cbf3790f42..0382c3c130 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/InvocationTests.cs @@ -41,7 +41,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver } } "; - InvocationResolveResult result = Resolve(program); + InvocationResolveResult result = Resolve(program); Assert.AreEqual("A.TargetMethod", result.Member.FullName); Assert.AreEqual("System.Int32", result.Type.ReflectionName); } @@ -82,7 +82,7 @@ class B : A { } } "; - InvocationResolveResult result = Resolve(program); + InvocationResolveResult result = Resolve(program); Assert.AreEqual("B.GetRandomNumber", result.Member.FullName); } @@ -102,7 +102,7 @@ class B : A { } } "; - InvocationResolveResult result = Resolve(program); + InvocationResolveResult result = Resolve(program); Assert.AreEqual("B.GetRandomNumber", result.Member.FullName); } @@ -119,7 +119,7 @@ class B : A { } } "; - InvocationResolveResult result = Resolve(program); + InvocationResolveResult result = Resolve(program); Assert.AreEqual("A.TargetMethod", result.Member.FullName); Assert.AreEqual("System.Int32", result.Type.ReflectionName); } @@ -217,10 +217,10 @@ class Program { static void T(ref int y) {} }"; - InvocationResolveResult mrr = Resolve(program.Replace("T(a)", "$T(a)$")); + InvocationResolveResult mrr = Resolve(program.Replace("T(a)", "$T(a)$")); Assert.IsFalse(mrr.Member.Parameters[0].IsRef); - mrr = Resolve(program.Replace("T(ref a)", "$T(ref a)$")); + mrr = Resolve(program.Replace("T(ref a)", "$T(ref a)$")); Assert.IsTrue(mrr.Member.Parameters[0].IsRef); } @@ -236,7 +236,7 @@ class Program { class DerivedClass : BaseClass { public void Test(object a) { } }"; - InvocationResolveResult mrr = Resolve(program); + InvocationResolveResult mrr = Resolve(program); Assert.AreEqual("DerivedClass.Test", mrr.Member.FullName); } @@ -251,7 +251,7 @@ class Test { $d.Method(3)$; } }"; - InvocationResolveResult mrr = Resolve(program); + InvocationResolveResult mrr = Resolve(program); Assert.AreEqual("IDerived.Method", mrr.Member.FullName); } @@ -267,10 +267,10 @@ class Test { class DerivedClass : BaseClass { public void Test(string a) { } }"; - InvocationResolveResult mrr = Resolve(program); + InvocationResolveResult mrr = Resolve(program); Assert.AreEqual("BaseClass.Test", mrr.Member.FullName); - mrr = Resolve(program.Replace("(3)", "(\"3\")")); + mrr = Resolve(program.Replace("(3)", "(\"3\")")); Assert.AreEqual("DerivedClass.Test", mrr.Member.FullName); } @@ -291,7 +291,7 @@ class DerivedClass : MiddleClass { public override void Test(int a) { } }"; - InvocationResolveResult mrr = Resolve(program); + InvocationResolveResult mrr = Resolve(program); Assert.AreEqual("MiddleClass.Test", mrr.Member.FullName); } @@ -299,7 +299,7 @@ class DerivedClass : MiddleClass { public void SubstituteClassAndMethodTypeParametersAtOnce() { string program = @"class C { static void M(X a, T b) { $C.M(b, a)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); var m = (SpecializedMethod)rr.Member; @@ -367,7 +367,7 @@ class A { }"; // IBase.Method is "hidden" because ILeft.Method is also applicable, // so IRight.Method is unambiguously the chosen overload. - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("IRight.Method", rr.Member.FullName); } @@ -384,7 +384,7 @@ interface IBoth : IRight, ILeft {} class A { void Test(IBoth x) { $x.Method(1)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("IRight.Method", rr.Member.FullName); } @@ -402,7 +402,7 @@ interface IBoth : ILeft, IRight {} class A { void Test(IBoth x) { $x.Method(1)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("ILeft.Method", rr.Member.FullName); } @@ -420,7 +420,7 @@ interface IBoth : ILeft, IRight {} class A { void Test(IBoth x) { $x.Method(1)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("ILeft.Method", rr.Member.FullName); } @@ -438,7 +438,7 @@ interface IBoth : IRight, ILeft {} class A { void Test(IBoth x) { $x.Method(1)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("IBase`1[[System.Int64]]", rr.Member.DeclaringType.ReflectionName); } @@ -456,7 +456,7 @@ interface IBoth : IRight, ILeft {} class A { void Test(IBoth x) { $x.Method(1)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("IBase`1[[System.Int64]]", rr.Member.DeclaringType.ReflectionName); } @@ -471,7 +471,7 @@ interface IBoth : ILeft, IRight {} class A { void Test(IBoth x) { $x.Method(null)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("ILeft.Method", rr.Member.FullName); } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs index 4718bcf49f..c17e2cbdeb 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LambdaTests.cs @@ -369,7 +369,7 @@ class TestClass { $list.ConvertAll(x => (int)x)$; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); SpecializedMethod m = (SpecializedMethod)rr.Member; Assert.AreEqual("System.Int32", m.TypeArguments[0].ReflectionName); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs index be363e5492..f25973fc89 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/LinqTests.cs @@ -101,7 +101,7 @@ class TestClass { } } "; - var rr = Resolve(program); + var rr = Resolve(program); Assert.AreEqual("System.Linq.Enumerable.Select", rr.Member.FullName); Assert.AreEqual("System.Collections.Generic.IEnumerable", rr.Type.FullName); Assert.AreEqual("System.Int32", ((ParameterizedType)rr.Type).TypeArguments[0].FullName); @@ -117,7 +117,7 @@ class TestClass { static void M() { class XYZ { public int Select(Func f) { return 42; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.AreEqual("XYZ.Select", rr.Member.FullName); Assert.AreEqual("System.Int32", rr.Type.FullName); } @@ -304,12 +304,12 @@ class XYZ public int GroupJoin(IEnumerable f, Func key1, Func key2, Func s) { return 0; } public decimal GroupJoin(IEnumerable f, Func key1, Func key2, Func s) { return 0; } }"; - var rr = Resolve(program); + var rr = Resolve(program); Assert.IsFalse(rr.IsError); Assert.AreEqual("GroupJoin", rr.Member.Name); Assert.AreEqual("System.Decimal", rr.Type.FullName); - rr = Resolve(program.Replace("g.ToUpper()", "g.CompareTo(42)")); + rr = Resolve(program.Replace("g.ToUpper()", "g.CompareTo(42)")); Assert.IsFalse(rr.IsError); Assert.AreEqual("GroupJoin", rr.Member.Name); Assert.AreEqual("System.Int32", rr.Type.FullName); diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs index aa6a05a329..6c477d8514 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/NameLookupTests.cs @@ -425,7 +425,7 @@ class TestClass { "; TypeResolveResult trr = Resolve(program.Replace("COL a", "$COL$ a")); Assert.AreEqual("System.Collections.ArrayList", trr.Type.FullName, "COL"); - ResolveResult rr = Resolve(program.Replace("new COL()", "$new COL()$")); + ResolveResult rr = Resolve(program.Replace("new COL()", "$new COL()$")); Assert.AreEqual("System.Collections.ArrayList", rr.Type.FullName, "a"); } @@ -560,7 +560,7 @@ class TestClass { trr = Resolve(program.Replace("$", "$global::XX.XX$")); Assert.AreEqual("XX.XX", trr.Type.FullName); - InvocationResolveResult mrr = Resolve(program.Replace("$", "$XX.Test()$")); + InvocationResolveResult mrr = Resolve(program.Replace("$", "$XX.Test()$")); Assert.AreEqual("XX.XX.Test", mrr.Member.FullName); } @@ -672,7 +672,7 @@ namespace A { class BaseClass { public static string Test() {} }"; - MemberResolveResult mrr = Resolve(program.Replace("$", "$BaseClass.Test()$")); + MemberResolveResult mrr = Resolve(program.Replace("$", "$BaseClass.Test()$")); Assert.AreEqual("BaseClass.Test", mrr.Member.FullName); mrr = Resolve(program.Replace("$", "$Test$")); @@ -682,7 +682,7 @@ namespace A { Assert.AreEqual("DerivedClass.Test", mrr.Member.FullName); // returns BaseClass.Test because DerivedClass.Test is not invocable - mrr = Resolve(program.Replace("$", "$DerivedClass.Test()$")); + mrr = Resolve(program.Replace("$", "$DerivedClass.Test()$")); Assert.AreEqual("BaseClass.Test", mrr.Member.FullName); } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs index 7219558bce..95186ca452 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ObjectCreationTests.cs @@ -36,7 +36,7 @@ class A { } } "; - InvocationResolveResult result = Resolve(program); + var result = Resolve(program); Assert.AreEqual("System.Collections.Generic.List..ctor", result.Member.FullName); Assert.AreEqual("System.Collections.Generic.List`1[[System.String]]", result.Type.ReflectionName); @@ -83,16 +83,16 @@ class A { A(double dblVal) {} } "; - InvocationResolveResult result = Resolve(program.Replace("$", "$new A()$")); + var result = Resolve(program.Replace("$", "$new A()$")); Assert.IsFalse(result.Member.IsStatic, "new A() is static"); Assert.AreEqual(0, result.Member.Parameters.Count, "new A() parameter count"); Assert.AreEqual("A", result.Type.FullName); - result = Resolve(program.Replace("$", "$new A(10)$")); + result = Resolve(program.Replace("$", "$new A(10)$")); Assert.AreEqual(1, result.Member.Parameters.Count, "new A(10) parameter count"); Assert.AreEqual("intVal", result.Member.Parameters[0].Name, "new A(10) parameter"); - result = Resolve(program.Replace("$", "$new A(11.1)$")); + result = Resolve(program.Replace("$", "$new A(11.1)$")); Assert.AreEqual(1, result.Member.Parameters.Count, "new A(11.1) parameter count"); Assert.AreEqual("dblVal", result.Member.Parameters[0].Name, "new A(11.1) parameter"); } @@ -106,7 +106,7 @@ class A { } } "; - InvocationResolveResult result = Resolve(program); + var result = Resolve(program); Assert.AreEqual("A", result.Type.ReflectionName); Assert.AreEqual(0, result.Member.Parameters.Count); } diff --git a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs index 5c6b9b88fe..b8eb532259 100644 --- a/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs +++ b/ICSharpCode.NRefactory.Tests/CSharp/Resolver/ResolveAtLocationTests.cs @@ -50,7 +50,7 @@ namespace ICSharpCode.NRefactory.CSharp.Resolver [Test] public void MethodInvocation() { - var rr = ResolveAtLocation(@"using System; + var rr = ResolveAtLocation(@"using System; class A { void M() { Console.W$riteLine(1); }}"); diff --git a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs index 92ee8ae5bc..f2b8543b05 100644 --- a/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs +++ b/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs @@ -169,7 +169,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors public AstNode VisitBaseReferenceExpression(CSharp.BaseReferenceExpression baseReferenceExpression, object data) { - InstanceExpression result = new InstanceExpression(InstanceExpressionType.MyBase, ConvertLocation(baseReferenceExpression.StartLocation)); + InstanceExpression result = new InstanceExpression(InstanceExpressionType.MyBase, baseReferenceExpression.StartLocation); return EndNode(baseReferenceExpression, result); } @@ -599,7 +599,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors public AstNode VisitThisReferenceExpression(CSharp.ThisReferenceExpression thisReferenceExpression, object data) { - InstanceExpression result = new InstanceExpression(InstanceExpressionType.Me, ConvertLocation(thisReferenceExpression.StartLocation)); + InstanceExpression result = new InstanceExpression(InstanceExpressionType.Me, thisReferenceExpression.StartLocation); return EndNode(thisReferenceExpression, result); } @@ -2162,7 +2162,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors public AstNode VisitIdentifier(CSharp.Identifier identifier, object data) { - var ident = new Identifier(identifier.Name, ConvertLocation(identifier.StartLocation)); + var ident = new Identifier(identifier.Name, identifier.StartLocation); return EndNode(identifier, ident); } @@ -2181,12 +2181,6 @@ namespace ICSharpCode.NRefactory.VB.Visitors } } - [Obsolete] - TextLocation ConvertLocation(TextLocation location) - { - return location; - } - T EndNode(CSharp.AstNode node, T result) where T : VB.AstNode { if (result != null) { diff --git a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj index 7c4198ae73..fc5a58886e 100644 --- a/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj +++ b/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj @@ -35,7 +35,7 @@ Full False DEBUG;TRACE - False + True true