Browse Source

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
shortcuts
Daniel Grunwald 20 years ago
parent
commit
f1d113d32c
  1. 5
      src/Main/Base/Project/Src/Internal/Templates/File/FileDescriptionTemplate.cs
  2. 4
      src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs

5
src/Main/Base/Project/Src/Internal/Templates/File/FileDescriptionTemplate.cs

@ -40,10 +40,11 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates @@ -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 {

4
src/Main/Base/Project/Src/Services/RefactoringService/RefactoringMenuBuilder.cs

@ -69,7 +69,9 @@ namespace ICSharpCode.SharpDevelop.Refactoring @@ -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);

Loading…
Cancel
Save