From f1d113d32c7dcf97f3ec245e621bc014ad7b03e7 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Mon, 10 Apr 2006 10:16:23 +0000 Subject: [PATCH] Fixed SD2-692: Refactoring submenu not available when right clicking on MethodResolveResult git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1277 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Src/Internal/Templates/File/FileDescriptionTemplate.cs | 5 +++-- .../Services/RefactoringService/RefactoringMenuBuilder.cs | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Main/Base/Project/Src/Internal/Templates/File/FileDescriptionTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/File/FileDescriptionTemplate.cs index ac7d330dfe..6145f2c11d 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/File/FileDescriptionTemplate.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/File/FileDescriptionTemplate.cs @@ -40,10 +40,11 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates dependentUpon = xml.GetAttribute("dependentUpon"); subType = xml.GetAttribute("subType"); if (xml.HasAttribute("src")) { + string fileName = Path.Combine(hintPath, StringParser.Parse(xml.GetAttribute("src"))); try { - content = File.ReadAllText(Path.Combine(hintPath, xml.GetAttribute("src"))); + content = File.ReadAllText(fileName); } catch (Exception e) { - content = "Error reading content from " + Path.Combine(hintPath, xml.GetAttribute("src")) + ":\n" + e.ToString(); + content = "Error reading content from " + fileName + ":\n" + e.ToString(); LoggingService.Warn(content); } } else { diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs b/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs index 0d4b1943a0..66e2b437f5 100644 --- a/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs +++ b/src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs @@ -69,7 +69,9 @@ namespace ICSharpCode.SharpDevelop.Refactoring // Include menu for member that has been clicked on ResolveResult rr = ResolveAtCaret(textEditorControl, textArea); item = null; - if (rr is MemberResolveResult) { + if (rr is MethodResolveResult) { + item = MakeItem(definitions, ((MethodResolveResult)rr).GetMethodIfSingleOverload()); + } else if (rr is MemberResolveResult) { item = MakeItem(definitions, ((MemberResolveResult)rr).ResolvedMember); } else if (rr is TypeResolveResult) { item = MakeItem(definitions, ((TypeResolveResult)rr).ResolvedClass);