Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
authorAlan McGovern <alan.mcgovern@gmail.com>2017-07-27 13:37:59 +0300
committerAlan McGovern <alan.mcgovern@gmail.com>2017-07-27 13:37:59 +0300
commit82ebce67e220e1e96df2c6ecbb70bf0cc7b7c2a1 (patch)
tree13313ab19b4639e7541b68ce8595db697481a90a /main/src
parent8559ada66951f7d6439ee04dc49b63140fc4d729 (diff)
Revert "Fixed 'Bug 44384 - Rename refactoring on constructor should rename"
This reverts commit e9adf2b5eaee5ba85bc71c294f681fa5cc69bdab. This broke the build: `error CS0019: Operator '==' cannot be applied to operands of type 'SymbolAndProjectId' and '<null>'`
Diffstat (limited to 'main/src')
-rw-r--r--main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs7
1 files changed, 2 insertions, 5 deletions
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs
index 345ec9b7d6..a59854a2e1 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/RenameHandler.cs
@@ -39,7 +39,6 @@ using MonoDevelop.Refactoring.Rename;
using MonoDevelop.Ide.TypeSystem;
using System.Threading.Tasks;
using System.Threading;
-using Microsoft.CodeAnalysis.Rename;
namespace MonoDevelop.CSharp.Refactoring
{
@@ -85,12 +84,10 @@ namespace MonoDevelop.CSharp.Refactoring
internal async Task Run (TextEditor editor, DocumentContext ctx)
{
var cts = new CancellationTokenSource ();
- var getSymbolTask = RenameLocations.ReferenceProcessing.GetRenamableSymbolAsync (ctx.AnalysisDocument, editor.CaretOffset, cts.Token);
+ var getSymbolTask = RefactoringSymbolInfo.GetSymbolInfoAsync (ctx, editor, cts.Token);
var message = GettextCatalog.GetString ("Resolving symbol…");
var info = await MessageService.ExecuteTaskAndShowWaitDialog (getSymbolTask, message, cts);
- if (info == null)
- return;
- var sym = info.Symbol;
+ var sym = info.DeclaredSymbol ?? info.Symbol;
if (!CanRename (sym))
return;
await new RenameRefactoring ().Rename (sym);