Fixed formatting, removed useless stuff.

GammaJul.ReSharper.ForTea/Daemon/T4CSharpErrorProcess.cs

@@ -16,7 +16,6 @@
 
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using GammaJul.ReSharper.ForTea.Daemon.Highlightings;
 using GammaJul.ReSharper.ForTea.Psi;
@@ -27,6 +26,8 @@
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.CSharp.Tree;
+using JetBrains.ReSharper.Psi.Util;
+using JetBrains.Util;
 
 namespace GammaJul.ReSharper.ForTea.Daemon {
 
@@ -47,21 +48,16 @@ public override void VisitClassDeclaration(IClassDeclaration classDeclarationPar
 			ITypeElement typeElement = CSharpTypeFactory.CreateDeclaredType(superTypeUsage).GetTypeElement();
 			if (typeElement == null)
 				return;
-
-			if (!GetAllMethodsInTypeHierarchy(typeElement).Any(IsTransformTextMethod))
+			
+			if (!HasTransformTextMethod(typeElement))
 				context.AddHighlighting(new MissingTransformTextMethodHighlighting(superTypeUsage));
 		}
 
-		private static IEnumerable<IMethod> GetAllMethodsInTypeHierarchy(ITypeElement typeElement) {
-			var currentTypeElement = typeElement;
-			while (currentTypeElement != null) {
-				foreach (var method in currentTypeElement.Methods)
-					yield return method;
-				var baseClassDeclaredType = currentTypeElement.GetSuperTypes().FirstOrDefault();
-				if (baseClassDeclaredType == null)
-					yield break;
-				currentTypeElement = baseClassDeclaredType.GetTypeElement();
-			}
+		private static bool HasTransformTextMethod([NotNull] ITypeElement typeElement) {
+			return typeElement
+				.GetAllClassMembers(T4CSharpCodeGenerator.TransformTextMethodName)
+				.SelectNotNull(instance => instance.Member as IMethod)
+				.Any(IsTransformTextMethod);
 		}
 
 		private static bool IsTransformTextMethod([NotNull] IMethod method) {

GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.csproj

@@ -3,7 +3,7 @@
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <ProjectGuid>{63F25238-06BA-4861-95A2-DA35A1D18B65}</ProjectGuid>
-    <AssemblyName>GammaJul.ReSharper.ForTea.v10.0</AssemblyName>
+    <AssemblyName>GammaJul.ReSharper.ForTea</AssemblyName>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
   </PropertyGroup>

GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.nuspec

@@ -7,9 +7,9 @@
 		<authors>Julien Lebosquain</authors>
 		<description>Adds support for editing T4 text templating files (.tt)</description>
 		<releaseNotes>
-      Added support for ReSharper 2016.1
-      Added support for ReSharper 10.
-    </releaseNotes>
+			- Added support for ReSharper 2016.1 (#72)
+			- The TransformText method is now resolved from base classes (#64).
+		</releaseNotes>
 		<projectUrl>https://github.com/MrJul/ForTea/</projectUrl>
 		<iconUrl>https://raw.github.com/MrJul/ForTea/master/Logo/ForTea%20128x128.png</iconUrl>
 		<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
@@ -20,6 +20,6 @@
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="bin\Release\GammaJul.ReSharper.ForTea.v10.0.dll" target="DotFiles" />
+		<file src="bin\Release\GammaJul.ReSharper.ForTea.dll" target="DotFiles" />
 	</files>
 </package>

GammaJul.ReSharper.ForTea/Psi/T4CSharpCustomModificationHandler.cs

@@ -68,11 +68,11 @@ public bool CanUseStaticImport {
 			get { return false; }
 		}
 
-	    public bool CanOmitBraces {
-	        get { return false; }
-	    }
+		public bool CanOmitBraces {
+			get { return false; }
+		}
 
-	    /// <summary>
+		/// <summary>
 		/// Creates a new T4 code block.
 		/// </summary>
 		/// <param name="text">The C# code.</param>

GammaJul.ReSharper.ForTea/Psi/T4ProjectPsiModuleProviderFilter.cs

@@ -29,7 +29,7 @@ namespace GammaJul.ReSharper.ForTea.Psi {
 	public class T4ProjectPsiModuleProviderFilter : IProjectPsiModuleProviderFilter {
 
 		[NotNull] private readonly ChangeManager _changeManager;
-		[NotNull] private readonly T4Environment _t4Environment;		
+		[NotNull] private readonly T4Environment _t4Environment;
 
         Tuple<IProjectPsiModuleHandler, IPsiModuleDecorator> IProjectPsiModuleProviderFilter.OverrideHandler(Lifetime lifetime, IProject project, IProjectPsiModuleHandler handler)
         {            

GammaJul.ReSharper.ForTea/Psi/T4PsiModule.cs

@@ -50,7 +50,7 @@ namespace GammaJul.ReSharper.ForTea.Psi {
 	/// <summary>
 	/// PSI module managing a single T4 file.
 	/// </summary>
-	internal sealed class T4PsiModule : IPsiModule, IProjectPsiModule, IChangeProvider {
+	internal sealed class T4PsiModule : IProjectPsiModule, IChangeProvider {
 
 		private const string Prefix = "[T4] ";
 
@@ -68,8 +68,8 @@ internal sealed class T4PsiModule : IPsiModule, IProjectPsiModule, IChangeProvid
 		[NotNull] private readonly IPsiSourceFile _sourceFile;
 		[NotNull] private readonly T4ResolveProject _resolveProject;
 		[NotNull] private readonly OutputAssemblies _outputAssemblies;
-        [NotNull] private readonly Dictionary<object, object> _userData = new Dictionary<object, object>();
-		[CanBeNull] private IModuleReferenceResolveManager _resolveManager;        
+		[NotNull] private readonly UserDataHolder _userDataHolder = new UserDataHolder();
+		[CanBeNull] private IModuleReferenceResolveManager _resolveManager;
 		private bool _isValid;
 
 		/// <summary>
@@ -139,7 +139,6 @@ public TargetFrameworkId TargetFrameworkId {
 		/// Gets the solution this PSI module is attached to.
 		/// </summary>
 		/// <returns>An instance of <see cref="ISolution"/>.</returns>
-		[NotNull]
 		public ISolution GetSolution() {
 			return _solution;
 		}
@@ -419,6 +418,21 @@ private IAssemblyCookie CreateCookieCore([NotNull] AssemblyReferenceTarget targe
 				: null;
 		}
 
+
+		public T GetData<T>(Key<T> key)
+		where T : class {
+			return _userDataHolder.GetData(key);
+		}
+
+		public void PutData<T>(Key<T> key, T val)
+		where T : class {
+			_userDataHolder.PutData(key, val);
+		}
+
+		public IEnumerable<KeyValuePair<object, object>> EnumerateData() {
+			return _userDataHolder.EnumerateData();
+		}
+
 		/// <summary>
 		/// Disposes this instance.
 		/// </summary>
@@ -478,18 +492,6 @@ internal T4PsiModule([NotNull] Lifetime lifetime, [NotNull] IPsiModules psiModul
 			AddBaseReferences();
 		}
 
-	    public void PutData<T>(Key<T> key, T value) where T : class {
-            _userData.Add(key, value);
-	    }
-
-	    public T GetData<T>(Key<T> key) where T : class {
-	        return (_userData.ContainsKey(key) ? _userData[key] : null) as T;
-	    }
-
-	    public IEnumerable<KeyValuePair<object, object>> EnumerateData() {
-	        return _userData.Select(p => p);
-	    }
-
 	}
 
 }

GammaJul.ReSharper.ForTea/T4Environment.cs

@@ -99,9 +99,9 @@ public IEnumerable<FileSystemPath> IncludePaths {
 
 		[NotNull]
 		private IList<FileSystemPath> ReadIncludePaths() {
-			string registryKey = JetBrains.ReSharper.Resources.Shell.Shell.Instance.GetComponent<IVsEnvironmentInformation>().GetVisualStudioGlobalRegistryPath()
+			string registryKey = _vsEnvironmentInformation.GetVisualStudioGlobalRegistryPath()
 				+ @"_Config\TextTemplating\IncludeFolders\.tt";
-            MessageBox.ShowInfo(registryKey, "Info");
+
 			using (RegistryKey key = Registry.CurrentUser.OpenSubKey(registryKey)) {
 
 				if (key == null)