Rope Refactoring: comparison RefactoringRope/RefactoringClient.py

-:70b4fb448811
+:8ae4e95f5fa6
 import rope
 import rope.base.project
 import rope.base.libutils
 from JsonClient import JsonClient
+from ProgressHandle import ProgressHandle
 class RefactoringClient(JsonClient):
 """
 Class implementing the refactoring client interface to rope.
 "CalculateExtractChanges": self.__calculateExtractChanges,
 "RequestInlineType": self.__requestInlineType,
 "CalculateInlineChanges": self.__calculateInlineChanges,
 "RequestMoveType": self.__requestMoveType,
 "CalculateMoveChanges": self.__calculateMoveChanges,
+"RequestUseFunction": self.__requestUseFunction,
+"CalculateUseFunctionChanges": self.__calculateUseFunctionChanges,
 }
 from FileSystemCommands import RefactoringClientFileSystemCommands
 self.__fsCommands = RefactoringClientFileSystemCommands(self)
 errorDict = {}
 occurrences = []
 import rope.contrib.findit
-from ProgressHandle import ProgressHandle
 resource = rope.base.libutils.path_to_resource(
 self.__project, filename)
 self.__progressHandle = ProgressHandle(self, title, True)
 try:
 occurrences = rope.contrib.findit.find_occurrences(
 errorDict = {}
 occurrences = []
 import rope.contrib.findit
-from ProgressHandle import ProgressHandle
 resource = rope.base.libutils.path_to_resource(
 self.__project, filename)
 self.__progressHandle = ProgressHandle(self, title, True)
 try:
 occurrences = rope.contrib.findit.find_implementations(
 """
 title = params["Title"]
 errorDict = {}
-from ProgressHandle import ProgressHandle
 self.__progressHandle = ProgressHandle(self, title, True)
 try:
 rope.base.libutils.analyze_modules(
 self.__project, task_handle=self.__progressHandle)
 except Exception as err:
 self.sendJson("HistoryResult", result)
 elif subcommand in ["Undo", "Redo"]:
 change = self.__changes["History"][params["Id"]]
-from ProgressHandle import ProgressHandle
 self.__progressHandle = ProgressHandle(self, change.description,
 False)
 if subcommand == "Undo":
 self.__project.history.undo(
 change, task_handle=self.__progressHandle)
 the server
 @type dict
 """
 errorDict = {}
-from ProgressHandle import ProgressHandle
 self.__progressHandle = ProgressHandle(self, params["Title"], False)
 try:
 changes = self.__changes[params["ChangeGroup"]]
 self.__project.do(changes, self.__progressHandle)
 except Exception as err:
 if isLocal:
 resources = [resource]
 else:
 resources = None
-from ProgressHandle import ProgressHandle
 self.__progressHandle = ProgressHandle(self, title, True)
 try:
 renamer = rope.refactor.rename.Rename(
 self.__project, resource, offset)
 changes = renamer.get_changes(
 }
 import rope.refactor.extract
 resource = rope.base.libutils.path_to_resource(
 self.__project, filename)
-from ProgressHandle import ProgressHandle
 self.__progressHandle = ProgressHandle(self, title, True)
 try:
 inliner = rope.refactor.inline.create_inline(
 self.__project, resource, offset)
 if kind == "parameter":
 }
 import rope.refactor.move
 resource = rope.base.libutils.path_to_resource(
 self.__project, filename)
-from ProgressHandle import ProgressHandle
 self.__progressHandle = ProgressHandle(self, title, True)
 try:
 mover = rope.refactor.move.create_move(
 self.__project, resource, offset)
 if kind == "move_method":
 result["Subcommand"] = "ChangesCalculated"
 result.update(errorDict)
 self.sendJson("Changes", result)
+def __requestUseFunction(self, params):
+"""
+Private method to determine the 'Use Function' function name based on
+the parameters sent by the server.
+@param params dictionary containing the method parameters sent by
+the server
+@type dict
+"""
+changeGroup = params["ChangeGroup"]
+title = params["Title"]
+filename = params["FileName"]
+offset = params["Offset"]
+errorDict = {}
+result = {
+"Subcommand": "UseFunctionName",
+"ChangeGroup": changeGroup,
+"Title": title,
+}
+import rope.refactor.usefunction
+resource = rope.base.libutils.path_to_resource(
+self.__project, filename)
+try:
+user = rope.refactor.usefunction.UseFunction(
+self.__project, resource, offset)
+result["FunctionName"] = user.get_function_name()
+except Exception as err:
+errorDict = self.__handleRopeError(err)
+result.update(errorDict)
+self.sendJson("Changes", result)
+def __calculateUseFunctionChanges(self, params):
+"""
+Private method to calculate the 'Use Function' changes based on the
+parameters sent by the server.
+@param params dictionary containing the method parameters sent by
+the server
+@type dict
+"""
+changeGroup = params["ChangeGroup"]
+title = params["Title"]
+filename = params["FileName"]
+offset = params["Offset"]
+errorDict = {}
+changes = []
+result = {
+"ChangeGroup": changeGroup,
+"Title": title,
+}
+import rope.refactor.usefunction
+resource = rope.base.libutils.path_to_resource(
+self.__project, filename)
+self.__progressHandle = ProgressHandle(self, title, True)
+try:
+user = rope.refactor.usefunction.UseFunction(
+self.__project, resource, offset)
+changes = user.get_changes(task_handle=self.__progressHandle)
+except Exception as err:
+errorDict = self.__handleRopeError(err)
+self.__progressHandle.reset()
+self.__progressHandle = None
+self.__changes[changeGroup] = changes
+result["Subcommand"] = "ChangesCalculated"
+result.update(errorDict)
+self.sendJson("Changes", result)
 if __name__ == '__main__':
 if len(sys.argv) != 4:
 print('Host, port and project path parameters are missing. Abort.')
 sys.exit(1)

Mercurial Repositories > Rope Refactoring / file comparison

comparison: RefactoringRope/RefactoringClient.py

RefactoringRope/RefactoringClient.py