Browse Source

Fixed InvalidCastException when executing "Find references" on local variable.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@3293 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 18 years ago
parent
commit
e43872509f
  1. 6
      src/Main/Base/Project/Src/Services/RefactoringService/LocalVariableRefactoring.cs
  2. 4
      src/Main/Base/Project/Src/Services/RefactoringService/RefactoringService.cs

6
src/Main/Base/Project/Src/Services/RefactoringService/LocalVariableRefactoring.cs

@ -16,7 +16,8 @@ namespace ICSharpCode.SharpDevelop.Refactoring
{ {
public override void Run() public override void Run()
{ {
LocalResolveResult local = (LocalResolveResult)Owner; RefactoringMenuContext context = (RefactoringMenuContext)Owner;
LocalResolveResult local = (LocalResolveResult)context.ResolveResult;
FindReferencesAndRenameHelper.ShowAsSearchResults( FindReferencesAndRenameHelper.ShowAsSearchResults(
StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}",
new string[,] {{ "Name", local.VariableName }}), new string[,] {{ "Name", local.VariableName }}),
@ -29,7 +30,8 @@ namespace ICSharpCode.SharpDevelop.Refactoring
{ {
public override void Run() public override void Run()
{ {
Run((LocalResolveResult)Owner); RefactoringMenuContext context = (RefactoringMenuContext)Owner;
Run((LocalResolveResult)context.ResolveResult);
} }
public static void Run(LocalResolveResult local) public static void Run(LocalResolveResult local)

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

@ -139,9 +139,9 @@ namespace ICSharpCode.SharpDevelop.Refactoring
IProgressMonitor progressMonitor) IProgressMonitor progressMonitor)
{ {
if (ParserService.LoadSolutionProjectsThreadRunning) { if (ParserService.LoadSolutionProjectsThreadRunning) {
progressMonitor.ShowingDialog = true; if (progressMonitor != null) progressMonitor.ShowingDialog = true;
MessageService.ShowMessage("${res:SharpDevelop.Refactoring.LoadSolutionProjectsThreadRunning}"); MessageService.ShowMessage("${res:SharpDevelop.Refactoring.LoadSolutionProjectsThreadRunning}");
progressMonitor.ShowingDialog = false; if (progressMonitor != null) progressMonitor.ShowingDialog = false;
return null; return null;
} }
List<ProjectItem> files; List<ProjectItem> files;

Loading…
Cancel
Save