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