Sat, 24 Apr 2021 11:19:08 +0200
- implemented some code simplifications
- removed support for some outdated eric6 versions
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
1 | # -*- coding: utf-8 -*- |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
2 | |
346
877cac2e8d94
Updated copyright for 2021.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
335
diff
changeset
|
3 | # Copyright (c) 2017 - 2021 Detlev Offenbach <detlev@die-offenbachs.de> |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
4 | # |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
5 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
6 | """ |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
7 | Module implementing the code assist client interface to rope. |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
8 | """ |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
9 | |
303 | 10 | import sys |
11 | import os | |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
12 | import contextlib |
303 | 13 | |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
14 | sys.path.insert(0, os.path.dirname(__file__)) |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
15 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
16 | import rope.base.libutils |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
17 | import rope.contrib.codeassist |
239
f453f583c06b
Fixed a few bugs in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
234
diff
changeset
|
18 | from rope.base.exceptions import BadIdentifierError, ModuleSyntaxError |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
19 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
20 | from JsonClient import JsonClient |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
21 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
22 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
23 | class CodeAssistClient(JsonClient): |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
24 | """ |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
25 | Class implementing the code assist client interface to rope. |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
26 | """ |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
27 | IdProject = "Project" |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
28 | |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
29 | def __init__(self, host, port, idString, projectPath): |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
30 | """ |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
31 | Constructor |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
32 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
33 | @param host ip address the background service is listening |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
34 | @type str |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
35 | @param port port of the background service |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
36 | @type int |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
37 | @param idString assigned client id to be sent back to the server in |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
38 | order to identify the connection |
203
c38750e1bafd
Performed some code cleanup actions.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
201
diff
changeset
|
39 | @type str |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
40 | @param projectPath path to the project |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
41 | @type str |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
42 | """ |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
43 | super().__init__(host, port, idString) |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
44 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
45 | 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
|
46 | "getConfig": self.__getConfig, |
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
|
47 | "configChanged": self.__configChanged, |
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
|
48 | "closeProject": self.__closeProject, |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
49 | "getCompletions": self.__getCompletions, |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
50 | "getCallTips": self.__getCallTips, |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
51 | "getDocumentation": self.__getDocumentation, |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
52 | "gotoDefinition": self.__gotoDefinition, |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
53 | "reportChanged": self.__reportChanged, |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
54 | } |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
55 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
56 | self.__projectpath = projectPath |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
57 | self.__project = rope.base.project.Project(self.__projectpath) |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
58 | self.__project.validate(self.__project.root) |
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
|
59 | |
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
|
60 | self.__id = idString |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
61 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
62 | def handleCall(self, method, params): |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
63 | """ |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
64 | Public method to handle a method call from the server. |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
65 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
66 | @param method requested method name |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
67 | @type str |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
68 | @param params dictionary with method specific parameters |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
69 | @type dict |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
70 | """ |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
71 | self.__methodMapping[method](params) |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
72 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
73 | def __handleRopeError(self, err): |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
74 | """ |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
75 | Private method to process a rope error. |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
76 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
77 | @param err rope exception object |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
78 | @type Exception |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
79 | @return dictionary containing the error information |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
80 | @rtype dict |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
81 | """ |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
82 | ropeError = str(type(err)).split()[-1] |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
83 | ropeError = ropeError[1:-2].split('.')[-1] |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
84 | errorDict = { |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
85 | "Error": ropeError, |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
86 | "ErrorString": str(err), |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
87 | } |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
88 | if ropeError == 'ModuleSyntaxError': |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
89 | errorDict["ErrorFile"] = err.filename |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
90 | errorDict["ErrorLine"] = err.lineno |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
91 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
92 | return errorDict |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
93 | |
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
|
94 | def __getConfig(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
|
95 | """ |
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
|
96 | Private method to send some configuration data to the server. |
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
|
97 | |
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
|
98 | @param params dictionary containing the method parameters sent by |
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
|
99 | the server |
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
|
100 | @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
|
101 | """ |
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
|
102 | 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
|
103 | "RopeFolderName": self.__project.ropefolder.real_path, |
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
|
104 | "Id": self.__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
|
105 | } |
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
|
106 | |
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
|
107 | self.sendJson("Config", 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
|
108 | |
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
|
109 | def __configChanged(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
|
110 | """ |
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
|
111 | Private method to handle a change of 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
|
112 | |
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
|
113 | @param params dictionary containing the method parameters sent by |
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
|
114 | the server |
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
|
115 | @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
|
116 | """ |
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
|
117 | self.__project.close() |
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
|
118 | self.__project = rope.base.project.Project(self.__projectpath) |
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
|
119 | self.__project.validate(self.__project.root) |
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
|
120 | |
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
|
121 | def __closeProject(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
|
122 | """ |
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
|
123 | Private slot to validate the project. |
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
|
124 | |
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
|
125 | @param params dictionary containing the method parameters sent by |
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
|
126 | the server |
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
|
127 | @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
|
128 | """ |
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
|
129 | self.__project.close() |
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
|
130 | |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
131 | def __getCompletions(self, params): |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
132 | """ |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
133 | Private method to calculate possible completions. |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
134 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
135 | @param params dictionary containing the method parameters |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
136 | @type dict |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
137 | """ |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
138 | filename = params["FileName"] |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
139 | source = params["Source"] |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
140 | offset = params["Offset"] |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
141 | maxfixes = params["MaxFixes"] |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
142 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
143 | self.__project.prefs.set("python_path", params["SysPath"]) |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
144 | resource = ( |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
145 | rope.base.libutils.path_to_resource(self.__project, filename) |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
146 | if filename else |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
147 | None |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
148 | ) |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
149 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
150 | errorDict = {} |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
151 | completions = [] |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
152 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
153 | try: |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
154 | proposals = rope.contrib.codeassist.code_assist( |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
155 | self.__project, source, offset, resource, maxfixes=maxfixes) |
201
e677d82706d4
Extended the auto completions pictures supported by code assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
156 | for proposal in proposals: |
e677d82706d4
Extended the auto completions pictures supported by code assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
157 | proposalType = proposal.type |
e677d82706d4
Extended the auto completions pictures supported by code assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
158 | if proposal.name.startswith("__"): |
e677d82706d4
Extended the auto completions pictures supported by code assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
159 | proposalType = "__" + proposalType |
e677d82706d4
Extended the auto completions pictures supported by code assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
160 | elif proposal.name.startswith("_"): |
e677d82706d4
Extended the auto completions pictures supported by code assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
200
diff
changeset
|
161 | proposalType = "_" + proposalType |
291
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
251
diff
changeset
|
162 | completions.append({ |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
251
diff
changeset
|
163 | "Name": proposal.name, |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
251
diff
changeset
|
164 | "CompletionType": proposalType, |
da88cb84ae30
CodeAssistServer, CodeAssistClient: moved determination of the Picture ID to the server side.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
251
diff
changeset
|
165 | }) |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
166 | except Exception as err: |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
167 | errorDict = self.__handleRopeError(err) |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
168 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
169 | result = { |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
170 | "Completions": completions, |
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
|
171 | "CompletionText": params["CompletionText"], |
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 | "FileName": filename, |
198
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
173 | } |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
174 | result.update(errorDict) |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
175 | |
898d8b4187de
IMplemented the distributed code assist completions method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
196
diff
changeset
|
176 | self.sendJson("CompletionsResult", result) |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
177 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
178 | def __getCallTips(self, params): |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
179 | """ |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
180 | Private method to calculate possible calltips. |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
181 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
182 | @param params dictionary containing the method parameters |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
183 | @type dict |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
184 | """ |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
185 | filename = params["FileName"] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
186 | source = params["Source"] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
187 | offset = params["Offset"] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
188 | maxfixes = params["MaxFixes"] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
189 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
190 | self.__project.prefs.set("python_path", params["SysPath"]) |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
191 | resource = ( |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
192 | rope.base.libutils.path_to_resource(self.__project, filename) |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
193 | if filename else |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
194 | None |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
195 | ) |
199
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
196 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
197 | errorDict = {} |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
198 | calltips = [] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
199 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
200 | try: |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
201 | cts = rope.contrib.codeassist.get_calltip( |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
202 | self.__project, source, offset, resource, maxfixes=maxfixes, |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
203 | remove_self=True) |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
204 | if cts is not None: |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
205 | calltips = [cts] |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
206 | except Exception as err: |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
207 | errorDict = self.__handleRopeError(err) |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
208 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
209 | result = { |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
210 | "CallTips": calltips, |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
211 | } |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
212 | result.update(errorDict) |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
213 | |
ae2ad82725b0
Implemented the distributed code assist calltips method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
198
diff
changeset
|
214 | self.sendJson("CallTipsResult", result) |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
215 | |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
216 | def __getDocumentation(self, params): |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
217 | """ |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
218 | Private method to get some source code documentation. |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
219 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
220 | @param params dictionary containing the method parameters |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
221 | @type dict |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
222 | """ |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
223 | filename = params["FileName"] |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
224 | source = params["Source"] |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
225 | offset = params["Offset"] |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
226 | maxfixes = params["MaxFixes"] |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
227 | |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
228 | if self.__id != CodeAssistClient.IdProject: |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
229 | self.__project.prefs.set("python_path", params["SysPath"]) |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
230 | resource = ( |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
231 | rope.base.libutils.path_to_resource(self.__project, filename) |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
232 | if filename else |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
233 | None |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
234 | ) |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
235 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
236 | errorDict = {} |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
237 | documentation = "" |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
238 | cts = None |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
239 | |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
240 | with contextlib.suppress(Exception): |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
241 | cts = rope.contrib.codeassist.get_calltip( |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
242 | self.__project, source, offset, resource, maxfixes=maxfixes, |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
243 | remove_self=True) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
244 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
245 | if cts is not None: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
246 | while '..' in cts: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
247 | cts = cts.replace('..', '.') |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
248 | if '(.)' in cts: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
249 | cts = cts.replace('(.)', '(...)') |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
250 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
251 | try: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
252 | documentation = rope.contrib.codeassist.get_doc( |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
253 | self.__project, source, offset, resource, maxfixes=maxfixes) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
254 | except Exception as err: |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
255 | errorDict = self.__handleRopeError(err) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
256 | |
234
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
257 | typeName = self.__getObjectTypeAndName( |
248
59e983db024b
Adjusted the code style checking parameters and fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
258 | self.__project, source, offset, resource, maxfixes=maxfixes) |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
259 | |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
260 | documentationDict = self.__processDocumentation(cts, documentation, |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
261 | typeName) |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
262 | result = { |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
263 | "DocumentationDict": documentationDict, |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
264 | } |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
265 | result.update(errorDict) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
266 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
267 | self.sendJson("DocumentationResult", result) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
268 | |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
269 | def __processDocumentation(self, cts, documentation, typeName): |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
270 | """ |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
271 | Private method to process the call-tips and documentation. |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
272 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
273 | @param cts call-tips |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
274 | @type str |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
275 | @param documentation extracted source code documentation |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
276 | @type str |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
277 | @param typeName type and name of the object |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
278 | @type tuple of (str, str) |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
279 | @return dictionary containing document information |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
280 | @rtype dictionary with keys "name", "argspec", "module" and |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
281 | "docstring" |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
282 | """ |
228
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
283 | objectFullname = "" |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
284 | calltip = "" |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
285 | argspec = "" |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
286 | module = "" |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
287 | |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
288 | if cts: |
228
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
289 | cts = cts.replace(".__init__", "") |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
290 | parenthesisPos = cts.find("(") |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
291 | if parenthesisPos != -1: |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
292 | objectFullname = cts[:parenthesisPos] |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
293 | objectName = objectFullname.split('.')[-1] |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
294 | cts = cts.replace(objectFullname, objectName) |
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
295 | calltip = cts |
228
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
296 | else: |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
297 | objectFullname = cts |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
298 | |
228
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
299 | if objectFullname and not objectFullname.startswith("self."): |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
300 | if calltip: |
228
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
301 | argspecStart = calltip.find("(") |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
302 | argspec = calltip[argspecStart:] |
228
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
303 | |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
304 | moduleEnd = objectFullname.rfind('.') |
e76a4991faef
Fixed a few bugs.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
217
diff
changeset
|
305 | module = objectFullname[:moduleEnd] |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
306 | |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
307 | if not objectFullname and typeName[1] not in ["", "<unknown>"]: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
308 | objectFullname = typeName[1] |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
309 | |
320
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
305
diff
changeset
|
310 | return { |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
305
diff
changeset
|
311 | "name": objectFullname, |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
305
diff
changeset
|
312 | "argspec": argspec, |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
305
diff
changeset
|
313 | "module": module, |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
305
diff
changeset
|
314 | "docstring": documentation, |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
305
diff
changeset
|
315 | "typ": typeName[0] |
91b171fdd85f
Fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
305
diff
changeset
|
316 | } |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
317 | |
234
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
318 | def __getObjectTypeAndName(self, project, sourceCode, offset, |
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
319 | resource=None, maxfixes=1): |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
320 | """ |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
321 | Private method to determine an object type and name for the given |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
322 | location. |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
323 | |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
324 | @param project reference to the rope project object |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
325 | @type rope.base.project.Project |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
326 | @param sourceCode source code |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
327 | @type str |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
328 | @param offset offset to base the calculation on |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
329 | @type int |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
330 | @param resource reference to the rope resource object |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
331 | @type rope.base.resources.Resource |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
332 | @param maxfixes number of fixes to be done |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
333 | @type int |
248
59e983db024b
Adjusted the code style checking parameters and fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
334 | @return tuple containing the object type and name |
59e983db024b
Adjusted the code style checking parameters and fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
335 | @rtype tuple of (str, str) |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
336 | """ |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
337 | from rope.base import pyobjects, pyobjectsdef, pynames |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
338 | from rope.contrib import fixsyntax |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
339 | |
234
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
340 | try: |
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
341 | fixer = fixsyntax.FixSyntax(project, sourceCode, resource, |
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
342 | maxfixes) |
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
343 | pyname = fixer.pyname_at(offset) |
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
344 | except BadIdentifierError: |
a9d03af34d28
Fixed a little bug in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
232
diff
changeset
|
345 | pyname = None |
239
f453f583c06b
Fixed a few bugs in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
234
diff
changeset
|
346 | except ModuleSyntaxError: |
f453f583c06b
Fixed a few bugs in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
234
diff
changeset
|
347 | pyname = None |
f453f583c06b
Fixed a few bugs in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
234
diff
changeset
|
348 | except IndexError: |
f453f583c06b
Fixed a few bugs in the code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
234
diff
changeset
|
349 | pyname = None |
232
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
350 | if pyname is None: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
351 | return "<unknown>", "<unknown>" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
352 | |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
353 | pyobject = pyname.get_object() |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
354 | if isinstance(pyobject, pyobjectsdef.PyPackage): |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
355 | typ = "package" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
356 | if isinstance(pyname, pynames.ImportedModule): |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
357 | name = pyname.module_name |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
358 | else: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
359 | name = "<unknown>" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
360 | elif isinstance(pyobject, pyobjectsdef.PyModule): |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
361 | typ = "module" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
362 | name = pyobject.get_name() |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
363 | elif isinstance(pyobject, pyobjectsdef.PyClass): |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
364 | typ = "class" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
365 | name = pyobject.get_name() |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
366 | elif isinstance(pyobject, pyobjectsdef.PyFunction): |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
367 | typ = pyobject.get_kind() |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
368 | name = pyobject.get_name() |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
369 | elif isinstance(pyobject, pyobjects.PyObject): |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
370 | typ = "object" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
371 | name = "" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
372 | else: |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
373 | typ = "" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
374 | name = "" |
65d7d745543d
Extended the code info provider to return the object type as well.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
228
diff
changeset
|
375 | |
248
59e983db024b
Adjusted the code style checking parameters and fixed some code style issues.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
245
diff
changeset
|
376 | return typ, name |
217
874115c79ca7
Added support for the extraction of source code documentation.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
216
diff
changeset
|
377 | |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
378 | def __gotoDefinition(self, params): |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
379 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
380 | Private method to handle the Goto Definition action. |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
381 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
382 | @param params dictionary containing the method parameters 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
|
383 | the server |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
384 | @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
|
385 | """ |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
386 | import rope.base.libutils |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
387 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
388 | filename = params["FileName"] |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
389 | offset = params["Offset"] |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
390 | source = params["Source"] |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
391 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
392 | self.__project.prefs.set("python_path", params["SysPath"]) |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
393 | resource = ( |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
394 | rope.base.libutils.path_to_resource(self.__project, filename) |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
395 | if filename else |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
396 | None |
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
397 | ) |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
398 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
399 | errorDict = {} |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
400 | result = {} |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
401 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
402 | import rope.contrib.findit |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
403 | try: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
404 | location = rope.contrib.findit.find_definition( |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
405 | self.__project, source, offset, resource) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
406 | except Exception as err: |
305
9fb032952a0a
CodeAssistClient: fixed an issue accessing a variable before it was defined.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
303
diff
changeset
|
407 | location = None |
293
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
408 | errorDict = self.__handleRopeError(err) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
409 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
410 | if location is not None: |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
411 | 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
|
412 | "ModulePath": location.resource.real_path, |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
413 | "Line": location.lineno, |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
414 | } |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
415 | result.update(errorDict) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
416 | |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
417 | self.sendJson("GotoDefinitionResult", result) |
dd1c7ed6d880
Code Assist: started to move the Mouse Click handler to Code Assist.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
291
diff
changeset
|
418 | |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
419 | def __reportChanged(self, params): |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
420 | """ |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
421 | Private method to register some changed sources. |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
422 | |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
423 | @param params dictionary containing the method parameters sent by |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
424 | the server |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
425 | @type dict |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
426 | """ |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
427 | filename = params["FileName"] |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
428 | oldSource = params["OldSource"] |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
429 | |
354
a967ff16629a
- implemented some code simplifications
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
347
diff
changeset
|
430 | with contextlib.suppress(Exception): |
200
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
431 | rope.base.libutils.report_change( |
1584892147ef
Implemented the distributed code assist "report changed" method.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
199
diff
changeset
|
432 | self.__project, filename, oldSource) |
196
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
433 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
434 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
435 | if __name__ == '__main__': |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
436 | if len(sys.argv) != 5: |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
437 | print('Host, port, id and project path parameters are missing. Abort.') |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
438 | sys.exit(1) |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
439 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
440 | host, port, idString, projectPath = sys.argv[1:] |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
441 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
442 | # Create a Qt4/5 application object in order to allow the processing of |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
443 | # modules containing Qt stuff. |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
444 | try: |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
445 | from PyQt5.QtCore import QCoreApplication |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
446 | except ImportError: |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
447 | try: |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
448 | from PyQt4.QtCore import QCoreApplication |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
449 | except ImportError: |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
450 | QCoreApplication = None |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
451 | if QCoreApplication is not None: |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
452 | app = QCoreApplication(sys.argv) |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
453 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
454 | client = CodeAssistClient(host, int(port), idString, projectPath) |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
455 | # Start the main loop |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
456 | client.run() |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
457 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
458 | sys.exit(0) |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
459 | |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
460 | # |
26986d285975
Added the new code assist client.
Detlev Offenbach <detlev@die-offenbachs.de>
parents:
diff
changeset
|
461 | # eflag: noqa = M801 |