fix #525: WinForms designer does not properly jump to code when double-clicking a control or event.

Author: siegfriedpammer

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/CSharpEventBindingService.cs

@@ -24,10 +24,13 @@
 using System.Windows.Threading;
 using ICSharpCode.Core;
 using ICSharpCode.FormsDesigner.Gui.OptionPanels;
+using ICSharpCode.NRefactory;
 using ICSharpCode.NRefactory.CSharp;
+using ICSharpCode.NRefactory.Editor;
 using ICSharpCode.NRefactory.TypeSystem;
 using ICSharpCode.SharpDevelop;
-using ICSharpCode.SharpDevelop.Gui;
+using ICSharpCode.SharpDevelop.Editor;
+using ICSharpCode.SharpDevelop.Project;
 using CSharpBinding.Refactoring;
 
 namespace CSharpBinding.FormsDesigner
@@ -145,17 +148,26 @@ void InsertEventHandlerInternal(string methodName, IEvent evt)
 			var evtHandler = primary.GetMethods(m => m.Name == methodName, GetMemberOptions.IgnoreInheritedMembers).FirstOrDefault();
 			if (evtHandler == null) {
 				generator.InsertEventHandler(primary, methodName, evt, true);
-			}
-			else {
+			} else {
 				CSharpBinding.Parser.CSharpFullParseInformation parseInfo;
 				var node = evtHandler.GetDeclaration(out parseInfo) as MethodDeclaration;
+				var fileName = new FileName(evtHandler.Region.FileName);
+				var fileContentFinder = new ParseableFileContentFinder();
+				
 				if (node != null && !node.Body.IsNull) {
 					var location = node.Body.FirstChild.StartLocation;
 					var firstStatement = node.Body.Children.OfType<Statement>().FirstOrDefault();
-					if (firstStatement != null)
+					
+					if (firstStatement == null) {
+						var fileContent = fileContentFinder.Create(fileName);
+						var document = new ReadOnlyDocument(fileContent);
+						var offset = document.GetOffset(new TextLocation(location.Line + 1, 1));
+						var length = DocumentUtilities.GetWhitespaceAfter(fileContent, offset).Length;
+						location = new TextLocation(location.Line + 1, length + 1);
+					} else {
 						location = firstStatement.StartLocation;
-					// TODO : does not jump correctly...
-					SD.FileService.JumpToFilePosition(new FileName(evtHandler.Region.FileName), location.Line, location.Column);
+					}
+					SD.FileService.JumpToFilePosition(fileName, location.Line, location.Column);
 				}
 			}
 		}

src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormsDesigner/ICSharpDesignerLoaderContext.cs

@@ -31,6 +31,7 @@ public interface ICSharpDesignerLoaderContext
 		CSharpFullParseInformation GetPrimaryFileParseInformation();
 		ICompilation GetCompilation();
 		IDocument GetDocument(FileName fileName);
+		/// <remarks>if lineNumber = 0 no jump is performed, but the active view content changes.</remarks>
 		void ShowSourceCode(int lineNumber = 0);
 	}
 }

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/CSharpCodeGenerator.cs

@@ -105,13 +105,10 @@ public override void InsertEventHandler(ITypeDefinition target, string name, IEv
 			using (Script script = context.StartScript()) {
 				// FIXME : will not work properly if there are no members.
 				if (last == match) {
-					throw new NotImplementedException();
-					// TODO InsertWithCursor not implemented!
-					//script.InsertWithCursor("Insert event handler", Script.InsertPosition.End, decl).RunSynchronously();
+					script.InsertWithCursor("Insert event handler", Script.InsertPosition.End, decl).FireAndForget();
 				} else {
-					// TODO does not jump correctly...
 					script.InsertAfter(node, decl);
-					editor.JumpTo(throwStmt.StartLocation.Line, throwStmt.StartLocation.Column);
+					script.Select(throwStmt);
 				}
 			}
 		}

src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerViewContent.cs

@@ -662,9 +662,11 @@ public virtual void MergeFormChanges()
 			this.DesignerCodeFile.IsDirty = isDirty;
 		}
 
+		/// <remarks>if lineNumber = 0 no jump is performed, but the active view content changes.</remarks>
 		public void ShowSourceCode(int lineNumber = 0)
 		{
 			this.WorkbenchWindow.ActiveViewContent = this.PrimaryViewContent;
+			if (lineNumber <= 0) return;
 			ITextEditor editor = this.primaryViewContent.GetService<ITextEditor>();
 			if (editor != null) {
 				editor.JumpTo(lineNumber, 1);