From 43d78ce40f9433db21bfbcd7659bfe6d11095b9e Mon Sep 17 00:00:00 2001
From: Andrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Date: Mon, 28 Jan 2013 15:52:19 +0400
Subject: [PATCH] Ask the user if he wants to rename the old-style property
 itself or its getter/setter function

---
 .../rename/RenamePyFunctionProcessor.java           | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/python/src/com/jetbrains/python/refactoring/rename/RenamePyFunctionProcessor.java b/python/src/com/jetbrains/python/refactoring/rename/RenamePyFunctionProcessor.java
index 692f5ce44650..b2178b03179f 100644
--- a/python/src/com/jetbrains/python/refactoring/rename/RenamePyFunctionProcessor.java
+++ b/python/src/com/jetbrains/python/refactoring/rename/RenamePyFunctionProcessor.java
@@ -1,5 +1,6 @@
 package com.jetbrains.python.refactoring.rename;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.psi.PsiElement;
@@ -80,7 +81,17 @@ public class RenamePyFunctionProcessor extends RenamePyElementProcessor {
     if (property != null) {
       site = property.getDefinitionSite();
       if (site != null) {
-        return site;
+        if (ApplicationManager.getApplication().isUnitTestMode()) {
+          return site;
+        }
+        final String message = String.format("Do you want to rename the property '%s' instead of its accessor function '%s'?",
+                                             property.getName(), function.getName());
+        final int rc = Messages.showYesNoCancelDialog(element.getProject(), message, "Rename", Messages.getQuestionIcon());
+        switch (rc) {
+          case 0: return site;
+          case 1: return function;
+          default: return null;
+        }
       }
     }
     return function;