fix decompilation and stepping of generic types

src/AddIns/Debugger/Debugger.AddIn/Debugger.AddIn.csproj

@@ -367,6 +367,7 @@
     <ProjectReference Include="..\..\..\Libraries\Mono.Cecil\Mono.Cecil.csproj">
       <Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
       <Name>Mono.Cecil</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj">
       <Project>{2748AD25-9C63-4E12-877B-4DCE96FBED54}</Project>

src/AddIns/Debugger/Debugger.AddIn/Service/WindowsDebugger.cs

@@ -18,7 +18,6 @@ using Debugger.AddIn.TreeModel;
 using Debugger.Interop.CorPublish;
 using Debugger.MetaData;
 using ICSharpCode.Core;
-using ICSharpCode.Core.Services;
 using ICSharpCode.Core.WinForms;
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.ILAst;
@@ -1001,7 +1000,9 @@ namespace ICSharpCode.SharpDevelop.Services
 
 						// update marker
 						var debugType = (DebugType)frame.MethodInfo.DeclaringType;
-						string title = "[" + debugType.Name + "]";
+						string fullTypeName = debugType.FullNameWithoutGenericArguments;
+						string shortTypeName = fullTypeName.Substring(fullTypeName.LastIndexOf('.') + 1);
+						string title = "[" + shortTypeName + "]";
 						foreach (var vc in WorkbenchSingleton.Workbench.ViewContentCollection.OfType<AbstractViewContentWithoutFile>()) {
 							if (string.Equals(vc.TitleName, title, StringComparison.OrdinalIgnoreCase)) {
 								CurrentLineBookmark.SetPosition(vc, line, 0, line, 0);

src/AddIns/DisplayBindings/ILSpyAddIn/NavigateToDecompiledEntityService.cs

@@ -35,7 +35,7 @@ namespace ICSharpCode.ILSpyAddIn
 			if (rpc != null) {
 				string assemblyLocation = ILSpyController.GetAssemblyLocation(rpc);
 				if (!string.IsNullOrEmpty(assemblyLocation) && File.Exists(assemblyLocation)) {
-					NavigateTo(assemblyLocation, declaringType.FullyQualifiedName, ((AbstractEntity)entity).DocumentationTag);
+					NavigateTo(assemblyLocation, declaringType.DotNetName, ((AbstractEntity)entity).DocumentationTag);
 					return true;
 				}
 			}

src/AddIns/DisplayBindings/ILSpyAddIn/ViewContent/DecompiledViewContent.cs

@@ -52,7 +52,7 @@ namespace ICSharpCode.ILSpyAddIn
 			this.jumpToEntityTagWhenDecompilationFinished = entityTag;
 			
 			string shortTypeName = fullTypeName.Substring(fullTypeName.LastIndexOf('.') + 1);
-			this.TitleName = "[" + ReflectionHelper.SplitTypeParameterCountFromReflectionName(shortTypeName) + "]";
+			this.TitleName = "[" + shortTypeName + "]";
 			
 			Thread thread = new Thread(DecompilationThread);
 			thread.Name = "Decompiler (" + shortTypeName + ")";