Sun, 25 Aug 2019 12:03:54 +0200
Added support for MicroPython (treated like Python3).
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
302
2e853e2f2430
Updated copyright for 2019.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
294
diff
changeset
|
3 | # Copyright (c) 2008 - 2019 Detlev Offenbach <detlev@die-offenbachs.de> |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the autocompletion interface to rope. |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
101
5098ad8960ed
Fixed issues connecting/disconnecting editors.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
100
diff
changeset
|
10 | from __future__ import unicode_literals |
5098ad8960ed
Fixed issues connecting/disconnecting editors.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
100
diff
changeset
|
11 | |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
12 | import os |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
13 | import sys |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
15 | from PyQt5.QtCore import pyqtSlot, QCoreApplication, QTimer |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
16 | |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
17 | from E5Gui.E5Application import e5App |
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:
209
diff
changeset
|
18 | from E5Gui import E5MessageBox |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
19 | |
291
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
20 | from QScintilla.Editor import Editor |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
21 | |
202
a111134b5dc7
Started correcting the source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
22 | from .JsonServer import JsonServer |
193
47d95438c4d8
Started to change the CodeAssist class to support distributed operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
23 | |
104
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
24 | import Globals |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
25 | import Preferences |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
26 | import Utilities |
104
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
27 | |
118
d242ba11a04c
Fixed a few code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
106
diff
changeset
|
28 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
29 | class CodeAssistServer(JsonServer): |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | """ |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | Class implementing the autocompletion interface to rope. |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | """ |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
33 | IdProject = "Project" |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
34 | |
291
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
35 | PictureIDs = { |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
36 | "class": "?{0}".format(Editor.ClassID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
37 | "_class": "?{0}".format(Editor.ClassProtectedID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
38 | "__class": "?{0}".format(Editor.ClassPrivateID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
39 | "instance": "?{0}".format(Editor.ClassID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
40 | "_instance": "?{0}".format(Editor.ClassProtectedID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
41 | "__instance": "?{0}".format(Editor.ClassPrivateID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
42 | "function": "?{0}".format(Editor.MethodID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
43 | "_function": "?{0}".format(Editor.MethodProtectedID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
44 | "__function": "?{0}".format(Editor.MethodPrivateID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
45 | "module": "?{0}".format(Editor.ModuleID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
46 | "_module": "?{0}".format(Editor.ModuleID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
47 | "__module": "?{0}".format(Editor.ModuleID), |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
48 | "None": "", |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
49 | } |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
50 | |
118
d242ba11a04c
Fixed a few code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
106
diff
changeset
|
51 | def __init__(self, plugin, parent=None): |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
52 | """ |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
53 | Constructor |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | @param plugin reference to the plugin object |
193
47d95438c4d8
Started to change the CodeAssist class to support distributed operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
56 | @type RefactoringRopePlugin |
47d95438c4d8
Started to change the CodeAssist class to support distributed operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
57 | @param parent parent |
47d95438c4d8
Started to change the CodeAssist class to support distributed operations.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
147
diff
changeset
|
58 | @type QObject |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
59 | """ |
197
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
60 | super(CodeAssistServer, self).__init__( |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
61 | "CodeAssistServer", multiplex=True, parent=parent) |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | self.__plugin = plugin |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
64 | 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:
209
diff
changeset
|
65 | self.__vm = e5App().getObject("ViewManager") |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
66 | self.__e5project = e5App().getObject("Project") |
104
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
67 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
68 | self.__editorLanguageMapping = {} |
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:
209
diff
changeset
|
69 | self.__clientConfigs = {} |
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:
209
diff
changeset
|
70 | self.__editors = {} |
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:
209
diff
changeset
|
71 | |
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:
209
diff
changeset
|
72 | self.__asyncCompletions = False |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
73 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
74 | self.__documentationViewer = None |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
75 | |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
76 | # attributes to store the resuls of the client side |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
77 | self.__completions = None |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
78 | self.__calltips = None |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
79 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
80 | self.__methodMapping = { |
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:
209
diff
changeset
|
81 | "Config": self.__setConfig, |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
82 | "CompletionsResult": self.__processCompletionsResult, |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
83 | "CallTipsResult": self.__processCallTipsResult, |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
84 | "DocumentationResult": self.__processDocumentationResult, |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
85 | "GotoDefinitionResult": self.__gotoDefinitionResult, |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
86 | |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
87 | "ClientException": self.__processClientException, |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
88 | } |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
89 | |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
90 | self.__typeMapping = { |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
91 | "staticmethod": self.tr("static method"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
92 | "classmethod": self.tr("class method"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
93 | "method": self.tr("method"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
94 | "function": self.tr("function"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
95 | "class": self.tr("class"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
96 | "module": self.tr("module"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
97 | "package": self.tr("package"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
98 | "object": self.tr("object"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
99 | "<unknown>": self.tr("not known"), |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
100 | } |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
101 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
102 | # Python 2 |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
103 | self.__ensureActive("Python2") |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
104 | |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
105 | # Python 3 |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
106 | self.__ensureActive("Python3") |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
107 | |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
108 | def setAsyncCompletions(self, asynchronous): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
109 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
110 | Public method to set the asynchronous completions flag. |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
111 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
112 | @param asynchronous flag indicating asynchronous completions |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
113 | @type bool |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
114 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
115 | self.__asyncCompletions = asynchronous |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
116 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
117 | def __updateEditorLanguageMapping(self): |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
118 | """ |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
119 | Private method to update the editor language to connection mapping. |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
120 | """ |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
121 | self.__editorLanguageMapping = {} |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
122 | for name in self.connectionNames(): |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
123 | if name == "Python2": |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
124 | self.__editorLanguageMapping.update({ |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
125 | "Python": "Python2", |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
126 | "Python2": "Python2", |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
127 | "Pygments|Python": "Python2", |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
128 | }) |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
129 | elif name == "Python3": |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
130 | self.__editorLanguageMapping.update({ |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
131 | "Python3": "Python3", |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
132 | "Pygments|Python 3": "Python3", |
315
7e173652a1f9
Added support for MicroPython (treated like Python3).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
302
diff
changeset
|
133 | "MicroPython": "Python3", |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
134 | }) |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
135 | |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
136 | def isSupportedLanguage(self, language): |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
137 | """ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
138 | Public method to check, if the given language is supported. |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
139 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
140 | @param language editor programming language to check |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
141 | @type str |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
142 | @return flag indicating the support status |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
143 | @rtype bool |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
144 | """ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
145 | return language in self.__editorLanguageMapping |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
146 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
147 | def __idString(self, editor): |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
148 | """ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
149 | Private method to determine the ID string for the back-end. |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
150 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
151 | @param editor reference to the editor to determine the ID string for |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
152 | @type QScintilla.Editor |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
153 | @return ID string |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
154 | @rtype str |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
155 | """ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
156 | idString = "" |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
157 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
158 | language = editor.getLanguage() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
159 | if self.__e5project.isOpen() and \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
160 | self.__e5project.getProjectLanguage() == language: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
161 | filename = editor.getFileName() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
162 | if self.__e5project.isProjectSource(filename): |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
163 | idString = CodeAssistServer.IdProject |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
164 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
165 | if not idString and language in self.__editorLanguageMapping: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
166 | idString = self.__editorLanguageMapping[language] |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
167 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
168 | return idString |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
169 | |
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:
209
diff
changeset
|
170 | def __getConfigs(self): |
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:
209
diff
changeset
|
171 | """ |
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:
209
diff
changeset
|
172 | Private method to get the configurations of all connected clients. |
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:
209
diff
changeset
|
173 | """ |
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:
209
diff
changeset
|
174 | for idString in self.connectionNames(): |
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:
209
diff
changeset
|
175 | self.sendJson("getConfig", {}, idString=idString) |
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:
209
diff
changeset
|
176 | |
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:
209
diff
changeset
|
177 | def __setConfig(self, params): |
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:
209
diff
changeset
|
178 | """ |
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:
209
diff
changeset
|
179 | Private method to set the rope client configuration data. |
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:
209
diff
changeset
|
180 | |
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:
209
diff
changeset
|
181 | @param params dictionary containing the configuration data |
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:
209
diff
changeset
|
182 | @type dict |
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:
209
diff
changeset
|
183 | """ |
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:
209
diff
changeset
|
184 | idString = params["Id"] |
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:
209
diff
changeset
|
185 | ropeFolder = params["RopeFolderName"] |
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:
209
diff
changeset
|
186 | |
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:
209
diff
changeset
|
187 | self.__clientConfigs[idString] = ropeFolder |
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:
209
diff
changeset
|
188 | |
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:
209
diff
changeset
|
189 | def __ropeConfigFile(self, idString): |
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:
209
diff
changeset
|
190 | """ |
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:
209
diff
changeset
|
191 | Private method to get the name of the rope configuration file. |
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:
209
diff
changeset
|
192 | |
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:
209
diff
changeset
|
193 | @param idString id for which to get the configuration file |
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:
209
diff
changeset
|
194 | @type str |
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:
209
diff
changeset
|
195 | @return name of the rope configuration file |
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:
209
diff
changeset
|
196 | @rtype str |
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:
209
diff
changeset
|
197 | """ |
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:
209
diff
changeset
|
198 | configfile = None |
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:
209
diff
changeset
|
199 | if idString in self.__clientConfigs: |
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:
209
diff
changeset
|
200 | ropedir = self.__clientConfigs[idString] |
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:
209
diff
changeset
|
201 | if ropedir: |
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:
209
diff
changeset
|
202 | configfile = os.path.join(ropedir, "config.py") |
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:
209
diff
changeset
|
203 | if not os.path.exists(configfile): |
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:
209
diff
changeset
|
204 | configfile = None |
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:
209
diff
changeset
|
205 | return configfile |
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:
209
diff
changeset
|
206 | |
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:
209
diff
changeset
|
207 | def __configChanged(self, idString): |
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:
209
diff
changeset
|
208 | """ |
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:
209
diff
changeset
|
209 | Private slot called, when the rope config file has changed. |
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:
209
diff
changeset
|
210 | |
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:
209
diff
changeset
|
211 | @param idString id for which to get the configuration file |
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:
209
diff
changeset
|
212 | @type str |
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:
209
diff
changeset
|
213 | """ |
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:
209
diff
changeset
|
214 | self.sendJson("configChanged", {}, idString=idString) |
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:
209
diff
changeset
|
215 | |
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:
209
diff
changeset
|
216 | def editConfig(self, idString): |
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:
209
diff
changeset
|
217 | """ |
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:
209
diff
changeset
|
218 | Public slot to open the rope configuration file in an editor. |
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:
209
diff
changeset
|
219 | |
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:
209
diff
changeset
|
220 | @param idString id for which to get the configuration file |
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:
209
diff
changeset
|
221 | @type str |
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:
209
diff
changeset
|
222 | """ |
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:
209
diff
changeset
|
223 | configfile = self.__ropeConfigFile(idString) |
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:
209
diff
changeset
|
224 | if configfile: |
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:
209
diff
changeset
|
225 | if os.path.exists(configfile): |
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:
209
diff
changeset
|
226 | from QScintilla.MiniEditor import MiniEditor |
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:
209
diff
changeset
|
227 | editor = MiniEditor(configfile) |
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:
209
diff
changeset
|
228 | editor.show() |
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:
209
diff
changeset
|
229 | editor.editorSaved.connect( |
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:
209
diff
changeset
|
230 | lambda: self.__configChanged(idString)) |
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:
209
diff
changeset
|
231 | self.__editors[idString] = editor |
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:
209
diff
changeset
|
232 | return |
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:
209
diff
changeset
|
233 | else: |
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:
209
diff
changeset
|
234 | E5MessageBox.critical( |
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:
209
diff
changeset
|
235 | self.__ui, |
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:
209
diff
changeset
|
236 | self.tr("Configure Rope"), |
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:
209
diff
changeset
|
237 | self.tr("""The Rope configuration file '{0}' does""" |
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:
209
diff
changeset
|
238 | """ not exist.""").format(configfile)) |
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:
209
diff
changeset
|
239 | |
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:
209
diff
changeset
|
240 | def getCompletions(self, editor, context): |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
241 | """ |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
242 | Public method to calculate the possible completions. |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
243 | |
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:
209
diff
changeset
|
244 | Note: This is the synchronous variant for eric6 before 17.11. |
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:
209
diff
changeset
|
245 | |
104
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
246 | @param editor reference to the editor object, that called this method |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
247 | @type QScintilla.Editor.Editor |
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:
209
diff
changeset
|
248 | @param context flag indicating to autocomplete a context |
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:
209
diff
changeset
|
249 | @type bool |
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:
209
diff
changeset
|
250 | @return list of possible completions |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
251 | @rtype list of str |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
252 | """ |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
253 | if not self.__plugin.getPreferences("CodeAssistEnabled"): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
254 | return [] |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
255 | |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
256 | # reset the completions buffer |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
257 | self.__completions = None |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
258 | |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
259 | if not self.__idString(editor): |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
260 | return [] |
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:
209
diff
changeset
|
261 | |
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:
209
diff
changeset
|
262 | self.requestCompletions(editor, context, "") |
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:
209
diff
changeset
|
263 | |
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:
209
diff
changeset
|
264 | # emulate the synchronous behaviour |
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:
209
diff
changeset
|
265 | timer = QTimer() |
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:
209
diff
changeset
|
266 | timer.setSingleShot(True) |
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:
209
diff
changeset
|
267 | timer.start(5000) # 5s timeout |
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:
209
diff
changeset
|
268 | while self.__completions is None and timer.isActive(): |
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:
209
diff
changeset
|
269 | QCoreApplication.processEvents() |
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:
209
diff
changeset
|
270 | |
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:
209
diff
changeset
|
271 | return [] if self.__completions is None else self.__completions |
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:
209
diff
changeset
|
272 | |
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:
209
diff
changeset
|
273 | def requestCompletions(self, editor, context, acText): |
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:
209
diff
changeset
|
274 | """ |
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:
209
diff
changeset
|
275 | Public method to request a list of possible completions. |
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:
209
diff
changeset
|
276 | |
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:
209
diff
changeset
|
277 | Note: This is part of the asynchronous variant for eric6 17.11 and |
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:
209
diff
changeset
|
278 | later. |
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:
209
diff
changeset
|
279 | |
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:
209
diff
changeset
|
280 | @param editor reference to the editor object, that called this method |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
281 | @type QScintilla.Editor.Editor |
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:
209
diff
changeset
|
282 | @param context flag indicating to autocomplete a context |
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:
209
diff
changeset
|
283 | @type bool |
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:
209
diff
changeset
|
284 | @param acText text to be completed |
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:
209
diff
changeset
|
285 | @type str |
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:
209
diff
changeset
|
286 | """ |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
287 | if not self.__plugin.getPreferences("CodeAssistEnabled"): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
288 | return |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
289 | |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
290 | idString = self.__idString(editor) |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
291 | if not idString: |
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:
209
diff
changeset
|
292 | return |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
293 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
294 | filename = editor.getFileName() |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
295 | line, index = editor.getCursorPosition() |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
296 | source = editor.text() |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
297 | offset = len("".join(source.splitlines(True)[:line])) + index |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
298 | maxfixes = self.__plugin.getPreferences("MaxFixes") |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
299 | |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
300 | self.__ensureActive(idString) |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
301 | self.sendJson("getCompletions", { |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
302 | "FileName": filename, |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
303 | "Source": source, |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
304 | "Offset": offset, |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
305 | "MaxFixes": maxfixes, |
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:
209
diff
changeset
|
306 | "CompletionText": acText, |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
307 | "SysPath": sys.path, |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
308 | }, idString=idString) |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
309 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
310 | def __processCompletionsResult(self, result): |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
311 | """ |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
312 | Private method to process the completions sent by the client. |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
313 | |
202
a111134b5dc7
Started correcting the source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
314 | @param result dictionary containing the result sent by the client |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
315 | @type dict |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
316 | """ |
291
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
317 | names = [] |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
318 | for completion in result["Completions"]: |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
319 | name = completion['Name'] |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
320 | |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
321 | name += CodeAssistServer.PictureIDs.get( |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
322 | completion['CompletionType'], '') |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
323 | names.append(name) |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
324 | |
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:
209
diff
changeset
|
325 | if self.__asyncCompletions: |
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:
209
diff
changeset
|
326 | # asynchronous variant for eric6 17.11 and later |
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:
209
diff
changeset
|
327 | if "Error" not in result: |
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:
209
diff
changeset
|
328 | editor = self.__vm.getOpenEditor(result["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:
209
diff
changeset
|
329 | if editor is not None: |
291
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
330 | editor.completionsListReady(names, |
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:
209
diff
changeset
|
331 | result["CompletionText"]) |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
332 | else: |
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:
209
diff
changeset
|
333 | # synchronous variant for eric6 before 17.11 |
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:
209
diff
changeset
|
334 | if "Error" in result: |
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:
209
diff
changeset
|
335 | self.__completions = [] |
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:
209
diff
changeset
|
336 | else: |
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:
209
diff
changeset
|
337 | self.__completions = result["Completions"] |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
338 | |
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:
209
diff
changeset
|
339 | def getCallTips(self, editor, pos, commas): |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
340 | """ |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
341 | Public method to calculate calltips. |
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
342 | |
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:
209
diff
changeset
|
343 | @param editor reference to the editor object, that called this method |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
344 | @type QScintilla.Editor.Editor |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
345 | @param pos position in the text for the calltip |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
346 | @type int |
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:
209
diff
changeset
|
347 | @param commas minimum number of commas contained in the calltip |
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:
209
diff
changeset
|
348 | @type int |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
349 | @return list of possible calltips |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
350 | @rtype list of str |
100
2bfe9e3fad8d
Ported the code completion and calltips support of the eric4 variant of this plug-in.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
351 | """ |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
352 | if not self.__plugin.getPreferences("CodeAssistCalltipsEnabled"): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
353 | return [] |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
354 | |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
355 | # reset the calltips buffer |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
356 | self.__calltips = None |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
357 | |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
358 | idString = self.__idString(editor) |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
359 | if not idString: |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
360 | return [] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
361 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
362 | filename = editor.getFileName() |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
363 | source = editor.text() |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
364 | line, index = editor.lineIndexFromPosition(pos) |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
365 | offset = len("".join(source.splitlines(True)[:line])) + index |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
366 | maxfixes = self.__plugin.getPreferences("CalltipsMaxFixes") |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
367 | |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
368 | self.__ensureActive(idString) |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
369 | self.sendJson("getCallTips", { |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
370 | "FileName": filename, |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
371 | "Source": source, |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
372 | "Offset": offset, |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
373 | "MaxFixes": maxfixes, |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
374 | "SysPath": sys.path, |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
375 | }, idString=idString) |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
376 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
377 | # emulate the synchronous behaviour |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
378 | timer = QTimer() |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
379 | timer.setSingleShot(True) |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
380 | timer.start(5000) # 5s timeout |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
381 | while self.__calltips is None and timer.isActive(): |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
382 | QCoreApplication.processEvents() |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
383 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
384 | return [] if self.__calltips is None else self.__calltips |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
385 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
386 | def __processCallTipsResult(self, result): |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
387 | """ |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
388 | Private method to process the calltips sent by the client. |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
389 | |
202
a111134b5dc7
Started correcting the source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
390 | @param result dictionary containing the result sent by the client |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
391 | @type dict |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
392 | """ |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
393 | if "Error" in result: |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
394 | self.__calltips = [] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
395 | else: |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
396 | self.__calltips = result["CallTips"] |
104
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
397 | |
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
398 | def reportChanged(self, filename, oldSource): |
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
399 | """ |
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
400 | Public slot to report some changed sources. |
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
401 | |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
402 | @param filename file name of the changed source |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
403 | @type str |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
404 | @param oldSource source code before the change |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
405 | @type str |
104
f6049d39f83d
Made the code completion work in case no project is open.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
103
diff
changeset
|
406 | """ |
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:
209
diff
changeset
|
407 | editor = self.__vm.getOpenEditor(filename) |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
408 | if editor is not None: |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
409 | idString = self.__idString(editor) |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
410 | if idString: |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
411 | self.__ensureActive(idString) |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
412 | self.sendJson("reportChanged", { |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
413 | "FileName": filename, |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
414 | "OldSource": oldSource, |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
415 | }, idString=idString) |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
416 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
417 | def requestCodeDocumentation(self, editor): |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
418 | """ |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
419 | Public method to request source code documentation for the given |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
420 | editor. |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
421 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
422 | @param editor reference to the editor to get source code documentation |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
423 | for |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
424 | @type QScintilla.Editor.Editor |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
425 | """ |
273
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
426 | if self.__documentationViewer is None: |
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
427 | return |
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
428 | |
291
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
429 | idString = self.__idString(editor) |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
430 | |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
431 | if not idString: |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
432 | language = editor.getLanguage() |
223
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
433 | if Preferences.getDocuViewer("ShowInfoAsRichText"): |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
434 | warning = self.tr("Language <b>{0}</b> is not supported.")\ |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
435 | .format(language) |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
436 | else: |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
437 | warning = self.tr("Language '{0}' is not supported.")\ |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
438 | .format(language) |
220
763ef93fabee
Fixed an issue in the CodeAssistServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
439 | self.__documentationViewer.documentationReady( |
248
59e983db024b
Adjusted the code style checking parameters and fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
440 | warning, isWarning=True) |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
441 | return |
223
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
442 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
443 | filename = editor.getFileName() |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
444 | source = editor.text() |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
445 | line, index = editor.getCursorPosition() |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
446 | offset = len("".join(source.splitlines(True)[:line])) + index |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
447 | maxfixes = self.__plugin.getPreferences("CalltipsMaxFixes") |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
448 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
449 | offset = editor.positionBefore(offset) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
450 | if editor.charAt(offset) == "(": |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
451 | offset = editor.positionBefore(offset) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
452 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
453 | self.__ensureActive(idString) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
454 | self.sendJson("getDocumentation", { |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
455 | "FileName": filename, |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
456 | "Source": source, |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
457 | "Offset": offset, |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
458 | "MaxFixes": maxfixes, |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
459 | "SysPath": sys.path, |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
460 | }, idString=idString) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
461 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
462 | def __processDocumentationResult(self, result): |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
463 | """ |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
464 | Private method to process the documentation sent by the client. |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
465 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
466 | @param result dictionary containing the result sent by the client |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
467 | @type dict with keys 'name', 'argspec', 'note', 'docstring', 'typ' |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
468 | """ |
273
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
469 | if self.__documentationViewer is None: |
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
470 | return |
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
471 | |
219
c85d02ca2fa9
Fixed an issue in the CodeAssistServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
472 | docu = None |
c85d02ca2fa9
Fixed an issue in the CodeAssistServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
473 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
474 | if "Error" not in result: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
475 | documentationDict = result["DocumentationDict"] |
219
c85d02ca2fa9
Fixed an issue in the CodeAssistServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
476 | if documentationDict: |
c85d02ca2fa9
Fixed an issue in the CodeAssistServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
477 | if "module" in documentationDict: |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
478 | if documentationDict["module"]: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
479 | if Preferences.getDocuViewer("ShowInfoAsRichText"): |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
480 | documentationDict["note"] = \ |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
481 | self.tr("Present in <i>{0}</i> module")\ |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
482 | .format(documentationDict["module"]) |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
483 | else: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
484 | documentationDict["note"] = \ |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
485 | self.tr("Present in '{0}' module")\ |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
486 | .format(documentationDict["module"]) |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
487 | del documentationDict["module"] |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
488 | |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
489 | if "typ" in documentationDict: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
490 | if documentationDict["typ"] not in self.__typeMapping: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
491 | del documentationDict["typ"] |
220
763ef93fabee
Fixed an issue in the CodeAssistServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
219
diff
changeset
|
492 | else: |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
493 | documentationDict["typ"] = \ |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
494 | self.__typeMapping[documentationDict["typ"]] |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
495 | |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
496 | if "note" not in documentationDict: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
497 | documentationDict["note"] = "" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
223
diff
changeset
|
498 | |
219
c85d02ca2fa9
Fixed an issue in the CodeAssistServer.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
499 | docu = documentationDict |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
500 | |
223
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
501 | if docu is None: |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
502 | msg = self.tr("No documentation available.") |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
503 | self.__documentationViewer.documentationReady( |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
504 | msg, isDocWarning=True) |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
505 | else: |
d30d3b0d1df5
Adjusted to the latest eric6 development state.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
221
diff
changeset
|
506 | self.__documentationViewer.documentationReady(docu) |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
507 | |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
508 | def gotoDefinition(self, editor): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
509 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
510 | Public slot to find the definition for the word at the cursor position |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
511 | and go to it. |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
512 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
513 | Note: This is executed upon a mouse click sequence. |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
514 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
515 | @param editor reference to the calling editor |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
516 | @type QScintilla.Editor.Editor |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
517 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
518 | if not self.__plugin.getPreferences("MouseClickEnabled"): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
519 | return |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
520 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
521 | idString = self.__idString(editor) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
522 | if not idString: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
523 | return |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
524 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
525 | filename = editor.getFileName() |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
526 | source = editor.text() |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
527 | line, index = editor.getCursorPosition() |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
528 | offset = len("".join(source.splitlines(True)[:line])) + index |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
529 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
530 | self.__ensureActive(idString) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
531 | self.sendJson("gotoDefinition", { |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
532 | "FileName": filename, |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
533 | "Offset": offset, |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
534 | "Source": editor.text(), |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
535 | "SysPath": sys.path, |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
536 | }, idString=idString) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
537 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
538 | def __gotoDefinitionResult(self, result): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
539 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
540 | Private method to handle the "Goto Definition" result sent by |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
541 | the client. |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
542 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
543 | @param result dictionary containing the result data |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
544 | @type dict |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
545 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
546 | if "Error" not in result: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
547 | # ignore errors silently |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
548 | if "Location" in result: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
549 | location = result["Location"] |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
550 | try: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
551 | self.__vm.openSourceFile( |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
552 | location["ModulePath"], location["Line"], addNext=True) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
553 | except TypeError: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
554 | # backward compatibility; <= 17.03 |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
555 | self.__vm.openSourceFile( |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
556 | location["ModulePath"], location["Line"], next=True) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
557 | else: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
558 | e5App().getObject("UserInterface").statusBar().showMessage( |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
559 | self.tr('Code Assist: No definition found'), 5000) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
560 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
561 | ####################################################################### |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
562 | ## Methods below handle the network connection |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
563 | ####################################################################### |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
564 | |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
565 | def handleCall(self, method, params): |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
566 | """ |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
567 | Public method to handle a method call from the client. |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
568 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
569 | @param method requested method name |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
570 | @type str |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
571 | @param params dictionary with method specific parameters |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
572 | @type dict |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
573 | """ |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
574 | self.__methodMapping[method](params) |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
197
diff
changeset
|
575 | |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
576 | def __processClientException(self, params): |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
577 | """ |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
578 | Private method to handle exceptions of the refactoring client. |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
579 | |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
580 | @param params dictionary containing the exception data |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
581 | @type dict |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
582 | """ |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
583 | if params["ExceptionType"] == "ProtocolError": |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
584 | self.__ui.appendToStderr( |
291
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
585 | self.tr("The data received from the code assist" |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
586 | " server could not be decoded. Please report" |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
587 | " this issue with the received data to the" |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
588 | " eric bugs email address.\n" |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
589 | "Error: {0}\n" |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
287
diff
changeset
|
590 | "Data:\n{1}\n").format( |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
591 | params["ExceptionValue"], |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
592 | params["ProtocolData"])) |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
593 | else: |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
594 | self.__ui.appendToStderr( |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
595 | self.tr("An exception happened in the code assist" |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
596 | " client. Please report it to the eric bugs" |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
597 | " email address.\n" |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
598 | "Exception: {0}\n" |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
599 | "Value: {1}\n" |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
600 | "Traceback: {2}\n").format( |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
601 | params["ExceptionType"], |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
602 | params["ExceptionValue"], |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
603 | params["Traceback"])) |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
604 | |
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:
283
diff
changeset
|
605 | def __startCodeAssistClient(self, interpreter, idString, clientEnv): |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
606 | """ |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
607 | Private method to start the code assist client with the given |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
608 | interpreter. |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
609 | |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
610 | @param interpreter interpreter to be used for the code assist client |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
611 | @type str |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
612 | @param idString id of the client to be started |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
613 | @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:
283
diff
changeset
|
614 | @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:
283
diff
changeset
|
615 | 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:
283
diff
changeset
|
616 | @type dict |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
617 | @return flag indicating a successful start of the client |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
618 | @rtype bool |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
619 | """ |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
620 | ok = False |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
621 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
622 | if interpreter: |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
623 | if idString == CodeAssistServer.IdProject: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
624 | configDir = self.__e5project.getProjectPath() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
625 | else: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
626 | configDir = os.path.join(Globals.getConfigDir(), "rope", |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
627 | idString) |
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:
209
diff
changeset
|
628 | if not os.path.exists(configDir): |
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:
209
diff
changeset
|
629 | os.makedirs(configDir) |
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:
209
diff
changeset
|
630 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
631 | client = os.path.join(os.path.dirname(__file__), |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
632 | "CodeAssistClient.py") |
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:
209
diff
changeset
|
633 | ok = self.startClient(interpreter, client, [configDir], |
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:
283
diff
changeset
|
634 | idString=idString, environment=clientEnv) |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
635 | if not ok: |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
636 | self.__ui.appendToStderr(self.tr( |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
637 | "'{0}' is not supported because the configured interpreter" |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
638 | " could not be started.\n" |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
639 | ).format(idString)) |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
640 | else: |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
641 | self.__ui.appendToStderr(self.tr( |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
642 | "'{0}' is not supported because no suitable interpreter is" |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
643 | " configured.\n" |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
644 | ).format(idString)) |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
645 | |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
646 | return ok |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
647 | |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
648 | def __ensureActive(self, idString): |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
649 | """ |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
650 | Private method to ensure, that the requested client is active. |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
651 | |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
652 | A non-active client will be started. |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
653 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
654 | @param idString id of the client to be checked |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
655 | @type str |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
656 | @return flag indicating an active client |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
657 | @rtype bool |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
658 | """ |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
659 | ok = idString in self.connectionNames() |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
660 | if not ok: |
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
661 | # client is not running |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
662 | if idString == CodeAssistServer.IdProject: |
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:
283
diff
changeset
|
663 | interpreter, clientEnv = self.__interpreterForProject() |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
664 | else: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
665 | interpreter = "" |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
666 | venvName = "" |
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:
283
diff
changeset
|
667 | 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
|
668 | if "PATH" in clientEnv: |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
669 | try: |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
670 | clientEnv["PATH"] = self.__ui.getOriginalPathString() |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
671 | except AttributeError: |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
672 | # ignore for eric6 < 18.12 |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
673 | pass |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
674 | try: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
675 | # new code using virtual environments |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
676 | venvManager = e5App().getObject("VirtualEnvManager") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
677 | if idString == "Python2": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
678 | # Python 2 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
679 | venvName = Preferences.getDebugger("Python2VirtualEnv") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
680 | if not venvName and sys.version_info[0] == 2: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
681 | try: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
682 | venvName, _ = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
683 | venvManager.getDefaultEnvironment() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
684 | except AttributeError: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
685 | # ignore for eric6 < 18.10 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
686 | pass |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
687 | elif idString == "Python3": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
688 | # Python 3 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
689 | venvName = Preferences.getDebugger("Python3VirtualEnv") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
690 | if not venvName and sys.version_info[0] == 3: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
691 | try: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
692 | venvName, _ = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
693 | venvManager.getDefaultEnvironment() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
694 | except AttributeError: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
695 | # ignore for eric6 < 18.10 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
696 | pass |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
697 | if venvName: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
698 | interpreter = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
699 | venvManager.getVirtualenvInterpreter(venvName) |
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:
283
diff
changeset
|
700 | |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
701 | try: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
702 | execPath = \ |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
703 | venvManager.getVirtualenvExecPath(venvName) |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
704 | except AttributeError: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
705 | # eric6 < 18.12 |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
706 | execPath = "" |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
707 | |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
708 | # build a suitable environment |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
709 | if execPath: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
710 | if "PATH" in clientEnv: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
711 | clientEnv["PATH"] = os.pathsep.join( |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
712 | [execPath, clientEnv["PATH"]]) |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
713 | else: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
714 | clientEnv["PATH"] = execPath |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
715 | except KeyError: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
716 | # backward compatibility (eric <18.07) |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
717 | if idString == "Python2": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
718 | # Python 2 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
719 | interpreter = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
720 | Preferences.getDebugger("PythonInterpreter") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
721 | elif idString == "Python3": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
722 | # Python 3 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
723 | interpreter = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
724 | Preferences.getDebugger("Python3Interpreter") |
269
02bf946efbdc
CodeAssistServer, RefactoringServer: changed to support the use of Virtual Environments as of eric 18.07.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
263
diff
changeset
|
725 | if interpreter: |
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:
283
diff
changeset
|
726 | ok = self.__startCodeAssistClient(interpreter, idString, |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
727 | clientEnv) |
270
efc48da49a75
Fixed some bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
269
diff
changeset
|
728 | else: |
efc48da49a75
Fixed some bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
269
diff
changeset
|
729 | ok = False |
209
c1dce8630555
Improved handling of died connections/processes.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
203
diff
changeset
|
730 | return ok |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
731 | |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
732 | def __interpreterForProject(self): |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
733 | """ |
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:
283
diff
changeset
|
734 | Private method to determine the interpreter for the current project and |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
735 | the environment to run it. |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
736 | |
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:
283
diff
changeset
|
737 | @return tuple containing the interpreter of the current project and 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:
283
diff
changeset
|
738 | environment variables |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
739 | @rtype tuple of (str, dict) |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
740 | """ |
287
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
741 | projectLanguage = self.__e5project.getProjectLanguage() |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
742 | interpreter = "" |
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:
283
diff
changeset
|
743 | 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
|
744 | if "PATH" in clientEnv: |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
745 | try: |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
746 | clientEnv["PATH"] = self.__ui.getOriginalPathString() |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
747 | except AttributeError: |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
748 | # ignore for eric6 < 18.12 |
09afe26b734c
Changes to start the backend clients with a clean PATH setting.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
285
diff
changeset
|
749 | pass |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
750 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
751 | if projectLanguage.startswith("Python"): |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
752 | try: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
753 | # new code using virtual environments |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
754 | venvManager = e5App().getObject("VirtualEnvManager") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
755 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
756 | # get virtual environment from project first |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
757 | venvName = self.__e5project.getDebugProperty("VIRTUALENV") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
758 | if not venvName: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
759 | # get it from debugger settings next |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
760 | if projectLanguage == "Python2": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
761 | # Python 2 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
762 | venvName = Preferences.getDebugger("Python2VirtualEnv") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
763 | if not venvName and sys.version_info[0] == 2: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
764 | try: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
765 | venvName, _ = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
766 | venvManager.getDefaultEnvironment() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
767 | except AttributeError: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
768 | # ignore for eric6 < 18.10 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
769 | pass |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
770 | elif projectLanguage == "Python3": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
771 | # Python 3 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
772 | venvName = Preferences.getDebugger("Python3VirtualEnv") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
773 | if not venvName and sys.version_info[0] == 3: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
774 | try: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
775 | venvName, _ = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
776 | venvManager.getDefaultEnvironment() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
777 | except AttributeError: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
778 | # ignore for eric6 < 18.10 |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
779 | pass |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
780 | else: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
781 | venvName = "" |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
782 | if venvName: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
783 | interpreter = \ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
784 | venvManager.getVirtualenvInterpreter(venvName) |
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:
283
diff
changeset
|
785 | |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
786 | try: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
787 | execPath = venvManager.getVirtualenvExecPath(venvName) |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
788 | except AttributeError: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
789 | # eric6 < 18.12 |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
790 | execPath = "" |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
791 | |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
792 | # build a suitable environment |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
793 | if execPath: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
794 | if "PATH" in clientEnv: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
795 | clientEnv["PATH"] = os.pathsep.join( |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
796 | [execPath, clientEnv["PATH"]]) |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
797 | else: |
247d62c682dc
CodeAssistServer, RefactoringServer, JsonServer: adapted the code to the virtual environment extensions as of eric6 18.12.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
283
diff
changeset
|
798 | clientEnv["PATH"] = execPath |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
799 | except KeyError: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
800 | # backward compatibility (eric < 18.07) |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
801 | # get interpreter from project first |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
802 | interpreter = self.__e5project.getDebugProperty("INTERPRETER") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
803 | if not interpreter or not Utilities.isinpath(interpreter): |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
804 | # get it from debugger settings second |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
805 | if projectLanguage == "Python2": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
806 | interpreter = Preferences.getDebugger( |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
807 | "PythonInterpreter") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
808 | elif projectLanguage == "Python3": |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
809 | interpreter = Preferences.getDebugger( |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
810 | "Python3Interpreter") |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
811 | |
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:
283
diff
changeset
|
812 | return interpreter, clientEnv |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
813 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
814 | @pyqtSlot() |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
815 | def handleNewConnection(self): |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
816 | """ |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
817 | Public slot for new incoming connections from a client. |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
818 | """ |
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
819 | super(CodeAssistServer, self).handleNewConnection() |
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:
209
diff
changeset
|
820 | |
195
5d614a567be3
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
193
diff
changeset
|
821 | self.__updateEditorLanguageMapping() |
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:
209
diff
changeset
|
822 | |
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:
209
diff
changeset
|
823 | self.__getConfigs() |
197
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
824 | |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
825 | def activate(self): |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
826 | """ |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
827 | Public method to activate the code assist server. |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
828 | """ |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
829 | try: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
830 | self.__documentationViewer = self.__ui.documentationViewer() |
273
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
831 | if self.__documentationViewer is not None: |
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
832 | self.__documentationViewer.registerProvider( |
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
833 | "rope", self.tr("Rope"), self.requestCodeDocumentation, |
803593e12756
CodeAssistServer: added code to cope with the code documentation viewer not being active in the IDE.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
270
diff
changeset
|
834 | self.isSupportedLanguage) |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
835 | except AttributeError: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
836 | # eric6 before 17.11 doesn't have this |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
837 | pass |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
838 | |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
839 | self.__e5project.projectClosed.connect(self.__projectClosed) |
197
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
840 | |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
841 | def deactivate(self): |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
842 | """ |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
843 | Public method to deactivate the code assist server. |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
844 | """ |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
845 | """ |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
846 | Public method to shut down the code assist server. |
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
847 | """ |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
848 | if self.__documentationViewer is not None: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
849 | self.__documentationViewer.unregisterProvider("rope") |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
212
diff
changeset
|
850 | |
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:
209
diff
changeset
|
851 | for idString in self.connectionNames(): |
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:
209
diff
changeset
|
852 | self.sendJson("closeProject", {}, flush=True, idString=idString) |
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:
209
diff
changeset
|
853 | |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
854 | try: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
855 | self.__e5project.projectClosed.disconnect(self.__projectClosed) |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
856 | except TypeError: |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
857 | # ignore it, the signal may be disconnected already |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
858 | pass |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
859 | |
197
7046ac1bcb4b
Continued implementing the distributed Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
195
diff
changeset
|
860 | self.stopAllClients() |
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:
209
diff
changeset
|
861 | |
283
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
862 | @pyqtSlot() |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
863 | def __projectClosed(self): |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
864 | """ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
865 | Private slot to handle the projectClosed signal. |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
866 | """ |
d98e971d9e4c
CodeAssistServer: improved code completions and calltips for files belonging to a project (that may be using an interpreter different from the one used by eric or configured globally).
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
280
diff
changeset
|
867 | self.stopClient(idString=CodeAssistServer.IdProject) |