RefactoringRope/RefactoringServer.py

Mon, 17 Oct 2022 08:37:10 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 17 Oct 2022 08:37:10 +0200
branch
eric7
changeset 392
b9b0a462123d
parent 389
4f53795beff0
child 394
b34f5dd3db27
permissions
-rw-r--r--

Fixed an issue resolving the project specific interpreter.

1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1 # -*- coding: utf-8 -*-
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2
374
958f34e97952 Updated copyright for 2022.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 365
diff changeset
3 # Copyright (c) 2010 - 2022 Detlev Offenbach <detlev@die-offenbachs.de>
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
4 #
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
5
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
6 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
7 Module implementing the refactoring interface to rope.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
8 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
9
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
10 import os
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
11 import contextlib
50
a29c3d2e6dc0 rope for Python2 projects enabled, if running on Python2
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 48
diff changeset
12
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
13 from PyQt6.QtCore import pyqtSlot
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
14 from PyQt6.QtGui import QAction
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
15 from PyQt6.QtWidgets import QMenu, QApplication
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
16 from PyQt6.Qsci import QsciScintilla
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
17
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
18 from EricWidgets.EricApplication import ericApp
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
19 from EricWidgets import EricMessageBox
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
20 from EricGui.EricAction import EricAction
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
21
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
22 from EricNetwork.EricJsonServer import EricJsonServer
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
23
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
24 from .RopeProgressDialog import RopeProgressDialog
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
25
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
26 import Utilities
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
27 import Preferences
360
2b35968f3d02 Version 8.0.0
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 354
diff changeset
28 import Globals
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
29
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
30 from Preferences.Shortcuts import readShortcuts
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
31
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
32
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
33 class RefactoringServer(EricJsonServer):
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
34 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
35 Class implementing the refactoring interface to rope.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
36 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
37
31
0389d4a924cc Dropped support for eric 5.0.x.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 26
diff changeset
38 def __init__(self, plugin, parent=None):
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
39 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
40 Constructor
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
41
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
42 @param plugin reference to the plugin object
192
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 191
diff changeset
43 @type RefactoringRopePlugin
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 191
diff changeset
44 @param parent parent
20950ed6b384 Extended the JsonServer to handle multiple clients simultaneously.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 191
diff changeset
45 @type QObject
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
46 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
47 super().__init__("RefactoringServer", parent=parent)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
48
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
49 self.__plugin = plugin
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
50 self.__ui = parent
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
51 self.__vm = ericApp().getObject("ViewManager")
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
52 self.__ericProject = ericApp().getObject("Project")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
53 self.__projectpath = ""
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
54 self.__projectLanguage = ""
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
55 self.__projectopen = False
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
56 self.__ropeConfig = {}
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
57
313
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
58 self.__mainMenu = None
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
59 self.__mainAct = None
313
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
60 self.__separatorAct = None
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
61
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
62 self.__progressDialog = None
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
63 self.__helpDialog = None
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
64 self.__historyDialog = None
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
65 self.__refactoringDialogs = {}
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
66
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
67 from .FileSystemCommands import EricFileSystemCommands
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
68
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
69 self.__fsCommands = EricFileSystemCommands(self.__ericProject)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
70
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
71 self.__methodMapping = {
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
72 "Config": self.__setConfig,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
73 "Progress": self.__processProgress,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
74 "QueryReferencesResult": self.__queryReferencesResult,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
75 "QueryDefinitionResult": self.__queryDefinitionResult,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
76 "QueryImplementationsResult": self.__queryImplementationsResult,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
77 "SoaFinished": self.__soaFinished,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
78 "FileSystemCommand": self.__fsCommands.processFileSystemCommand,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
79 "ClientException": self.__processClientException,
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
80 "HistoryResult": self.__processHistoryResult,
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
81 "Changes": self.__processChanges,
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
82 }
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
83
194
5c297b473425 Some more refactorings of the code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 192
diff changeset
84 @pyqtSlot()
5c297b473425 Some more refactorings of the code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 192
diff changeset
85 def handleNewConnection(self):
5c297b473425 Some more refactorings of the code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 192
diff changeset
86 """
5c297b473425 Some more refactorings of the code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 192
diff changeset
87 Public slot for new incoming connections from a client.
5c297b473425 Some more refactorings of the code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 192
diff changeset
88 """
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
89 super().handleNewConnection()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
90
194
5c297b473425 Some more refactorings of the code.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 192
diff changeset
91 self.sendJson("GetConfig", {})
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
92
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
93 def activate(self):
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
94 """
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
95 Public method to activate the refactoring server.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
96
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
97 This is performed when the rope plug-in is activated.
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
98 """
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
99 self.__initActions()
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
100 ericApp().registerPluginObject("RefactoringRope", self)
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
101 readShortcuts(pluginName="RefactoringRope")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
102
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
103 self.__mainMenu = self.__initMenu()
313
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
104 projectToolsMenu = self.__ui.getMenu("project_tools")
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
105 if projectToolsMenu is not None:
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
106 insertBeforeAct = projectToolsMenu.actions()[0]
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
107 self.__mainAct = projectToolsMenu.insertMenu(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
108 insertBeforeAct, self.__mainMenu
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
109 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
110 self.__separatorAct = projectToolsMenu.insertSeparator(insertBeforeAct)
313
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
111 else:
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
112 projectAct = self.__ui.getMenuBarAction("project")
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
113 actions = self.__ui.menuBar().actions()
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
114 insertBeforeAct = actions[actions.index(projectAct) + 1]
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
115 self.__mainAct = self.__ui.menuBar().insertMenu(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
116 insertBeforeAct, self.__mainMenu
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
117 )
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
118 self.__mainAct.setEnabled(False)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
119
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
120 if ericApp().getObject("Project").isOpen():
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
121 self.projectOpened()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
122
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
123 ericApp().getObject("Project").projectOpened.connect(self.projectOpened)
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
124 ericApp().getObject("Project").projectPropertiesChanged.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
125 self.projectOpened
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
126 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
127 ericApp().getObject("Project").projectClosed.connect(self.projectClosed)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
128 ericApp().getObject("Project").newProject.connect(self.projectOpened)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
129
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
130 def deactivate(self):
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
131 """
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
132 Public method to deactivate the refactoring server.
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
133 """
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
134 ericApp().unregisterPluginObject("RefactoringRope")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
135
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
136 ericApp().getObject("Project").projectOpened.disconnect(self.projectOpened)
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
137 ericApp().getObject("Project").projectPropertiesChanged.disconnect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
138 self.projectOpened
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
139 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
140 ericApp().getObject("Project").projectClosed.disconnect(self.projectClosed)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
141 ericApp().getObject("Project").newProject.disconnect(self.projectOpened)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
142
313
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
143 projectToolsMenu = self.__ui.getMenu("project_tools")
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
144 if projectToolsMenu is not None:
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
145 projectToolsMenu.removeAction(self.__separatorAct)
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
146 projectToolsMenu.removeAction(self.__mainAct)
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
147 else:
327178d25538 RefactoringServer: changes to support changed eric6 menu structure as of eric6 19.06.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 309
diff changeset
148 self.__ui.menuBar().removeAction(self.__mainAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
149
275
45ac265bee4b RefactoringServer: fixed an issue during deactivation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 270
diff changeset
150 self.projectClosed()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
151
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
152 def getMainWindow(self):
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
153 """
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
154 Public method to get a reference to the IDE main window.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
155
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
156 @return reference to the IDE main window
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
157 @rtype UserInterface
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
158 """
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
159 return self.__ui
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
160
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
161 def __initActions(self):
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
162 """
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
163 Private method to define the refactoring actions.
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
164 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
165 self.actions = []
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
166
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
167 #####################################################
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
168 ## Rename refactoring actions
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
169 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
170
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
171 self.refactoringRenameAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
172 self.tr("Rename"), self.tr("&Rename"), 0, 0, self, "refactoring_rename"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
173 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
174 self.refactoringRenameAct.setStatusTip(self.tr("Rename the highlighted object"))
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
175 self.refactoringRenameAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
176 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
177 """<b>Rename</b>""" """<p>Rename the highlighted Python object.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
178 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
179 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
180 self.refactoringRenameAct.triggered.connect(self.__rename)
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
181 self.actions.append(self.refactoringRenameAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
182
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
183 self.refactoringRenameLocalAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
184 self.tr("Local Rename"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
185 self.tr("&Local Rename"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
186 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
187 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
188 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
189 "refactoring_rename_local",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
190 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
191 self.refactoringRenameLocalAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
192 self.tr("Rename the highlighted object in the current module only")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
193 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
194 self.refactoringRenameLocalAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
195 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
196 """<b>Local Rename</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
197 """<p>Rename the highlighted Python object in the current"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
198 """ module only.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
199 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
200 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
201 self.refactoringRenameLocalAct.triggered.connect(self.__renameLocal)
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
202 self.actions.append(self.refactoringRenameLocalAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
203
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
204 self.refactoringRenameModuleAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
205 self.tr("Rename Current Module"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
206 self.tr("Rename Current Module"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
207 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
208 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
209 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
210 "refactoring_rename_module",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
211 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
212 self.refactoringRenameModuleAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
213 self.tr("Rename the current module")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
214 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
215 self.refactoringRenameModuleAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
216 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
217 """<b>Rename Current Module</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
218 """<p>Rename the current module.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
219 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
220 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
221 self.refactoringRenameModuleAct.triggered.connect(self.__renameModule)
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
222 self.actions.append(self.refactoringRenameModuleAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
223
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
224 self.refactoringChangeOccurrencesAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
225 self.tr("Change Occurrences"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
226 self.tr("Change &Occurrences"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
227 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
228 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
229 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
230 "refactoring_change_occurrences",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
231 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
232 self.refactoringChangeOccurrencesAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
233 self.tr("Change all occurrences in the local scope")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
234 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
235 self.refactoringChangeOccurrencesAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
236 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
237 """<b>Change Occurrences</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
238 """<p>Change all occurrences in the local scope.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
239 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
240 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
241 self.refactoringChangeOccurrencesAct.triggered.connect(self.__changeOccurrences)
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
242 self.actions.append(self.refactoringChangeOccurrencesAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
243
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
244 #####################################################
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
245 ## Extract refactoring actions
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
246 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
247
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
248 self.refactoringExtractMethodAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
249 self.tr("Extract method"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
250 self.tr("Extract &Method"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
251 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
252 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
253 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
254 "refactoring_extract_method",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
255 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
256 self.refactoringExtractMethodAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
257 self.tr("Extract the highlighted area as a method")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
258 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
259 self.refactoringExtractMethodAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
260 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
261 """<b>Extract method</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
262 """<p>Extract the highlighted area as a method or function.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
263 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
264 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
265 self.refactoringExtractMethodAct.triggered.connect(self.__extractMethod)
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
266 self.actions.append(self.refactoringExtractMethodAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
267
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
268 self.refactoringExtractLocalVariableAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
269 self.tr("Extract local variable"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
270 self.tr("&Extract Local Variable"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
271 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
272 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
273 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
274 "refactoring_extract_variable",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
275 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
276 self.refactoringExtractLocalVariableAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
277 self.tr("Extract the highlighted area as a local variable")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
278 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
279 self.refactoringExtractLocalVariableAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
280 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
281 """<b>Extract local variable</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
282 """<p>Extract the highlighted area as a local variable.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
283 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
284 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
285 self.refactoringExtractLocalVariableAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
286 self.__extractLocalVariable
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
287 )
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
288 self.actions.append(self.refactoringExtractLocalVariableAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
289
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
290 #####################################################
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
291 ## Inline refactoring actions
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
292 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
293
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
294 self.refactoringInlineAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
295 self.tr("Inline"), self.tr("&Inline"), 0, 0, self, "refactoring_inline"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
296 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
297 self.refactoringInlineAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
298 self.tr("Inlines the selected local variable or method")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
299 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
300 self.refactoringInlineAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
301 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
302 """<b>Inline</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
303 """<p>Inlines the selected local variable or method.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
304 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
305 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
306 self.refactoringInlineAct.triggered.connect(self.__inline)
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
307 self.actions.append(self.refactoringInlineAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
308
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
309 #####################################################
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
310 ## Move refactoring actions
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
311 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
312
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
313 self.refactoringMoveMethodAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
314 self.tr("Move method"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
315 self.tr("Mo&ve Method"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
316 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
317 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
318 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
319 "refactoring_move_method",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
320 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
321 self.refactoringMoveMethodAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
322 self.tr("Move the highlighted method to another class")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
323 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
324 self.refactoringMoveMethodAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
325 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
326 """<b>Move method</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
327 """<p>Move the highlighted method to another class.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
328 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
329 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
330 self.refactoringMoveMethodAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
331 lambda: self.__move("move_method")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
332 )
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
333 self.actions.append(self.refactoringMoveMethodAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
334
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
335 self.refactoringMoveModuleAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
336 self.tr("Move current module"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
337 self.tr("Move Current Module"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
338 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
339 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
340 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
341 "refactoring_move_module",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
342 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
343 self.refactoringMoveModuleAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
344 self.tr("Move the current module to another package")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
345 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
346 self.refactoringMoveModuleAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
347 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
348 """<b>Move current module</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
349 """<p>Move the current module to another package.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
350 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
351 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
352 self.refactoringMoveModuleAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
353 lambda: self.__move("move_module")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
354 )
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
355 self.actions.append(self.refactoringMoveModuleAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
356
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
357 #####################################################
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
358 ## Use function refactoring action
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
359 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
360
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
361 self.refactoringUseFunctionAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
362 self.tr("Use Function"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
363 self.tr("Use Function"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
364 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
365 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
366 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
367 "refactoring_use_function",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
368 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
369 self.refactoringUseFunctionAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
370 self.tr("Use a function wherever possible.")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
371 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
372 self.refactoringUseFunctionAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
373 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
374 """<b>Use function</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
375 """<p>Tries to use a function wherever possible.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
376 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
377 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
378 self.refactoringUseFunctionAct.triggered.connect(self.__useFunction)
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
379 self.actions.append(self.refactoringUseFunctionAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
380
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
381 #####################################################
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
382 ## Introduce refactorings actions
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
383 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
384
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
385 self.refactoringIntroduceFactoryAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
386 self.tr("Introduce Factory Method"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
387 self.tr("Introduce &Factory Method"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
388 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
389 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
390 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
391 "refactoring_introduce_factory_method",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
392 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
393 self.refactoringIntroduceFactoryAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
394 self.tr("Introduce a factory method or function")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
395 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
396 self.refactoringIntroduceFactoryAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
397 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
398 """<b>Introduce Factory Method</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
399 """<p>Introduce a factory method or function.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
400 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
401 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
402 self.refactoringIntroduceFactoryAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
403 self.__introduceFactoryMethod
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
404 )
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
405 self.actions.append(self.refactoringIntroduceFactoryAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
406
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
407 self.refactoringIntroduceParameterAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
408 self.tr("Introduce Parameter"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
409 self.tr("Introduce &Parameter"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
410 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
411 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
412 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
413 "refactoring_introduce_parameter_method",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
414 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
415 self.refactoringIntroduceParameterAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
416 self.tr("Introduce a parameter in a function")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
417 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
418 self.refactoringIntroduceParameterAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
419 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
420 """<b>Introduce Parameter</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
421 """<p>Introduce a parameter in a function.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
422 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
423 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
424 self.refactoringIntroduceParameterAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
425 self.__introduceParameter
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
426 )
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
427 self.actions.append(self.refactoringIntroduceParameterAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
428
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
429 #####################################################
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
430 ## Import refactorings actions
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
431 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
432
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
433 self.refactoringImportsOrganizeAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
434 self.tr("Organize Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
435 self.tr("&Organize Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
436 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
437 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
438 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
439 "refactoring_organize_imports",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
440 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
441 self.refactoringImportsOrganizeAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
442 self.tr("Sort imports according to PEP-8")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
443 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
444 self.refactoringImportsOrganizeAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
445 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
446 """<b>Organize Imports</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
447 """<p>Sort imports according to PEP-8.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
448 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
449 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
450 self.refactoringImportsOrganizeAct.triggered.connect(self.__importsOrganize)
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
451 self.actions.append(self.refactoringImportsOrganizeAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
452
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
453 self.refactoringImportsStarExpandAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
454 self.tr("Expand Star Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
455 self.tr("E&xpand Star Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
456 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
457 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
458 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
459 "refactoring_expand_star_imports",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
460 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
461 self.refactoringImportsStarExpandAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
462 self.tr('Expand imports like "from xxx import *"')
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
463 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
464 self.refactoringImportsStarExpandAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
465 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
466 """<b>Expand Star Imports</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
467 """<p>Expand imports like "from xxx import *".</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
468 """<p>Select the import to act on or none to do all."""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
469 """ Unused imports are deleted.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
470 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
471 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
472 self.refactoringImportsStarExpandAct.triggered.connect(self.__importsExpandStar)
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
473 self.actions.append(self.refactoringImportsStarExpandAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
474
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
475 self.refactoringImportsRelativeToAbsoluteAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
476 self.tr("Relative to Absolute"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
477 self.tr("Relative to &Absolute"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
478 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
479 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
480 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
481 "refactoring_relative_to_absolute_imports",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
482 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
483 self.refactoringImportsRelativeToAbsoluteAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
484 self.tr("Transform relative imports to absolute ones")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
485 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
486 self.refactoringImportsRelativeToAbsoluteAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
487 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
488 """<b>Relative to Absolute</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
489 """<p>Transform relative imports to absolute ones.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
490 """<p>Select the import to act on or none to do all."""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
491 """ Unused imports are deleted.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
492 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
493 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
494 self.refactoringImportsRelativeToAbsoluteAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
495 self.__importsRelativeToAbsolute
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
496 )
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
497 self.actions.append(self.refactoringImportsRelativeToAbsoluteAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
498
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
499 self.refactoringImportsFromsToImportsAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
500 self.tr("Froms to Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
501 self.tr("Froms to &Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
502 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
503 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
504 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
505 "refactoring_froms_to_imports",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
506 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
507 self.refactoringImportsFromsToImportsAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
508 self.tr("Transform From imports to plain imports")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
509 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
510 self.refactoringImportsFromsToImportsAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
511 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
512 """<b>Froms to Imports</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
513 """<p>Transform From imports to plain imports.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
514 """<p>Select the import to act on or none to do all."""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
515 """ Unused imports are deleted.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
516 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
517 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
518 self.refactoringImportsFromsToImportsAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
519 self.__importsFromToImport
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
520 )
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
521 self.actions.append(self.refactoringImportsFromsToImportsAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
522
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
523 self.refactoringImportsHandleLongAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
524 self.tr("Handle Long Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
525 self.tr("Handle &Long Imports"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
526 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
527 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
528 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
529 "refactoring_organize_imports",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
530 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
531 self.refactoringImportsHandleLongAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
532 self.tr("Transform long import statements to look better")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
533 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
534 self.refactoringImportsHandleLongAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
535 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
536 """<b>Handle Long Imports</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
537 """<p>Transform long import statements to look better.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
538 """<p>Select the import to act on or none to do all."""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
539 """ Unused imports are deleted.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
540 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
541 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
542 self.refactoringImportsHandleLongAct.triggered.connect(self.__importsHandleLong)
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
543 self.actions.append(self.refactoringImportsHandleLongAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
544
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
545 #####################################################
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
546 ## Various refactorings actions
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
547 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
548
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
549 self.refactoringRestructureAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
550 self.tr("Restructure"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
551 self.tr("Res&tructure"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
552 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
553 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
554 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
555 "refactoring_restructure",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
556 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
557 self.refactoringRestructureAct.setStatusTip(self.tr("Restructure code"))
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
558 self.refactoringRestructureAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
559 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
560 """<b>Restructure</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
561 """<p>Restructure code. See "Rope Help" for examples.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
562 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
563 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
564 self.refactoringRestructureAct.triggered.connect(self.__restructure)
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
565 self.actions.append(self.refactoringRestructureAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
566
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
567 self.refactoringChangeSignatureAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
568 self.tr("Change Method Signature"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
569 self.tr("&Change Method Signature"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
570 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
571 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
572 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
573 "refactoring_change_method_signature",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
574 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
575 self.refactoringChangeSignatureAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
576 self.tr("Change the signature of the selected method or function")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
577 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
578 self.refactoringChangeSignatureAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
579 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
580 """<b>Change Method Signature</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
581 """<p>Change the signature of the selected method"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
582 """ or function.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
583 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
584 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
585 self.refactoringChangeSignatureAct.triggered.connect(self.__changeSignature)
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
586 self.actions.append(self.refactoringChangeSignatureAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
587
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
588 self.refactoringInlineArgumentDefaultAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
589 self.tr("Inline Argument Default"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
590 self.tr("Inline &Argument Default"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
591 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
592 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
593 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
594 "refactoring_inline_argument_default",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
595 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
596 self.refactoringInlineArgumentDefaultAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
597 self.tr("Inline a parameters default value")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
598 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
599 self.refactoringInlineArgumentDefaultAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
600 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
601 """<b>Inline Argument Default</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
602 """<p>Inline a parameters default value.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
603 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
604 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
605 self.refactoringInlineArgumentDefaultAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
606 self.__inlineArgumentDefault
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
607 )
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
608 self.actions.append(self.refactoringInlineArgumentDefaultAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
609
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
610 self.refactoringTransformModuleAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
611 self.tr("Transform Module to Package"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
612 self.tr("Transform Module to Package"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
613 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
614 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
615 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
616 "refactoring_transform_module_to_package",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
617 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
618 self.refactoringTransformModuleAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
619 self.tr("Transform the current module to a package")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
620 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
621 self.refactoringTransformModuleAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
622 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
623 """<b>Transform Module to Package</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
624 """<p>Transform the current module to a package.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
625 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
626 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
627 self.refactoringTransformModuleAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
628 self.__transformModuleToPackage
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
629 )
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
630 self.actions.append(self.refactoringTransformModuleAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
631
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
632 self.refactoringEncapsulateAttributeAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
633 self.tr("Encapsulate Attribute"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
634 self.tr("Encap&sulate Attribute"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
635 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
636 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
637 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
638 "refactoring_encapsulate_attribute",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
639 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
640 self.refactoringEncapsulateAttributeAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
641 self.tr("Generate a getter/setter for an attribute")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
642 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
643 self.refactoringEncapsulateAttributeAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
644 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
645 """<b>Encapsulate Attribute</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
646 """<p>Generate a getter/setter for an attribute and changes"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
647 """ its occurrences to use them.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
648 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
649 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
650 self.refactoringEncapsulateAttributeAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
651 self.__encapsulateAttribute
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
652 )
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
653 self.actions.append(self.refactoringEncapsulateAttributeAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
654
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
655 self.refactoringLocalVariableToAttributeAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
656 self.tr("Local Variable to Attribute"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
657 self.tr("Local Varia&ble to Attribute"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
658 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
659 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
660 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
661 "refactoring_local_variable_to_attribute",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
662 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
663 self.refactoringLocalVariableToAttributeAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
664 self.tr("Change a local variable to an attribute")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
665 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
666 self.refactoringLocalVariableToAttributeAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
667 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
668 """<b>Local Variable to Attribute</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
669 """<p>Change a local variable to an attribute.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
670 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
671 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
672 self.refactoringLocalVariableToAttributeAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
673 self.__convertLocalToAttribute
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
674 )
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
675 self.actions.append(self.refactoringLocalVariableToAttributeAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
676
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
677 self.refactoringMethodToMethodObjectAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
678 self.tr("Method To Method Object"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
679 self.tr("Method To Method Ob&ject"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
680 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
681 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
682 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
683 "refactoring_method_to_methodobject",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
684 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
685 self.refactoringMethodToMethodObjectAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
686 self.tr("Transform a function or a method to a method object")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
687 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
688 self.refactoringMethodToMethodObjectAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
689 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
690 """<b>Method To Method Object</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
691 """<p>Transform a function or a method to a method object.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
692 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
693 )
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
694 self.refactoringMethodToMethodObjectAct.triggered.connect(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
695 self.__methodToMethodObject
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
696 )
13
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
697 self.actions.append(self.refactoringMethodToMethodObjectAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
698
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
699 #####################################################
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
700 ## History actions
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
701 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
702
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
703 self.refactoringProjectHistoryAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
704 self.tr("Show Project History"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
705 self.tr("Show Project History..."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
706 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
707 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
708 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
709 "refactoring_show_project_history",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
710 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
711 self.refactoringProjectHistoryAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
712 self.tr("Show the refactoring history of the project")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
713 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
714 self.refactoringProjectHistoryAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
715 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
716 """<b>Show Project History</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
717 """<p>This opens a dialog to show the refactoring history of"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
718 """ the project.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
719 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
720 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
721 self.refactoringProjectHistoryAct.triggered.connect(self.__showProjectHistory)
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
722 self.actions.append(self.refactoringProjectHistoryAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
723
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
724 self.refactoringFileHistoryAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
725 self.tr("Show Current File History"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
726 self.tr("Show Current File History..."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
727 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
728 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
729 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
730 "refactoring_show_file_history",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
731 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
732 self.refactoringFileHistoryAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
733 self.tr("Show the refactoring history of the current file")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
734 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
735 self.refactoringFileHistoryAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
736 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
737 """<b>Show Current File History</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
738 """<p>This opens a dialog to show the refactoring history of"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
739 """ the current file.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
740 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
741 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
742 self.refactoringFileHistoryAct.triggered.connect(self.__showFileHistory)
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
743 self.actions.append(self.refactoringFileHistoryAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
744
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
745 self.refactoringClearHistoryAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
746 self.tr("Clear History"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
747 self.tr("Clear History"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
748 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
749 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
750 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
751 "refactoring_clear_history",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
752 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
753 self.refactoringClearHistoryAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
754 self.tr("Clear the refactoring history")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
755 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
756 self.refactoringClearHistoryAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
757 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
758 """<b>Clear History</b>""" """<p>Clears the refactoring history.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
759 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
760 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
761 self.refactoringClearHistoryAct.triggered.connect(self.__clearHistory)
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
762 self.actions.append(self.refactoringClearHistoryAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
763
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
764 #####################################################
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
765 ## Query actions
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
766 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
767
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
768 self.queryReferencesAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
769 self.tr("Find occurrences"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
770 self.tr("Find &Occurrences"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
771 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
772 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
773 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
774 "refactoring_find_occurrences",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
775 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
776 self.queryReferencesAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
777 self.tr("Find occurrences of the highlighted object")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
778 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
779 self.queryReferencesAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
780 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
781 """<b>Find occurrences</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
782 """<p>Find occurrences of the highlighted class, method,"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
783 """ function or variable.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
784 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
785 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
786 self.queryReferencesAct.triggered.connect(self.__queryReferences)
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
787 self.actions.append(self.queryReferencesAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
788
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
789 self.queryDefinitionAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
790 self.tr("Find definition"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
791 self.tr("Find &Definition"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
792 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
793 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
794 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
795 "refactoring_find_definition",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
796 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
797 self.queryDefinitionAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
798 self.tr("Find definition of the highlighted item")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
799 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
800 self.queryDefinitionAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
801 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
802 """<b>Find definition</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
803 """<p>Find the definition of the highlighted class, method,"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
804 """ function or variable.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
805 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
806 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
807 self.queryDefinitionAct.triggered.connect(self.__queryDefinition)
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
808 self.actions.append(self.queryDefinitionAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
809
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
810 self.queryImplementationsAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
811 self.tr("Find implementations"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
812 self.tr("Find &Implementations"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
813 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
814 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
815 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
816 "refactoring_find_implementations",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
817 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
818 self.queryImplementationsAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
819 self.tr("Find places where the selected method is overridden")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
820 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
821 self.queryImplementationsAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
822 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
823 """<b>Find implementations</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
824 """<p>Find places where the selected method is overridden.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
825 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
826 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
827 self.queryImplementationsAct.triggered.connect(self.__queryImplementations)
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
828 self.actions.append(self.queryImplementationsAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
829
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
830 #####################################################
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
831 ## Various actions
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
832 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
833
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
834 self.refactoringEditConfigAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
835 self.tr("Configure Rope"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
836 self.tr("&Configure Rope"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
837 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
838 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
839 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
840 "refactoring_edit_config",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
841 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
842 self.refactoringEditConfigAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
843 self.tr("Open the rope configuration file")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
844 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
845 self.refactoringEditConfigAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
846 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
847 """<b>Configure Rope</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
848 """<p>Opens the rope configuration file in an editor.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
849 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
850 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
851 self.refactoringEditConfigAct.triggered.connect(self.__editConfig)
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
852 self.refactoringEditConfigAct.setMenuRole(QAction.MenuRole.NoRole)
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
853 self.actions.append(self.refactoringEditConfigAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
854
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
855 self.refactoringHelpAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
856 self.tr("Rope Help"), self.tr("Rope &Help"), 0, 0, self, "refactoring_help"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
857 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
858 self.refactoringHelpAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
859 self.tr("Show help about the rope refactorings")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
860 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
861 self.refactoringHelpAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
862 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
863 """<b>Rope help</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
864 """<p>Show some help text about the rope refactorings.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
865 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
866 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
867 self.refactoringHelpAct.triggered.connect(self.__showRopeHelp)
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
868 self.actions.append(self.refactoringHelpAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
869
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
870 self.refactoringAllSoaAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
871 self.tr("Analyse all modules"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
872 self.tr("&Analyse all modules"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
873 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
874 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
875 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
876 "refactoring_analyze_all",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
877 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
878 self.refactoringAllSoaAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
879 self.tr("Perform static object analysis on all modules")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
880 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
881 self.refactoringAllSoaAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
882 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
883 """<b>Analyse all modules</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
884 """<p>Perform static object analysis (SOA) on all modules. """
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
885 """This might be time consuming. Analysis of all modules """
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
886 """should only be neccessary, if the project was created """
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
887 """with the rope plugin disabled or if files were added.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
888 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
889 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
890 self.refactoringAllSoaAct.triggered.connect(self.__performSOA)
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
891 self.actions.append(self.refactoringAllSoaAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
892
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
893 self.updateConfigAct = EricAction(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
894 self.tr("Update Configuration"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
895 self.tr("&Update Configuration"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
896 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
897 0,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
898 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
899 "refactoring_update_configuration",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
900 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
901 self.updateConfigAct.setStatusTip(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
902 self.tr("Generates a new configuration file overwriting the current one.")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
903 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
904 self.updateConfigAct.setWhatsThis(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
905 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
906 """<b>Update Configuration</b>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
907 """<p>Generates a new configuration file overwriting"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
908 """ the current one.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
909 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
910 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
911 self.updateConfigAct.triggered.connect(self.__updateConfig)
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
912 self.actions.append(self.updateConfigAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
913
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
914 for act in self.actions:
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
915 act.setEnabled(False)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
916
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
917 def __initMenu(self):
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
918 """
191
2af42804bca2 Did some code refactoring and removed backward compatability code for eric < 6.1.0.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 189
diff changeset
919 Private slot to initialize the refactoring menu.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
920
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
921 @return the menu generated
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
922 @rtype QMenu
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
923 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
924 menu = QMenu(self.tr("&Refactoring"), self.__ui)
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
925 menu.setTearOffEnabled(True)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
926
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
927 act = menu.addAction("rope", self.__ropeInfo)
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
928 font = act.font()
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
929 font.setBold(True)
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
930 act.setFont(font)
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
931 menu.addSeparator()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
932
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
933 smenu = menu.addMenu(self.tr("&Query"))
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
934 smenu.addAction(self.queryReferencesAct)
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
935 smenu.addAction(self.queryDefinitionAct)
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
936 smenu.addAction(self.queryImplementationsAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
937
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
938 smenu = menu.addMenu(self.tr("&Refactoring"))
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
939 smenu.addAction(self.refactoringRenameAct)
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
940 smenu.addAction(self.refactoringRenameLocalAct)
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
941 smenu.addAction(self.refactoringChangeOccurrencesAct)
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
942 smenu.addSeparator()
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
943 smenu.addAction(self.refactoringExtractMethodAct)
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
944 smenu.addAction(self.refactoringMoveMethodAct)
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
945 smenu.addSeparator()
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
946 smenu.addAction(self.refactoringInlineAct)
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
947 smenu.addSeparator()
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
948 smenu.addAction(self.refactoringExtractLocalVariableAct)
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
949 smenu.addSeparator()
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
950 smenu.addAction(self.refactoringUseFunctionAct)
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
951 smenu.addSeparator()
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
952 smenu.addAction(self.refactoringChangeSignatureAct)
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
953 smenu.addAction(self.refactoringInlineArgumentDefaultAct)
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
954 smenu.addSeparator()
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
955 smenu.addAction(self.refactoringRestructureAct)
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
956 smenu.addSeparator()
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
957 smenu.addAction(self.refactoringIntroduceFactoryAct)
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
958 smenu.addAction(self.refactoringIntroduceParameterAct)
13
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
959 smenu.addAction(self.refactoringMethodToMethodObjectAct)
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
960 smenu.addSeparator()
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
961 smenu.addAction(self.refactoringEncapsulateAttributeAct)
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
962 smenu.addAction(self.refactoringLocalVariableToAttributeAct)
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
963 smenu.addSeparator()
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
964 smenu.addAction(self.refactoringRenameModuleAct)
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
965 smenu.addAction(self.refactoringMoveModuleAct)
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
966 smenu.addAction(self.refactoringTransformModuleAct)
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
967 smenu.addSeparator()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
968
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
969 imenu = smenu.addMenu(self.tr("Im&ports"))
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
970 imenu.addAction(self.refactoringImportsOrganizeAct)
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
971 imenu.addAction(self.refactoringImportsStarExpandAct)
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
972 imenu.addAction(self.refactoringImportsRelativeToAbsoluteAct)
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
973 imenu.addAction(self.refactoringImportsFromsToImportsAct)
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
974 imenu.addAction(self.refactoringImportsHandleLongAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
975
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
976 smenu.addSeparator()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
977
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
978 hmenu = smenu.addMenu(self.tr("History"))
31
0389d4a924cc Dropped support for eric 5.0.x.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 26
diff changeset
979 hmenu.aboutToShow.connect(self.__showRefactoringHistoryMenu)
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
980 hmenu.addAction(self.refactoringProjectHistoryAct)
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
981 hmenu.addAction(self.refactoringFileHistoryAct)
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
982 hmenu.addSeparator()
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
983 hmenu.addAction(self.refactoringClearHistoryAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
984
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
985 smenu = menu.addMenu(self.tr("&Utilities"))
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
986 smenu.addAction(self.refactoringAllSoaAct)
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
987 smenu.addSeparator()
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
988 smenu.addAction(self.updateConfigAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
989
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
990 menu.addSeparator()
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
991 menu.addAction(self.refactoringEditConfigAct)
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
992 menu.addAction(self.refactoringHelpAct)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
993
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
994 return menu
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
995
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
996 ##################################################################
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
997 ## slots below implement general functionality
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
998 ##################################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
999
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1000 def __ropeInfo(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1001 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1002 Private slot to show some info about rope.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
1003 """
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
1004 if self.__ropeConfig:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1005 EricMessageBox.about(
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
1006 self.__ui,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
1007 self.tr("About rope"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1008 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1009 "{0}\nVersion {1}\n\n{2}".format(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1010 self.__ropeConfig["RopeInfo"],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1011 self.__ropeConfig["RopeVersion"],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1012 self.__ropeConfig["RopeCopyright"],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1013 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1014 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1015 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1016
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1017 def __showRefactoringHistoryMenu(self):
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1018 """
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1019 Private slot called before the refactoring history menu is shown.
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1020 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1021 aw = self.__vm.activeWindow()
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1022 enable = aw is not None and bool(aw.getFileName())
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1023
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1024 self.refactoringFileHistoryAct.setEnabled(enable)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1025
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1026 def handleRopeError(self, result):
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1027 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1028 Public method to handle a rope error.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1029
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1030 @param result dictionary containing the error information
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1031 @type dict
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1032 @return flag indicating, that the error is to be ignored
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1033 @rtype bool
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1034 """
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1035 if "Error" not in result:
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1036 return True
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1037
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
1038 title = result.get("Title", self.tr("Rope Error"))
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1039
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1040 if result["Error"] == "ModuleSyntaxError":
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1041 res = EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1042 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1043 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1044 self.tr("Rope error: {0}").format(result["ErrorString"]),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1045 EricMessageBox.Ok | EricMessageBox.Open,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1046 )
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1047 if res == EricMessageBox.Open:
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1048 self.__vm.openSourceFile(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1049 os.path.join(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1050 self.__ericProject.getProjectPath(), result["ErrorFile"]
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1051 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1052 result["ErrorLine"],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1053 )
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1054 elif result["Error"] == "InterruptedTaskError":
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1055 return True
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1056 else:
251
4dcc73076100 Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 245
diff changeset
1057 from .ErrorDialog import ErrorDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1058
251
4dcc73076100 Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 245
diff changeset
1059 ErrorDialog(
4dcc73076100 Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 245
diff changeset
1060 title,
4dcc73076100 Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 245
diff changeset
1061 self.tr("Rope error: {0}").format(result["ErrorString"]),
4dcc73076100 Removed the Python3 only rope variant and introduced an extended error dialog showing a traceback for errors within the rope library.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 245
diff changeset
1062 traceback=result["Traceback"],
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1063 parent=self.__ui,
341
c43844eb47b7 Changed calls of exec_() into exec().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 335
diff changeset
1064 ).exec()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1065
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1066 return False
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1067
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1068 def __getOffset(self, editor, line, index):
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
1069 r"""
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
1070 Private method to get the offset into the text treating CRLF as ONE
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
1071 character.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1072
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1073 Note: rope seems to convert all EOL styles to just \n.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1074
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1075 @param editor reference to the editor
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1076 @type Editor
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1077 @param line line for the offset
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1078 @type int
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1079 @param index index into line for the offset
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1080 @type int
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1081 @return rope compliant offset into the file
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1082 @rtype int
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1083 """
116
50cb62506ab2 Fixed a bug in the refactoring module and added Portugese translations provided by Candido Fontes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 106
diff changeset
1084 source = editor.text()
103
2d77b3afc98f Changed the way the offset into the text gets calculated because rope handles unicode characters as one character (i.e. string) and QScintilla as multiple (i.e. bytes).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 94
diff changeset
1085 offset = len("".join(source.splitlines(True)[:line])) + index
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1086 if editor.eolMode() == QsciScintilla.EolMode.EolWindows:
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1087 offset -= line
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1088 return offset
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1089
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1090 ##################################################################
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1091 ## slots below implement the various refactorings
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1092 ##################################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1093
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1094 def __processChanges(self, result):
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1095 """
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1096 Private method to process the changes data sent by the refactoring
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1097 client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1098
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1099 @param result dictionary containing the changes data
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1100 @type dict
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1101 """
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1102 if self.handleRopeError(result):
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1103 changeGroup = result["ChangeGroup"]
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
1104 with contextlib.suppress(KeyError):
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1105 self.__refactoringDialogs[changeGroup].processChangeData(result)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1106
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
1107 def __refactoringDialogClosed(self, changeGroup):
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1108 """
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1109 Private slot handling the closing of a refactoring dialog.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1110
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
1111 @param changeGroup name of the refactoring change group the dialog
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
1112 belonged to
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
1113 @type str
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1114 """
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
1115 with contextlib.suppress(KeyError):
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
1116 del self.__refactoringDialogs[changeGroup]
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1117
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1118 #####################################################
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1119 ## Rename refactorings
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1120 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1121
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1122 def __rename(self):
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1123 """
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1124 Private slot to handle the Rename action.
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1125 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1126 self.__doRename(self.tr("Rename"))
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1127
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1128 def __renameLocal(self):
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1129 """
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1130 Private slot to handle the Local Rename action.
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1131 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1132 self.__doRename(self.tr("Local Rename"), isLocal=True)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1133
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1134 def __renameModule(self):
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1135 """
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1136 Private slot to handle the Rename Current Module action.
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1137 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1138 self.__doRename(self.tr("Rename Current Module"), renameModule=True)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1139
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1140 def __doRename(self, title, isLocal=False, renameModule=False):
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1141 """
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1142 Private method to perform the various renaming refactorings.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1143
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1144 @param title title of the refactoring
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1145 @type str
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1146 @param isLocal flag indicating to restrict refactoring to
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1147 the local file
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1148 @type bool
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1149 @param renameModule flag indicating a module rename refactoring
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1150 @type bool
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1151 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1152 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1153
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1154 if aw is None:
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1155 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1156
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1157 if not renameModule and not aw.hasSelectedText():
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1158 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1159 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1160 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1161 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1162 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1163 "Highlight the declaration you want to rename" " and try again."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1164 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1165 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1166 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1167
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1168 if isLocal:
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1169 if not self.confirmBufferIsSaved(aw):
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1170 return
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1171 else:
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1172 if not self.confirmAllBuffersSaved():
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1173 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1174
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1175 filename = aw.getFileName()
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1176 if renameModule:
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1177 offset = None
325
9b08802a8e1a RefactoringServer: added a little convenience code for renaming packages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 320
diff changeset
1178 if os.path.basename(filename) == "__init__.py":
9b08802a8e1a RefactoringServer: added a little convenience code for renaming packages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 320
diff changeset
1179 filename = os.path.dirname(filename)
122
3696915ebc80 Rename dialog show actual name as preset value for editing.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 121
diff changeset
1180 selectedText, _ = os.path.splitext(os.path.basename(filename))
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1181 else:
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1182 line, index, line1, index1 = aw.getSelection()
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1183 if line != line1:
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1184 # selection span more than one line
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1185 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1186 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1187 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1188 self.tr("The selection must not extend beyond" " one line."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1189 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1190 return
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1191 index = int(index + (index1 - index) / 2)
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1192 # keep it inside the object
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1193 offset = self.__getOffset(aw, line, index)
122
3696915ebc80 Rename dialog show actual name as preset value for editing.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents: 121
diff changeset
1194 selectedText = aw.selectedText()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1195
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1196 from .RenameDialog import RenameDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1197
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1198 dlg = RenameDialog(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1199 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1200 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1201 filename,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1202 offset,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1203 isLocal,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1204 selectedText=selectedText,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1205 parent=self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1206 )
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1207 changeGroup = dlg.getChangeGroupName()
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1208 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1209 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
1210 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1211
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1212 def __changeOccurrences(self):
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1213 """
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1214 Private slot to perform the Change Occurrences refactoring.
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1215 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1216 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1217
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1218 if aw is None:
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1219 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1220
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1221 title = self.tr("Change Occurrences")
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1222 if not aw.hasSelectedText():
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1223 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1224 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1225 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1226 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1227 self.tr("Highlight an occurrence to be changed" " and try again."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1228 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1229 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1230
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1231 if not self.confirmBufferIsSaved(aw):
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1232 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1233
3
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1234 filename = aw.getFileName()
3be1b4662b48 Added the 'rename' refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 2
diff changeset
1235 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1236 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1237
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1238 from .ChangeOccurrencesDialog import ChangeOccurrencesDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1239
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1240 dlg = ChangeOccurrencesDialog(self, title, filename, offset, parent=self.__ui)
174
04583cac110f Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
1241 changeGroup = dlg.getChangeGroupName()
04583cac110f Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
1242 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1243 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
174
04583cac110f Implemented the distributed "Change Occurrences" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 173
diff changeset
1244 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1245
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1246 #####################################################
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1247 ## Extract refactorings
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1248 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1249
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1250 def __extractMethod(self):
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1251 """
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1252 Private slot to handle the Extract Method action.
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1253 """
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1254 self.__doExtract(self.tr("Extract Method"), "method")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1255
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1256 def __extractLocalVariable(self):
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1257 """
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1258 Private slot to handle the Extract Local Variable action.
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1259 """
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1260 self.__doExtract(self.tr("Extract Local Variable"), "variable")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1261
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1262 def __doExtract(self, title, kind):
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1263 """
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1264 Private method to perform the extract refactoring.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1265
175
72a1d9030d67 Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 174
diff changeset
1266 @param title title of the refactoring
72a1d9030d67 Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 174
diff changeset
1267 @type str
72a1d9030d67 Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 174
diff changeset
1268 @param kind kind of extraction to be done
72a1d9030d67 Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 174
diff changeset
1269 @type str ("method" or "variable")
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1270 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1271 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1272
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1273 if aw is None:
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1274 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1275
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1276 if not aw.hasSelectedText():
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1277 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1278 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1279 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1280 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1281 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1282 "Highlight the region of code you want to extract" " and try again."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1283 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1284 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1285 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1286
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1287 if not self.confirmBufferIsSaved(aw):
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1288 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1289
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1290 filename = aw.getFileName()
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1291 startline, startcolumn, endline, endcolumn = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1292 startOffset = self.__getOffset(aw, startline, startcolumn)
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1293 endOffset = self.__getOffset(aw, endline, endcolumn)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1294
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1295 from .ExtractDialog import ExtractDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1296
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1297 dlg = ExtractDialog(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1298 self, title, filename, startOffset, endOffset, kind, parent=self.__ui
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1299 )
175
72a1d9030d67 Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 174
diff changeset
1300 changeGroup = dlg.getChangeGroupName()
72a1d9030d67 Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 174
diff changeset
1301 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1302 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
175
72a1d9030d67 Implemented the distributed "Extract" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 174
diff changeset
1303 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1304
5
49a4abfc1f89 Added the extract refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 4
diff changeset
1305 #####################################################
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1306 ## Inline refactorings
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1307 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1308
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1309 def __inline(self):
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1310 """
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1311 Private slot to handle the Inline Local Variable action.
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1312 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1313 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1314
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1315 if aw is None:
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1316 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1317
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1318 title = self.tr("Inline")
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1319 if not aw.hasSelectedText():
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1320 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1321 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1322 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1323 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1324 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1325 "Highlight the local variable, method or parameter"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1326 " you want to inline and try again."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1327 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1328 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1329 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1330
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1331 if not self.confirmAllBuffersSaved():
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1332 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1333
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1334 filename = aw.getFileName()
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1335 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1336 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1337
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1338 from .InlineDialog import InlineDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1339
176
117d86025a5c Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 175
diff changeset
1340 dlg = InlineDialog(self, title, filename, offset, parent=self.__ui)
117d86025a5c Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 175
diff changeset
1341 changeGroup = dlg.getChangeGroupName()
117d86025a5c Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 175
diff changeset
1342 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1343 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
176
117d86025a5c Implemented the distributed "Inline" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 175
diff changeset
1344 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1345
6
07dabc6bb157 Added the inline refactoring function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 5
diff changeset
1346 #####################################################
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1347 ## Move refactorings
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1348 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1349
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1350 def __move(self, moveKind):
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1351 """
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1352 Private slot to handle the Move Method action.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1353
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1354 @param moveKind kind of move to be performed
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1355 @type str (one of 'move_method' or 'move_module')
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1356 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1357 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1358
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1359 if aw is None:
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1360 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1361
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1362 if moveKind == "move_method":
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1363 title = self.tr("Move Method")
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1364 if not aw.hasSelectedText():
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1365 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1366 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1367 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1368 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1369 self.tr("Highlight the method to move" " and try again."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1370 )
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1371 return
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1372 else:
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1373 title = self.tr("Move Current Module")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1374
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1375 if not self.confirmAllBuffersSaved():
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1376 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1377
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1378 filename = aw.getFileName()
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1379 if moveKind == "move_method":
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1380 line, index, line1, index1 = aw.getSelection()
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1381 offset = self.__getOffset(aw, line, index)
26
b02d1f37b55e Added a dialog to move a global method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 20
diff changeset
1382 else:
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1383 offset = None
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1384
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1385 from .MoveDialog import MoveDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1386
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1387 dlg = MoveDialog(self, title, filename, offset, parent=self.__ui)
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1388 changeGroup = dlg.getChangeGroupName()
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1389 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1390 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
178
70b4fb448811 Implemented the distributed "Move ..." method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 176
diff changeset
1391 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1392
7
5ecf9ef23d39 Added the 'move' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 6
diff changeset
1393 #####################################################
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1394 ## Use function refactoring
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1395 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1396
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1397 def __useFunction(self):
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1398 """
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1399 Private slot to use a function wherever possible.
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1400 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1401 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1402
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1403 if aw is None:
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1404 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1405
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1406 title = self.tr("Use Function")
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1407 if not aw.hasSelectedText():
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1408 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1409 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1410 self.__ui, title, self.tr("Highlight a global function and try again.")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1411 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1412 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1413
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1414 if not self.confirmAllBuffersSaved():
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1415 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1416
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1417 filename = aw.getFileName()
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1418 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1419 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1420
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1421 from .UseFunctionDialog import UseFunctionDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1422
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1423 dlg = UseFunctionDialog(self, title, filename, offset, parent=self.__ui)
179
8ae4e95f5fa6 Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 178
diff changeset
1424 changeGroup = dlg.getChangeGroupName()
8ae4e95f5fa6 Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 178
diff changeset
1425 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1426 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
179
8ae4e95f5fa6 Implemented the distributed "Use Function" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 178
diff changeset
1427 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1428
8
fc14525f0501 Added the 'use function' refactoring.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 7
diff changeset
1429 #####################################################
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1430 ## Introduce refactorings
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1431 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1432
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1433 def __introduceFactoryMethod(self):
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1434 """
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1435 Private slot to introduce a factory method or global function.
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1436 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1437 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1438
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1439 if aw is None:
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1440 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1441
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1442 title = self.tr("Introduce Factory Method")
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1443 if not aw.hasSelectedText():
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1444 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1445 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1446 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1447 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1448 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1449 "Highlight the class to introduce a factory"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1450 " method for and try again."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1451 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1452 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1453 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1454
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1455 if not self.confirmAllBuffersSaved():
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1456 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1457
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1458 filename = aw.getFileName()
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1459 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1460 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1461
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1462 from .IntroduceFactoryDialog import IntroduceFactoryDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1463
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1464 dlg = IntroduceFactoryDialog(self, title, filename, offset, parent=self.__ui)
180
a33ef7ab8c54 Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 179
diff changeset
1465 changeGroup = dlg.getChangeGroupName()
a33ef7ab8c54 Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 179
diff changeset
1466 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1467 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
180
a33ef7ab8c54 Implemented the distributed "Introduce Factory Method" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 179
diff changeset
1468 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1469
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1470 def __introduceParameter(self):
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1471 """
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1472 Private slot to introduce a parameter in a function.
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1473 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1474 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1475
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1476 if aw is None:
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1477 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1478
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1479 title = self.tr("Introduce Parameter")
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1480 if not aw.hasSelectedText():
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1481 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1482 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1483 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1484 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1485 self.tr("Highlight the code for the new parameter" " and try again."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1486 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1487 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1488
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1489 if not self.confirmAllBuffersSaved():
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1490 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1491
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1492 filename = aw.getFileName()
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1493 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1494 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1495
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1496 from .IntroduceParameterDialog import IntroduceParameterDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1497
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1498 dlg = IntroduceParameterDialog(self, title, filename, offset, parent=self.__ui)
181
3e3d6de2f0ca Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 180
diff changeset
1499 changeGroup = dlg.getChangeGroupName()
3e3d6de2f0ca Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 180
diff changeset
1500 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1501 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
181
3e3d6de2f0ca Implemented the distributed "Introduce Parameter" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 180
diff changeset
1502 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1503
10
0fdfae822ca7 Added the 'introduce' refactoring functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 8
diff changeset
1504 #####################################################
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1505 ## Import refactorings
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1506 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1507
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1508 def __importsOrganize(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1509 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1510 Private slot to organize imports.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1511 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1512 self.__doImports(self.tr("Organize Imports"), "organize_imports")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1513
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1514 def __importsExpandStar(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1515 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1516 Private slot to expand star imports.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1517 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1518 self.__doImports(self.tr("Expand Star Imports"), "expand_star_imports")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1519
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1520 def __importsRelativeToAbsolute(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1521 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1522 Private slot to transform relative to absolute imports.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1523 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1524 self.__doImports(self.tr("Relative to Absolute"), "relatives_to_absolutes")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1525
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1526 def __importsFromToImport(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1527 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1528 Private slot to transform from imports to plain imports.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1529 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1530 self.__doImports(self.tr("Froms to Imports"), "froms_to_imports")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1531
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1532 def __importsHandleLong(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1533 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1534 Private slot to handle long imports.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1535 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1536 self.__doImports(self.tr("Handle Long Imports"), "handle_long_imports")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1537
182
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1538 def __doImports(self, title, methodName):
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1539 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1540 Private method to perform the various imports refactorings.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1541
182
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1542 @param title title to be used for the import refactoring
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1543 @type str
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1544 @param methodName name of the method performing the import refactoring
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1545 @type str
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1546 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1547 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1548
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1549 if aw is None:
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1550 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1551
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1552 if not self.confirmBufferIsSaved(aw):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1553 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1554
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1555 filename = aw.getFileName()
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1556 if aw.hasSelectedText():
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1557 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1558 offset = self.__getOffset(aw, line, index)
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1559 else:
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1560 offset = None
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1561
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1562 from .ConfirmationDialog import ConfirmationDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1563
182
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1564 dlg = ConfirmationDialog(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1565 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1566 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1567 "Imports",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1568 "CalculateImportsChanges",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1569 {
182
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1570 "MethodName": methodName,
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1571 "FileName": filename,
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1572 "Offset": offset,
186
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1573 },
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1574 parent=self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1575 )
182
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1576 changeGroup = dlg.getChangeGroupName()
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1577 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1578 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
182
f7f2834dc8d9 Implemented the distributed "Imports" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 181
diff changeset
1579 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1580
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1581 #####################################################
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1582 ## Various refactorings
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1583 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1584
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1585 def __restructure(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1586 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1587 Private slot to restructure code.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1588 """
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1589 from .RestructureDialog import RestructureDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1590
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1591 title = self.tr("Restructure")
183
bac69c80d5f4 Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 182
diff changeset
1592 dlg = RestructureDialog(self, title, parent=self.__ui)
bac69c80d5f4 Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 182
diff changeset
1593 changeGroup = dlg.getChangeGroupName()
bac69c80d5f4 Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 182
diff changeset
1594 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1595 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
183
bac69c80d5f4 Implemented the distributed "Restructure" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 182
diff changeset
1596 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1597
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1598 def __changeSignature(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1599 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1600 Private slot to change the signature of a method or function.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1601 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1602 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1603
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1604 if aw is None:
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1605 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1606
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1607 title = self.tr("Change Method Signature")
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1608 if not aw.hasSelectedText():
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1609 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1610 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1611 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1612 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1613 self.tr("Highlight the method or function to change" " and try again."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1614 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1615 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1616
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1617 if not self.confirmAllBuffersSaved():
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1618 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1619
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1620 filename = aw.getFileName()
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1621 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1622 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1623
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1624 from .ChangeSignatureDialog import ChangeSignatureDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1625
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1626 dlg = ChangeSignatureDialog(self, title, filename, offset, parent=self.__ui)
184
4a806271f0b9 Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 183
diff changeset
1627 changeGroup = dlg.getChangeGroupName()
4a806271f0b9 Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 183
diff changeset
1628 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1629 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
184
4a806271f0b9 Implemented the distributed "Change Method Signature" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 183
diff changeset
1630 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1631
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1632 def __inlineArgumentDefault(self):
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1633 """
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1634 Private slot to inline the default value of a parameter of a
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1635 method or function.
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1636 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1637 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1638
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1639 if aw is None:
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1640 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1641
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1642 title = self.tr("Inline Argument Default")
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1643 if not aw.hasSelectedText():
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1644 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1645 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1646 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1647 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1648 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1649 "Highlight the method or function to inline"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1650 " a parameter's default and try again."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1651 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1652 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1653 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1654
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1655 if not self.confirmAllBuffersSaved():
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1656 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1657
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1658 filename = aw.getFileName()
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1659 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1660 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1661
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1662 from .InlineArgumentDefaultDialog import InlineArgumentDefaultDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1663
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1664 dlg = InlineArgumentDefaultDialog(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1665 self, title, filename, offset, parent=self.__ui
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1666 )
185
3336637a673b Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 184
diff changeset
1667 changeGroup = dlg.getChangeGroupName()
3336637a673b Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 184
diff changeset
1668 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1669 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
185
3336637a673b Implemented the distributed "Inline Argument Default" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 184
diff changeset
1670 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1671
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1672 def __transformModuleToPackage(self):
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1673 """
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1674 Private slot to transform a module to a package.
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1675 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1676 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1677
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1678 if aw is None:
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1679 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1680
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1681 title = self.tr("Transform Module to Package")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1682
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1683 if not self.confirmAllBuffersSaved():
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1684 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1685
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1686 filename = aw.getFileName()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1687
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1688 from .ConfirmationDialog import ConfirmationDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1689
186
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1690 dlg = ConfirmationDialog(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1691 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1692 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1693 "ModuleToPackage",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1694 "CalculateModuleToPackageChanges",
186
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1695 {
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1696 "FileName": filename,
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1697 },
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1698 parent=self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1699 )
186
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1700 changeGroup = dlg.getChangeGroupName()
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1701 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1702 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
186
d547caa795d7 Implemented the distributed "Transform Module to Package" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 185
diff changeset
1703 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1704
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1705 def __encapsulateAttribute(self):
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1706 """
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1707 Private slot to encapsulate an attribute.
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1708 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1709 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1710
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1711 if aw is None:
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1712 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1713
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1714 title = self.tr("Encapsulate Attribute")
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1715 if not aw.hasSelectedText():
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1716 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1717 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1718 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1719 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1720 self.tr("Highlight the attribute to encapsulate" " and try again."),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1721 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1722 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1723
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1724 if not self.confirmAllBuffersSaved():
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1725 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1726
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1727 filename = aw.getFileName()
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1728 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1729 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1730
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1731 from .GetterSetterDialog import GetterSetterDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1732
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1733 dlg = GetterSetterDialog(self, title, filename, offset, parent=self.__ui)
187
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1734 changeGroup = dlg.getChangeGroupName()
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1735 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1736 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
187
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1737 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1738
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1739 def __convertLocalToAttribute(self):
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1740 """
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1741 Private slot to convert a local variable to an attribute.
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1742 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1743 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1744
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1745 if aw is None:
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1746 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1747
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1748 title = self.tr("Local Variable to Attribute")
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1749 if not aw.hasSelectedText():
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1750 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1751 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1752 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1753 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1754 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1755 "Highlight the local variable to make an attribute"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1756 " and try again."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1757 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1758 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1759 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1760
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1761 if not self.confirmAllBuffersSaved():
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1762 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1763
12
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1764 filename = aw.getFileName()
75fff1da56b6 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 11
diff changeset
1765 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1766 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1767
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1768 from .ConfirmationDialog import ConfirmationDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1769
187
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1770 dlg = ConfirmationDialog(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1771 self,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1772 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1773 "LocalToAttribute",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1774 "CalculateLocalToAttributeChanges",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1775 {
187
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1776 "FileName": filename,
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1777 "Offset": offset,
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1778 },
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1779 parent=self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1780 )
187
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1781 changeGroup = dlg.getChangeGroupName()
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1782 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1783 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
187
c7600eee9047 Implemented the distributed "Encapsulate Attribute" and "Convert Local to Attribute" refactoring methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 186
diff changeset
1784 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1785
13
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1786 def __methodToMethodObject(self):
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1787 """
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1788 Private slot to change the signature of a method or function.
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1789 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1790 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1791
13
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1792 if aw is None:
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1793 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1794
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1795 title = self.tr("Replace Method With Method Object")
13
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1796 if not aw.hasSelectedText():
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1797 # no selection available
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1798 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1799 self.__ui,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1800 title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1801 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1802 "Highlight the method or function to convert" " and try again."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1803 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1804 )
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
1805 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1806
13
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1807 if not self.confirmAllBuffersSaved():
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1808 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1809
13
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1810 filename = aw.getFileName()
dad628301abc Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 12
diff changeset
1811 line, index, line1, index1 = aw.getSelection()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1812 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1813
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1814 from .MethodToMethodObjectDialog import MethodToMethodObjectDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1815
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1816 dlg = MethodToMethodObjectDialog(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1817 self, title, filename, offset, parent=self.__ui
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1818 )
188
05fb0977ce1b Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 187
diff changeset
1819 changeGroup = dlg.getChangeGroupName()
05fb0977ce1b Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 187
diff changeset
1820 self.__refactoringDialogs[changeGroup] = dlg
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1821 dlg.finished.connect(lambda: self.__refactoringDialogClosed(changeGroup))
188
05fb0977ce1b Implemented the distributed "Convert Method to Method Object" refactoring method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 187
diff changeset
1822 dlg.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1823
11
562f9758d2e1 Added these refactoring functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 10
diff changeset
1824 #####################################################
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1825 ## Refactoring History
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1826 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1827
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1828 def __showProjectHistory(self):
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1829 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1830 Private method to show the project refactoring history.
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1831 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1832 if self.__historyDialog is not None:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1833 self.__historyDialog.close()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1834
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1835 from .HistoryDialog import HistoryDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1836
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1837 self.__historyDialog = HistoryDialog(self, parent=self.__ui)
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1838 self.__historyDialog.finished.connect(self.__historyDialogClosed)
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1839 self.__historyDialog.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1840
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1841 def __showFileHistory(self):
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1842 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1843 Private method to show the refactoring history of the current file.
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1844 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1845 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1846
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1847 if aw is None:
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1848 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1849
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1850 if self.__historyDialog is not None:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1851 self.__historyDialog.close()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1852
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1853 from .HistoryDialog import HistoryDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1854
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1855 filename = aw.getFileName()
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1856 if filename:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1857 self.__historyDialog = HistoryDialog(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1858 self, filename=filename, parent=self.__ui
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1859 )
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1860 self.__historyDialog.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1861
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1862 def __clearHistory(self):
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1863 """
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1864 Private slot to clear the redo and undo lists.
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1865 """
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1866 res = EricMessageBox.yesNo(
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
1867 None,
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1868 self.tr("Clear History"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1869 self.tr("Do you really want to clear the refactoring history?"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1870 )
48
de33dc93a3ac Changed usage of QMessageBox and QFileDialog to the eric5 equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 46
diff changeset
1871 if res:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1872 self.sendJson(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1873 "History",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1874 {
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1875 "Subcommand": "Clear",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1876 },
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1877 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1878
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1879 if self.__historyDialog is not None:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1880 self.__historyDialog.historyCleared()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1881
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1882 def __processHistoryResult(self, result):
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1883 """
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1884 Private method to process the history data sent by the refactoring
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1885 client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1886
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1887 @param result dictionary containing the history data
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1888 @type dict
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1889 """
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1890 if self.handleRopeError(result) and self.__historyDialog is not None:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1891 self.__historyDialog.processHistoryCommand(result)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1892
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1893 def __historyDialogClosed(self):
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1894 """
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1895 Private slot handling the closing of the history dialog.
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1896 """
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1897 self.__historyDialog = None
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1898
4
2e2463ef1aae Added the undo/redo functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 3
diff changeset
1899 #####################################################
129
23ee57a96ea3 Added capability to go to the definition of a class or function by clicking on it (while holding the Ctrl key or another configurable modifier sequence) (needs eric 6.1.0).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 122
diff changeset
1900 ## Find actions including mouse click handler
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1901 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1902
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1903 def __queryReferences(self):
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1904 """
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1905 Private slot to handle the Find References action.
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1906 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1907 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1908
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1909 if aw is None:
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1910 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1911
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
1912 title = self.tr("Find Occurrences")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1913
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1914 if not self.confirmAllBuffersSaved():
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1915 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1916
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1917 filename = aw.getFileName()
129
23ee57a96ea3 Added capability to go to the definition of a class or function by clicking on it (while holding the Ctrl key or another configurable modifier sequence) (needs eric 6.1.0).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 122
diff changeset
1918 line, index = aw.getCursorPosition()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1919 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1920
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1921 self.sendJson(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1922 "QueryReferences",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1923 {
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1924 "Title": title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1925 "FileName": filename,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1926 "Offset": offset,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1927 },
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1928 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1929
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1930 def __queryReferencesResult(self, result):
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1931 """
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1932 Private method to handle the "Query References" result sent by
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1933 the client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1934
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1935 @param result dictionary containing the result data
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1936 @type dict
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1937 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
1938 if self.handleRopeError(result):
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1939 title = result["Title"]
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1940 if result["EntriesCount"] > 0:
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
1941 from .MatchesDialog import MatchesDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1942
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1943 self.dlg = MatchesDialog(self.__ui, True)
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1944 self.dlg.show()
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1945 for occurrence in result["Entries"]:
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1946 self.dlg.addEntry(
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1947 # file name, lineno, unsure
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1948 occurrence[0],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1949 occurrence[1],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1950 occurrence[2],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1951 )
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
1952 else:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
1953 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1954 self.__ui, title, self.tr("No occurrences found.")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1955 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1956
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1957 def __queryDefinition(self):
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1958 """
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
1959 Private slot to handle the Find Definition action.
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1960 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
1961 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1962
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1963 if aw is None:
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1964 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1965
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1966 title = self.tr("Find Definition")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1967
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1968 if not self.confirmAllBuffersSaved():
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1969 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1970
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
1971 filename = aw.getFileName()
129
23ee57a96ea3 Added capability to go to the definition of a class or function by clicking on it (while holding the Ctrl key or another configurable modifier sequence) (needs eric 6.1.0).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 122
diff changeset
1972 line, index = aw.getCursorPosition()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
1973 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1974
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1975 self.sendJson(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1976 "QueryDefinition",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1977 {
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1978 "Title": title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1979 "FileName": filename,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1980 "Offset": offset,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1981 "Source": aw.text(),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1982 },
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1983 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1984
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1985 def __queryDefinitionResult(self, result):
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1986 """
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1987 Private method to handle the "Query Definition" result sent by
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1988 the client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1989
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1990 @param result dictionary containing the result data
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1991 @type dict
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
1992 """
294
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
1993 if self.handleRopeError(result):
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
1994 title = result["Title"]
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
1995 if "Location" in result:
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
1996 location = result["Location"]
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1997
294
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
1998 from .MatchesDialog import MatchesDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
1999
294
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
2000 self.dlg = MatchesDialog(self.__ui, False)
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
2001 self.dlg.show()
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
2002 self.dlg.addEntry(location[0], location[1])
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
2003 # file name, lineno
78e4a6823a98 Code Assist: continued moving the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 293
diff changeset
2004 else:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2005 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2006 self.__ui, title, self.tr("No matching definition found.")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2007 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2008
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2009 def __queryImplementations(self):
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2010 """
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2011 Private slot to handle the Find Implementations action.
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2012 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
2013 aw = self.__vm.activeWindow()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2014
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2015 if aw is None:
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2016 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2017
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
2018 title = self.tr("Find Implementations")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2019
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2020 if not self.confirmAllBuffersSaved():
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2021 return
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2022
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2023 filename = aw.getFileName()
129
23ee57a96ea3 Added capability to go to the definition of a class or function by clicking on it (while holding the Ctrl key or another configurable modifier sequence) (needs eric 6.1.0).
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 122
diff changeset
2024 line, index = aw.getCursorPosition()
44
8aa985c8dee5 Fixed an issue causing failures for files with Windows end-of-line indicators.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 43
diff changeset
2025 offset = self.__getOffset(aw, line, index)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2026
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2027 self.sendJson(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2028 "QueryImplementations",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2029 {
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2030 "Title": title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2031 "FileName": filename,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2032 "Offset": offset,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2033 },
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2034 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2035
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2036 def __queryImplementationsResult(self, result):
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2037 """
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2038 Private method to handle the "Query Implementations" result sent by
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2039 the client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2040
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2041 @param result dictionary containing the result data
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2042 @type dict
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2043 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2044 if self.handleRopeError(result):
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2045 title = result["Title"]
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2046 if result["EntriesCount"] > 0:
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2047 from .MatchesDialog import MatchesDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2048
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2049 self.dlg = MatchesDialog(self.__ui, True)
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2050 self.dlg.show()
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2051 for occurrence in result["Entries"]:
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2052 self.dlg.addEntry(
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2053 # file name, lineno, unsure
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2054 occurrence[0],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2055 occurrence[1],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2056 occurrence[2],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2057 )
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2058 else:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2059 EricMessageBox.warning(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2060 self.__ui, title, self.tr("No implementations found.")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2061 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2062
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2063 #####################################################
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2064 ## Various actions
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2065 #####################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2066
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2067 def __editConfig(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2068 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2069 Private slot to open the rope configuration file in an editor.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2070 """
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2071 ropedir = self.__ropeConfig["RopeFolderName"]
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2072 configfile = ""
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2073 if ropedir and os.path.exists(ropedir):
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2074 configfile = os.path.join(ropedir, "config.py")
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2075 if os.path.exists(configfile):
46
a726d19facfc Modified the code to do lazy import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 44
diff changeset
2076 from QScintilla.MiniEditor import MiniEditor
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2077
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2078 self.__editor = MiniEditor(configfile)
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2079 self.__editor.show()
31
0389d4a924cc Dropped support for eric 5.0.x.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 26
diff changeset
2080 self.__editor.editorSaved.connect(self.__configChanged)
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2081 else:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2082 EricMessageBox.critical(
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
2083 self.__ui,
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
2084 self.tr("Configure Rope"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2085 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2086 """The Rope configuration file '{0}' does""" """ not exist."""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2087 ).format(configfile),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2088 )
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2089 else:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2090 EricMessageBox.critical(
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
2091 self.__ui,
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
2092 self.tr("Configure Rope"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2093 self.tr("""The Rope admin directory does not exist."""),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2094 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2095
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2096 def __updateConfig(self):
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2097 """
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2098 Private slot to update the configuration file.
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2099 """
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2100 res = EricMessageBox.yesNo(
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
2101 self.__ui,
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
2102 self.tr("Update Configuration"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2103 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2104 """Shall rope's current configuration be replaced """
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2105 """by a new default configuration?"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2106 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2107 )
48
de33dc93a3ac Changed usage of QMessageBox and QFileDialog to the eric5 equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 46
diff changeset
2108 if res:
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2109 src = self.__defaultConfig()
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2110 cname = self.__ropeConfigFile()
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2111 if src != "" and cname is not None:
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2112 try:
341
c43844eb47b7 Changed calls of exec_() into exec().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 335
diff changeset
2113 with open(cname, "w") as f:
c43844eb47b7 Changed calls of exec_() into exec().
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 335
diff changeset
2114 f.write(src)
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2115 self.__configChanged()
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2116 self.__editConfig()
345
622076fd58b6 Changed code to not use the OSError aliases (IOError, EnvironmentError, socket.error and select.error) anymore.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 341
diff changeset
2117 except OSError as err:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2118 EricMessageBox.critical(
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
2119 None,
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
2120 self.tr("Update Configuration"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2121 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2122 """<p>The configuration could not be"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2123 """ updated.</p><p>Reason: {0}</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2124 ).format(str(err)),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2125 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2126
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2127 def __showRopeHelp(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2128 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2129 Private slot to show help about the refactorings offered by Rope.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2130 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2131 if self.__helpDialog is None:
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2132 from .HelpDialog import HelpDialog
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2133
320
91b171fdd85f Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 315
diff changeset
2134 self.__helpDialog = HelpDialog(
91b171fdd85f Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 315
diff changeset
2135 self.tr("Help about rope refactorings"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2136 self.__ropeConfig["RopeHelpFile"],
320
91b171fdd85f Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 315
diff changeset
2137 )
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2138 self.__helpDialog.show()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2139
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2140 def __performSOA(self):
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2141 """
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2142 Private slot to perform SOA on all modules.
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2143 """
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
2144 title = self.tr("Analyse all modules")
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2145 res = EricMessageBox.yesNo(
55
d501156be247 Fixed code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 48
diff changeset
2146 self.__ui,
14
cc9f4507be3d Added these utility functions:
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 13
diff changeset
2147 title,
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2148 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2149 """This action might take some time. """
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2150 """Do you really want to perform SOA?"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2151 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2152 )
48
de33dc93a3ac Changed usage of QMessageBox and QFileDialog to the eric5 equivalents.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 46
diff changeset
2153 if res:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2154
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2155 self.sendJson(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2156 "PerformSoa",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2157 {
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2158 "Title": title,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2159 },
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2160 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2161
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2162 def __soaFinished(self, result):
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2163 """
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2164 Private method to handle the "Soa Finished" result sent by
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2165 the client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2166
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2167 @param result dictionary containing the result data
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2168 @type dict
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2169 """
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2170 if self.handleRopeError(result):
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2171 title = result["Title"]
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2172
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2173 EricMessageBox.information(
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2174 self.__ui,
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2175 title,
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2176 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2177 """Static object analysis (SOA) done. """
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2178 """SOA database updated."""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2179 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2180 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2181
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2182 ##################################################################
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2183 ## methods below are private utility methods
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2184 ##################################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2185
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2186 def __processProgress(self, params):
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2187 """
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2188 Private method to handle Progress commands.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2189
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2190 @param params dictionary containing the progress data
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2191 @type dict
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2192 """
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2193 subcommand = params["Subcommand"]
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2194 if subcommand == "Init":
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2195 if self.__progressDialog is not None:
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2196 self.__progressDialog.reset()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2197
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2198 progressDialog = RopeProgressDialog(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2199 self, params["Title"], params["Interruptable"]
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2200 )
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2201 progressDialog.show()
173
2cdb7c48b719 Finished implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 172
diff changeset
2202 progressDialog.raise_()
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2203 self.__progressDialog = progressDialog
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2204 QApplication.processEvents()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2205
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2206 elif subcommand == "Progress" and self.__progressDialog is not None:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2207 self.__progressDialog.updateProgress(params)
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2208 self.__progressDialog.raise_()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2209
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2210 elif subcommand == "Reset" and self.__progressDialog is not None:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2211 self.__progressDialog.reset()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2212
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2213 def __setConfig(self, params):
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2214 """
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2215 Private method to set the rope client configuration data.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2216
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2217 @param params dictionary containing the configuration data
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2218 @type dict
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2219 """
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2220 self.__ropeConfig = params
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2221 # keys: RopeFolderName, DefaultConfig, RopeHelpFile,
267
009b18770d08 RefactoringServer: fixed an issue that causes an exception when some file changes get reported.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 261
diff changeset
2222 # RopeInfo, RopeVersion, RopeCopyright, PythonVersion
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2223
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2224 def __ropeConfigFile(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2225 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2226 Private method to get the name of the rope configuration file.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2227
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2228 @return name of the rope configuration file
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2229 @rtype str
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2230 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2231 configfile = None
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2232 if self.__ropeConfig:
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2233 ropedir = self.__ropeConfig["RopeFolderName"]
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2234 if ropedir:
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2235 configfile = os.path.join(ropedir, "config.py")
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2236 if not os.path.exists(configfile):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2237 configfile = None
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2238 return configfile
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2239
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2240 def __configChanged(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2241 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2242 Private slot called, when the rope config file has changed.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2243 """
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2244 self.sendJson("ConfigChanged", {})
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2245
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2246 def __defaultConfig(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2247 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2248 Private slot to return the contents of rope's default configuration.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2249
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2250 @return string containing the source of rope's default
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2251 configuration
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2252 @rtype str
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2253 """
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2254 if self.__ropeConfig and "DefaultConfig" in self.__ropeConfig:
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2255 return self.__ropeConfig["DefaultConfig"]
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2256 else:
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2257 return ""
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2258
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2259 ##################################################################
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2260 ## methods below are public utility methods
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2261 ##################################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2262
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2263 def getActions(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2264 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2265 Public method to get a list of all actions.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2266
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2267 @return list of all actions
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2268 @rtype list of EricAction
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2269 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2270 return self.actions[:]
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2271
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2272 def projectOpened(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2273 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2274 Public slot to handle the projectOpened signal.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2275 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2276 if self.__projectopen:
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2277 self.projectClosed()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2278
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2279 self.__projectopen = True
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2280 self.__projectpath = self.__ericProject.getProjectPath()
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2281 self.__projectLanguage = self.__ericProject.getProjectLanguage()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2282
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2283 ok = False
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2284
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2285 if self.__projectLanguage in ("Python3", "MicroPython", "Cython"):
285
247d62c682dc CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 280
diff changeset
2286 clientEnv = os.environ.copy()
287
09afe26b734c Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 285
diff changeset
2287 if "PATH" in clientEnv:
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2288 clientEnv["PATH"] = self.__ui.getOriginalPathString()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2289
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2290 venvManager = ericApp().getObject("VirtualEnvManager")
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2291
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2292 # get virtual environment from project first
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2293 venvName = self.__ericProject.getDebugProperty("VIRTUALENV")
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2294 if venvName:
287
09afe26b734c Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 285
diff changeset
2295 try:
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2296 isRemote = venvManager.isRemoteEnvironment(venvName)
287
09afe26b734c Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 285
diff changeset
2297 except AttributeError:
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2298 isRemote = False
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2299 else:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2300 isRemote = False
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2301 if (not venvName) or isRemote:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2302 # get it from debugger settings next
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2303 if self.__projectLanguage in ("Python3", "MicroPython", "Cython"):
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2304 venvName = Preferences.getDebugger("Python3VirtualEnv")
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2305 if not venvName:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2306 venvName, _ = venvManager.getDefaultEnvironment()
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2307 else:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2308 venvName = ""
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2309 if venvName:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2310 interpreter = venvManager.getVirtualenvInterpreter(venvName)
392
b9b0a462123d Fixed an issue resolving the project specific interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 389
diff changeset
2311 if not interpreter:
b9b0a462123d Fixed an issue resolving the project specific interpreter.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 389
diff changeset
2312 interpreter = Globals.getPythonExecutable()
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2313 execPath = venvManager.getVirtualenvExecPath(venvName)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2314
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2315 # build a suitable environment
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2316 if execPath:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2317 if "PATH" in clientEnv:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2318 clientEnv["PATH"] = os.pathsep.join(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2319 [execPath, clientEnv["PATH"]]
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2320 )
269
02bf946efbdc CodeAssistServer, RefactoringServer: changed to support the use of Virtual Environments as of eric 18.07.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 267
diff changeset
2321 else:
354
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2322 clientEnv["PATH"] = execPath
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2323 else:
a967ff16629a - implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 347
diff changeset
2324 interpreter = ""
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2325 if interpreter:
309
d201f9ccf33f RefactoringServer: improved handling of projects which are accessed remotely.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 302
diff changeset
2326 if isRemote:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2327 self.__ui.appendToStderr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2328 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2329 "The project is configured for remote access."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2330 " Using local interpreter instead."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2331 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2332 )
285
247d62c682dc CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 280
diff changeset
2333 ok = self.__startRefactoringClient(interpreter, clientEnv)
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2334 if not ok:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2335 self.__ui.appendToStderr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2336 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2337 "Project language '{0}' is not supported because"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2338 " the configured interpreter could not be started."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2339 " Refactoring is disabled."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2340 ).format(self.__projectLanguage)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2341 )
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2342 else:
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2343 for act in self.actions:
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2344 act.setEnabled(True)
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2345 else:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2346 self.__ui.appendToStderr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2347 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2348 "Project language '{0}' is not supported because no"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2349 " suitable interpreter is configured. Refactoring is"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2350 " disabled."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2351 ).format(self.__projectLanguage)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2352 )
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2353 else:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2354 self.__ui.appendToStderr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2355 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2356 "Refactoring for project language '{0}' is not supported."
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2357 ).format(self.__projectLanguage)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2358 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2359
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2360 self.__mainMenu.menuAction().setEnabled(ok)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2361
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2362 def projectClosed(self):
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2363 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2364 Public slot to handle the projectClosed signal.
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2365 """
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2366 for act in self.actions:
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2367 act.setEnabled(False)
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2368 self.__mainMenu.menuAction().setEnabled(False)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2369
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2370 if self.__helpDialog is not None:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2371 self.__helpDialog.close()
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2372 self.__helpDialog = None
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2373 if self.__historyDialog is not None:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2374 self.__historyDialog.close()
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2375 self.__historyDialog = None
172
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
2376 for dlg in self.__refactoringDialogs.values():
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
2377 dlg.close()
c8890f852917 Continued implementing the distributed rename refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 168
diff changeset
2378 self.__refactoringDialogs = {}
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2379
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2380 self.sendJson("CloseProject", {}, flush=True)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2381
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2382 self.__projectopen = False
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2383 self.__projectpath = ""
1
9f687137a929 Started implementing the basic functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff changeset
2384 self.__projectLanguage = ""
166
6fc202183b3b Implemented the distributed 'query' methods.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 165
diff changeset
2385 self.__ropeConfig = {}
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2386
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2387 self.stopClient()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2388
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2389 def confirmBufferIsSaved(self, editor):
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2390 """
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2391 Public method to check, if an editor has unsaved changes.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2392
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2393 @param editor reference to the editor to be checked
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2394 @type Editor
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
2395 @return flag indicating, that the editor doesn't contain
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2396 unsaved edits
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2397 @rtype bool
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2398 """
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2399 res = editor.checkDirty()
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
2400 self.sendJson("Validate", {})
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2401 return res
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2402
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2403 def confirmAllBuffersSaved(self):
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2404 """
87
1fbf5fdbe721 Ported to PyQt5 and eric6.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 76
diff changeset
2405 Public method to check, if any editor has unsaved changes.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2406
20
83b71483e198 Made the code PEP-8 compliant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 19
diff changeset
2407 @return flag indicating, that no editor contains unsaved edits
203
c38750e1bafd Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 202
diff changeset
2408 @rtype bool
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2409 """
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
2410 res = self.__vm.checkAllDirty()
165
ea41742015af Implemented the "Query References" function.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 164
diff changeset
2411 self.sendJson("Validate", {})
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2412 return res
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2413
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2414 def refreshEditors(self, changedFiles):
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2415 """
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2416 Public method to refresh modified editors.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2417
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2418 @param changedFiles list of changed files
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2419 @type list of str
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2420 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2421 openFiles = [Utilities.normcasepath(f) for f in self.__vm.getOpenFilenames()]
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2422
168
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2423 for fileName in changedFiles:
53d76b4fc1ac Implemented the distributed History dialog and moved the Undo/Redo functions to this dialog.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 167
diff changeset
2424 normfile = Utilities.normcasepath(fileName)
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2425 if normfile in openFiles:
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
2426 editor = self.__vm.getEditor(normfile)[1]
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2427 editor.refresh()
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2428
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
2429 aw = self.__vm.activeWindow()
2
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2430 if aw is not None:
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2431 filename = aw.getFileName()
fc72a5b922a6 Added the rope query functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 1
diff changeset
2432 if filename is not None:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2433 self.__vm.openSourceFile(filename, aw.getCursorPosition()[0] + 1)
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2434
106
b2b2107b8047 Little improvement to update the SOA database for refactoring upon saving a file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
2435 def reportChanged(self, filename, oldSource):
b2b2107b8047 Little improvement to update the SOA database for refactoring upon saving a file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
2436 """
b2b2107b8047 Little improvement to update the SOA database for refactoring upon saving a file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
2437 Public slot to report some changed sources.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2438
200
1584892147ef Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 197
diff changeset
2439 @param filename file name of the changed source
1584892147ef Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 197
diff changeset
2440 @type str
1584892147ef Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 197
diff changeset
2441 @param oldSource source code before the change
1584892147ef Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 197
diff changeset
2442 @type str
106
b2b2107b8047 Little improvement to update the SOA database for refactoring upon saving a file.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 103
diff changeset
2443 """
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2444 if self.__ericProject.isOpen() and self.__ericProject.isProjectFile(filename):
212
f05681349336 Changed code assist to use the new async interface of the Editor class, if it available and performed some code refactorings.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 208
diff changeset
2445 editor = self.__vm.getOpenEditor(filename)
320
91b171fdd85f Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 315
diff changeset
2446 if (
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2447 self.__ropeConfig
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2448 and editor is not None
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2449 and editor.getLanguage() == self.__ropeConfig["PythonVersion"]
320
91b171fdd85f Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 315
diff changeset
2450 ):
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2451 self.sendJson(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2452 "ReportChanged",
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2453 {
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2454 "FileName": filename,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2455 "OldSource": oldSource,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2456 },
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2457 )
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2458
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2459 #######################################################################
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2460 ## Methods below handle the network connection
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2461 #######################################################################
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2462
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2463 def handleCall(self, method, params):
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2464 """
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2465 Public method to handle a method call from the client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2466
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2467 @param method requested method name
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2468 @type str
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2469 @param params dictionary with method specific parameters
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2470 @type dict
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2471 """
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2472 self.__methodMapping[method](params)
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2473
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2474 def __processClientException(self, params):
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2475 """
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2476 Private method to handle exceptions of the refactoring client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2477
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2478 @param params dictionary containing the exception data
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2479 @type dict
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2480 """
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2481 if params["ExceptionType"] == "ProtocolError":
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2482 EricMessageBox.critical(
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2483 None,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2484 self.tr("Refactoring Protocol Error"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2485 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2486 """<p>The data received from the refactoring"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2487 """ server could not be decoded. Please report"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2488 """ this issue with the received data to the"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2489 """ eric bugs email address.</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2490 """<p>Error: {0}</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2491 """<p>Data:<br/>{1}</p>"""
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2492 ).format(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2493 params["ExceptionValue"],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2494 Utilities.html_encode(params["ProtocolData"]),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2495 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2496 EricMessageBox.Ok,
383
a89b3f379703 Bug fixes in RefactoringServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 374
diff changeset
2497 )
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2498 else:
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2499 EricMessageBox.critical(
167
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2500 None,
3c8e875d0326 Some code cleanup and refinement.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 166
diff changeset
2501 self.tr("Refactoring Client Error"),
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2502 self.tr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2503 "<p>An exception happened in the refactoring"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2504 " client. Please report it to the eric bugs"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2505 " email address.</p>"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2506 "<p>Exception: {0}</p>"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2507 "<p>Value: {1}</p>"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2508 "<p>Traceback: {2}</p>"
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2509 ).format(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2510 Utilities.html_encode(params["ExceptionType"]),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2511 params["ExceptionValue"],
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2512 params["Traceback"]
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2513 .replace("\r\n", "<br/>")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2514 .replace("\n", "<br/>")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2515 .replace("\r", "<br/>"),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2516 ),
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2517 EricMessageBox.Ok,
383
a89b3f379703 Bug fixes in RefactoringServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 374
diff changeset
2518 )
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2519
285
247d62c682dc CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 280
diff changeset
2520 def __startRefactoringClient(self, interpreter, clientEnv):
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2521 """
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2522 Private method to start the refactoring client.
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2523
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2524 @param interpreter interpreter to be used for the refactoring client
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2525 @type str
285
247d62c682dc CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 280
diff changeset
2526 @param clientEnv dictionary with environment variables to run the
247d62c682dc CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 280
diff changeset
2527 interpreter with
247d62c682dc CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 280
diff changeset
2528 @type dict
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2529 @return flag indicating a successful client start
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2530 @rtype bool
160
989cd767992b Started implementing the client/server variant.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 151
diff changeset
2531 """
270
efc48da49a75 Fixed some bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 269
diff changeset
2532 if interpreter:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2533 client = os.path.join(os.path.dirname(__file__), "RefactoringClient.py")
360
2b35968f3d02 Version 8.0.0
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 354
diff changeset
2534 ok, exitCode = self.startClient(
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2535 interpreter,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2536 client,
365
f740b50380df Ported the plug-in to PyQt6 for eric7.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 360
diff changeset
2537 [self.__projectpath, Globals.getPythonLibraryDirectory()],
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2538 environment=clientEnv,
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2539 )
360
2b35968f3d02 Version 8.0.0
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 354
diff changeset
2540 if not ok and exitCode == 42:
389
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2541 self.__ui.appendToStderr(
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2542 "RefactoringServer: "
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2543 + self.tr("The rope refactoring library is not installed.\n")
4f53795beff0 Reformatted source code with 'Black'.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 383
diff changeset
2544 )
270
efc48da49a75 Fixed some bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 269
diff changeset
2545 else:
efc48da49a75 Fixed some bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 269
diff changeset
2546 ok = False
163
6a9e7b37a18b Refactored some JSON handling code into server and client base classes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents: 162
diff changeset
2547 return ok

eric ide

mercurial