Sat, 01 Sep 2018 10:39:08 +0200
Re-merged with "default" branch in order to include some last minute fixes in the next release.
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
6048
82ad8ec9548c
Updated copyright for 2018.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5408
diff
changeset
|
3 | # Copyright (c) 2011 - 2018 Detlev Offenbach <detlev@die-offenbachs.de> |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
7 | Module implementing the editor assembly widget containing the navigation |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
8 | combos and the editor widget. |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
10 | |
3145
a9de05d4a22f
# __IGNORE_WARNING__ added/ removed.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
3057
diff
changeset
|
11 | from __future__ import unicode_literals |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2409
diff
changeset
|
12 | |
3656
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3178
diff
changeset
|
13 | from PyQt5.QtCore import QTimer |
441956d8fce5
Started porting eric5 to PyQt5.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
3178
diff
changeset
|
14 | from PyQt5.QtWidgets import QWidget, QGridLayout, QComboBox |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | import UI.PixmapCache |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
18 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | class EditorAssembly(QWidget): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | """ |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
21 | Class implementing the editor assembly widget containing the navigation |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
22 | combos and the editor widget. |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | """ |
4891
d6e8171d2c02
Fixed an issue causing a crash with latest PyQt5 (5.6).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
4631
diff
changeset
|
24 | def __init__(self, dbs, fn="", vm=None, filetype="", editor=None, |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
25 | tv=None): |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
27 | Constructor |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
28 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | @param dbs reference to the debug server object |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | @param fn name of the file to be opened (string). If it is None, |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
31 | a new (empty) editor is opened |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
32 | @param vm reference to the view manager object |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
33 | (ViewManager.ViewManager) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | @param filetype type of the source file (string) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | @param editor reference to an Editor object, if this is a cloned view |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | @param tv reference to the task viewer object |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | """ |
2525
8b507a9a2d40
Script changes: Future import added, super calls modified and unicode behavior for str.
T.Rzepka <Tobias.Rzepka@gmail.com>
parents:
2409
diff
changeset
|
38 | super(EditorAssembly, self).__init__() |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
39 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | self.__layout = QGridLayout(self) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | self.__layout.setContentsMargins(0, 0, 0, 0) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | self.__layout.setSpacing(1) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
43 | |
5394
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
44 | from .EditorButtonsWidget import EditorButtonsWidget |
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
45 | from .Editor import Editor |
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
46 | |
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
47 | self.__editor = Editor(dbs, fn, vm, filetype, editor, tv) |
5408
b67e07566aa1
Fix for the new editor button widget on Windows.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5394
diff
changeset
|
48 | self.__buttonsWidget = EditorButtonsWidget(self.__editor, self) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
49 | self.__globalsCombo = QComboBox() |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
50 | self.__membersCombo = QComboBox() |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
51 | |
5394
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
52 | self.__layout.addWidget(self.__buttonsWidget, 1, 0, -1, 1) |
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
53 | self.__layout.addWidget(self.__globalsCombo, 0, 1) |
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
54 | self.__layout.addWidget(self.__membersCombo, 0, 2) |
b2c6179184f6
Started implementing a format button bar and provider classes for various markup languages.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
5389
diff
changeset
|
55 | self.__layout.addWidget(self.__editor, 1, 1, 1, -1) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | self.__module = None |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | self.__globalsCombo.activated[int].connect(self.__globalsActivated) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
60 | self.__membersCombo.activated[int].connect(self.__membersActivated) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
61 | self.__editor.cursorLineChanged.connect(self.__editorCursorLineChanged) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | |
6317
e9ec47d52ff2
EditorAssembly: added a guard against shutdownTimer() being called multiple times.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6297
diff
changeset
|
63 | self.__shutdownTimerCalled = False |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | self.__parseTimer = QTimer(self) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | self.__parseTimer.setSingleShot(True) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | self.__parseTimer.setInterval(5 * 1000) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | self.__parseTimer.timeout.connect(self.__parseEditor) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | self.__editor.textChanged.connect(self.__resetParseTimer) |
1807
9898a95461f1
Added a signal to the editor showing a refresh has happend and connected the editor assembly to it.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1667
diff
changeset
|
69 | self.__editor.refreshed.connect(self.__resetParseTimer) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
71 | self.__selectedGlobal = "" |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
72 | self.__selectedMember = "" |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
73 | self.__globalsBoundaries = {} |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
74 | self.__membersBoundaries = {} |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
75 | |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
76 | QTimer.singleShot(0, self.__parseEditor) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
77 | |
1421
8fead6686d1c
Fixed an issue related to the editor assembly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1358
diff
changeset
|
78 | def shutdownTimer(self): |
8fead6686d1c
Fixed an issue related to the editor assembly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1358
diff
changeset
|
79 | """ |
8fead6686d1c
Fixed an issue related to the editor assembly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1358
diff
changeset
|
80 | Public method to stop and disconnect the timer. |
8fead6686d1c
Fixed an issue related to the editor assembly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1358
diff
changeset
|
81 | """ |
8fead6686d1c
Fixed an issue related to the editor assembly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1358
diff
changeset
|
82 | self.__parseTimer.stop() |
6317
e9ec47d52ff2
EditorAssembly: added a guard against shutdownTimer() being called multiple times.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6297
diff
changeset
|
83 | if not self.__shutdownTimerCalled: |
e9ec47d52ff2
EditorAssembly: added a guard against shutdownTimer() being called multiple times.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6297
diff
changeset
|
84 | self.__parseTimer.timeout.disconnect(self.__parseEditor) |
e9ec47d52ff2
EditorAssembly: added a guard against shutdownTimer() being called multiple times.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6297
diff
changeset
|
85 | self.__editor.textChanged.disconnect(self.__resetParseTimer) |
e9ec47d52ff2
EditorAssembly: added a guard against shutdownTimer() being called multiple times.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6297
diff
changeset
|
86 | self.__editor.refreshed.disconnect(self.__resetParseTimer) |
e9ec47d52ff2
EditorAssembly: added a guard against shutdownTimer() being called multiple times.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6297
diff
changeset
|
87 | self.__shutdownTimerCalled = True |
1421
8fead6686d1c
Fixed an issue related to the editor assembly.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1358
diff
changeset
|
88 | |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
89 | def getEditor(self): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
90 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
91 | Public method to get the reference to the editor widget. |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
92 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
93 | @return reference to the editor widget (Editor) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
94 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
95 | return self.__editor |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
96 | |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
97 | def __globalsActivated(self, index, moveCursor=True): |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
98 | """ |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
99 | Private method to jump to the line of the selected global entry and to |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
100 | populate the members combo box. |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
101 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
102 | @param index index of the selected entry (integer) |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
103 | @keyparam moveCursor flag indicating to move the editor cursor |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
104 | (boolean) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
105 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
106 | # step 1: go to the line of the selected entry |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | lineno = self.__globalsCombo.itemData(index) |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
108 | if lineno is not None: |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
109 | if moveCursor: |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
110 | txt = self.__editor.text(lineno - 1).rstrip() |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
111 | pos = len(txt.replace(txt.strip(), "")) |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
112 | self.__editor.gotoLine( |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
113 | lineno, pos if pos == 0 else pos + 1, True) |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
114 | self.__editor.setFocus() |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
115 | |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
116 | # step 2: populate the members combo, if the entry is a class |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
117 | self.__membersCombo.clear() |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
118 | self.__membersBoundaries = {} |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
119 | self.__membersCombo.addItem("") |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
120 | memberIndex = 0 |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
121 | entryName = self.__globalsCombo.itemText(index) |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
122 | if self.__module: |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
123 | if entryName in self.__module.classes: |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
124 | entry = self.__module.classes[entryName] |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
125 | elif entryName in self.__module.modules: |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
126 | entry = self.__module.modules[entryName] |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
127 | # step 2.0: add module classes |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
128 | items = {} |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
129 | for cl in entry.classes.values(): |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
130 | if cl.isPrivate(): |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
131 | icon = UI.PixmapCache.getIcon("class_private.png") |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
132 | elif cl.isProtected(): |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
133 | icon = UI.PixmapCache.getIcon( |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
134 | "class_protected.png") |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
135 | else: |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
136 | icon = UI.PixmapCache.getIcon("class.png") |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
137 | items[cl.name] = (icon, cl.lineno, cl.endlineno) |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
138 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
139 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
140 | self.__membersCombo.addItem(itm[0], key, itm[1]) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
141 | memberIndex += 1 |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
142 | self.__membersBoundaries[(itm[1], itm[2])] = \ |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
143 | memberIndex |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
144 | else: |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
145 | return |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
146 | |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
147 | # step 2.1: add class methods |
2409
df3820f08247
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
148 | from Utilities.ModuleParser import Function |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
149 | items = {} |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
150 | for meth in entry.methods.values(): |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
151 | if meth.modifier == Function.Static: |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
152 | icon = UI.PixmapCache.getIcon("method_static.png") |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
153 | elif meth.modifier == Function.Class: |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
154 | icon = UI.PixmapCache.getIcon("method_class.png") |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
155 | elif meth.isPrivate(): |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
156 | icon = UI.PixmapCache.getIcon("method_private.png") |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
157 | elif meth.isProtected(): |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
158 | icon = UI.PixmapCache.getIcon("method_protected.png") |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
159 | else: |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
160 | icon = UI.PixmapCache.getIcon("method.png") |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
161 | items[meth.name] = (icon, meth.lineno, meth.endlineno) |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
162 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
163 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
164 | self.__membersCombo.addItem(itm[0], key, itm[1]) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
165 | memberIndex += 1 |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
166 | self.__membersBoundaries[(itm[1], itm[2])] = memberIndex |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
167 | |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
168 | # step 2.2: add class instance attributes |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
169 | items = {} |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
170 | for attr in entry.attributes.values(): |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
171 | if attr.isPrivate(): |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
172 | icon = UI.PixmapCache.getIcon("attribute_private.png") |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
173 | elif attr.isProtected(): |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
174 | icon = UI.PixmapCache.getIcon( |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
175 | "attribute_protected.png") |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
176 | else: |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
177 | icon = UI.PixmapCache.getIcon("attribute.png") |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
178 | items[attr.name] = (icon, attr.lineno) |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
179 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
180 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
181 | self.__membersCombo.addItem(itm[0], key, itm[1]) |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
182 | |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
183 | # step 2.3: add class attributes |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
184 | items = {} |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
185 | icon = UI.PixmapCache.getIcon("attribute_class.png") |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
186 | for glob in entry.globals.values(): |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
187 | items[glob.name] = (icon, glob.lineno) |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
188 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
189 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
190 | self.__membersCombo.addItem(itm[0], key, itm[1]) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
191 | |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
192 | def __membersActivated(self, index, moveCursor=True): |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
193 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
194 | Private method to jump to the line of the selected members entry. |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
195 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
196 | @param index index of the selected entry (integer) |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
197 | @keyparam moveCursor flag indicating to move the editor cursor |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
198 | (boolean) |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
199 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
200 | lineno = self.__membersCombo.itemData(index) |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
201 | if lineno is not None and moveCursor: |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
202 | txt = self.__editor.text(lineno - 1).rstrip() |
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
203 | pos = len(txt.replace(txt.strip(), "")) |
6297
85e20e9b4d55
Editor: added a context menu for the "fold" margin and improved the handling of folded lines when using "go to" functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
204 | self.__editor.gotoLine(lineno, pos if pos == 0 else pos + 1, |
85e20e9b4d55
Editor: added a context menu for the "fold" margin and improved the handling of folded lines when using "go to" functions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6188
diff
changeset
|
205 | firstVisible=True, expand=True) |
1439
953d3f95ee4d
Fixed an issue in the editor assembly widget causing it to produce a trackeback.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1421
diff
changeset
|
206 | self.__editor.setFocus() |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
207 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
208 | def __resetParseTimer(self): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
209 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
210 | Private slot to reset the parse timer. |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
211 | """ |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
212 | self.__parseTimer.stop() |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
213 | self.__parseTimer.start() |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
214 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
215 | def __parseEditor(self): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
216 | """ |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
217 | Private method to parse the editor source and repopulate the globals |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
218 | combo. |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
219 | """ |
2409
df3820f08247
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
220 | from Utilities.ModuleParser import Module, getTypeFromTypeName |
df3820f08247
Continued implementing the delayed import.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2302
diff
changeset
|
221 | |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
222 | self.__module = None |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
223 | sourceType = getTypeFromTypeName(self.__editor.determineFileType()) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
224 | if sourceType != -1: |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
225 | src = self.__editor.text() |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
226 | if src: |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
227 | fn = self.__editor.getFileName() |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
228 | if fn is None: |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
229 | fn = "" |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
230 | self.__module = Module("", fn, sourceType) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
231 | self.__module.scan(src) |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
232 | |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
233 | # remember the current selections |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
234 | self.__selectedGlobal = self.__globalsCombo.currentText() |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
235 | self.__selectedMember = self.__membersCombo.currentText() |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
236 | |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
237 | self.__globalsCombo.clear() |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
238 | self.__membersCombo.clear() |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
239 | self.__globalsBoundaries = {} |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
240 | self.__membersBoundaries = {} |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | self.__globalsCombo.addItem("") |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
243 | index = 0 |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
244 | |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
245 | # step 1: add modules |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
246 | items = {} |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
247 | for module in self.__module.modules.values(): |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
248 | items[module.name] = (UI.PixmapCache.getIcon("module.png"), |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
249 | module.lineno, module.endlineno) |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
250 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
251 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
252 | self.__globalsCombo.addItem(itm[0], key, itm[1]) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
253 | index += 1 |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
254 | self.__globalsBoundaries[(itm[1], itm[2])] = index |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
255 | |
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
256 | # step 2: add classes |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
257 | items = {} |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
258 | for cl in self.__module.classes.values(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
259 | if cl.isPrivate(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
260 | icon = UI.PixmapCache.getIcon("class_private.png") |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
261 | elif cl.isProtected(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
262 | icon = UI.PixmapCache.getIcon("class_protected.png") |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
263 | else: |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
264 | icon = UI.PixmapCache.getIcon("class.png") |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
265 | items[cl.name] = (icon, cl.lineno, cl.endlineno) |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
266 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
267 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
268 | self.__globalsCombo.addItem(itm[0], key, itm[1]) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
269 | index += 1 |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
270 | self.__globalsBoundaries[(itm[1], itm[2])] = index |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
271 | |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
272 | # step 3: add functions |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
273 | items = {} |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
274 | for func in self.__module.functions.values(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
275 | if func.isPrivate(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
276 | icon = UI.PixmapCache.getIcon("method_private.png") |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
277 | elif func.isProtected(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
278 | icon = UI.PixmapCache.getIcon("method_protected.png") |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
279 | else: |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
280 | icon = UI.PixmapCache.getIcon("method.png") |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
281 | items[func.name] = (icon, func.lineno, func.endlineno) |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
282 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
283 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
284 | self.__globalsCombo.addItem(itm[0], key, itm[1]) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
285 | index += 1 |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
286 | self.__globalsBoundaries[(itm[1], itm[2])] = index |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
287 | |
1609
b7717f065282
Added the forgotten code to handle Ruby modules to the EditorAssembly widget.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1567
diff
changeset
|
288 | # step 4: add attributes |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
289 | items = {} |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
290 | for glob in self.__module.globals.values(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
291 | if glob.isPrivate(): |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
292 | icon = UI.PixmapCache.getIcon("attribute_private.png") |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
293 | elif glob.isProtected(): |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
294 | icon = UI.PixmapCache.getIcon( |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
295 | "attribute_protected.png") |
1358
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
296 | else: |
c1622c708cd9
Added source navigation function for Python 2, Python 3 and Ruby sources.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
297 | icon = UI.PixmapCache.getIcon("attribute.png") |
1667
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
298 | items[glob.name] = (icon, glob.lineno) |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
299 | for key in sorted(items.keys()): |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
300 | itm = items[key] |
02ad912c8645
Fixed an issue in the editor assembly causing it to throw an exception.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1609
diff
changeset
|
301 | self.__globalsCombo.addItem(itm[0], key, itm[1]) |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
302 | |
3011
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
303 | # reset the currently selected entries without moving the |
18292228c724
Continued to shorten the code lines to max. 79 characters.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2768
diff
changeset
|
304 | # text cursor |
1567
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
305 | index = self.__globalsCombo.findText(self.__selectedGlobal) |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
306 | if index != -1: |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
307 | self.__globalsCombo.setCurrentIndex(index) |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
308 | self.__globalsActivated(index, moveCursor=False) |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
309 | index = self.__membersCombo.findText(self.__selectedMember) |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
310 | if index != -1: |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
311 | self.__membersCombo.setCurrentIndex(index) |
d03369218b6d
Fixed the editor combo box navigation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
1509
diff
changeset
|
312 | self.__membersActivated(index, moveCursor=False) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
313 | |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
314 | def __editorCursorLineChanged(self, lineno): |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
315 | """ |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
316 | Private slot handling a line change of the cursor of the editor. |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
317 | |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
318 | @param lineno line number of the cursor (integer) |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
319 | """ |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
320 | lineno += 1 # cursor position is zero based, code info one based |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
321 | |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
322 | # step 1: search in the globals |
6188
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
323 | indexFound = 0 |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
324 | for (lower, upper), index in self.__globalsBoundaries.items(): |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
325 | if upper == -1: |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
326 | upper = 1000000 # it is the last line |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
327 | if lower <= lineno <= upper: |
6188
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
328 | indexFound = index |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
329 | break |
6188
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
330 | self.__globalsCombo.setCurrentIndex(indexFound) |
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
331 | self.__globalsActivated(indexFound, moveCursor=False) |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
332 | |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
333 | # step 2: search in members |
6188
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
334 | indexFound = 0 |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
335 | for (lower, upper), index in self.__membersBoundaries.items(): |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
336 | if upper == -1: |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
337 | upper = 1000000 # it is the last line |
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
338 | if lower <= lineno <= upper: |
6188
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
339 | indexFound = index |
2768
eab35f6e709f
Added support to show the current class/method name in the combo boxes at the top of the editor.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
2409
diff
changeset
|
340 | break |
6188
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
341 | self.__membersCombo.setCurrentIndex(indexFound) |
5a6ae3be31e6
Fixed some loop related coding issues detected by the extended code style checker.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
6048
diff
changeset
|
342 | self.__membersActivated(indexFound, moveCursor=False) |