From a315a11f4d63887792dc427fd128361eae326508 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sun, 26 Aug 2012 14:38:26 +0100 Subject: [PATCH] Return EnvDTE.CodeFunction2 instances from EnvDTE.CodeClass2.Members. The T4MVC assumes the class methods are instances of the CodeFunction2 type. --- .../PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs | 4 +++- .../PackageManagement/Project/Src/EnvDTE/CodeTypeMembers.cs | 2 +- .../Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs | 2 +- .../Test/Src/Helpers/CodeElementsExtensions.cs | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs index b0a0a20fff..64f0db144b 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeFunction2.cs @@ -2,12 +2,14 @@ // This code is distributed under the GNU LGPL (for details please see \doc\license.txt) using System; +using ICSharpCode.SharpDevelop.Dom; namespace ICSharpCode.PackageManagement.EnvDTE { public class CodeFunction2 : CodeFunction { - public CodeFunction2() + public CodeFunction2(IMethod method) + : base(method) { } diff --git a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeMembers.cs b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeMembers.cs index fa352035ab..d2c6ab10dd 100644 --- a/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeMembers.cs +++ b/src/AddIns/Misc/PackageManagement/Project/Src/EnvDTE/CodeTypeMembers.cs @@ -33,7 +33,7 @@ namespace ICSharpCode.PackageManagement.EnvDTE void AddMethod(IMethod method) { - AddCodeElement(new CodeFunction(method)); + AddCodeElement(new CodeFunction2(method)); } void AddField(IField field) diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs index fc0f0794f8..a9553b652a 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/EnvDTE/CodeClass2Tests.cs @@ -211,7 +211,7 @@ namespace PackageManagement.Tests.EnvDTE AddMethodToClass("MyClass.MyMethod"); CodeElements codeElements = codeClass.Members; - CodeFunction codeFunction = codeElements.FirstCodeFunctionOrDefault(); + CodeFunction2 codeFunction = codeElements.FirstCodeFunction2OrDefault(); Assert.AreEqual(1, codeElements.Count); Assert.AreEqual("MyMethod", codeFunction.Name); diff --git a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs index 87e6749f84..ca0b2ca1bc 100644 --- a/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs +++ b/src/AddIns/Misc/PackageManagement/Test/Src/Helpers/CodeElementsExtensions.cs @@ -24,9 +24,9 @@ namespace PackageManagement.Tests.Helpers return ToList(codeElements).FirstOrDefault(); } - public static CodeFunction FirstCodeFunctionOrDefault(this CodeElements codeElements) + public static CodeFunction2 FirstCodeFunction2OrDefault(this CodeElements codeElements) { - return codeElements.FirstOrDefault() as CodeFunction; + return codeElements.FirstOrDefault() as CodeFunction2; } public static CodeClass2 FirstCodeClass2OrDefault(this CodeElements codeElements)