Mercurial Repositories > Eric Assistant / file comparison
comparison: AssistantEric/Assistant.py
AssistantEric/Assistant.py
- changeset 54
- 89d28458ff40
- parent 51
- b70595b49b3e
- child 65
- 71f50b4cc169
equal
deleted
inserted
replaced
| 53:cc91f2132635 | 54:89d28458ff40 |
|---|---|
| 417 completions = [] | 417 completions = [] |
| 418 for super in cl.super: | 418 for super in cl.super: |
| 419 if prefix == word: | 419 if prefix == word: |
| 420 completions.extend( | 420 completions.extend( |
| 421 api.getCompletions(context=super, | 421 api.getCompletions(context=super, |
| 422 followHierarchy=True)) | 422 followHierarchy=self.__plugin.getPreferences( |
| 423 "AutoCompletionFollowHierarchy"))) | |
| 423 else: | 424 else: |
| 424 completions.extend( | 425 completions.extend( |
| 425 api.getCompletions(start=word, context=super, | 426 api.getCompletions(start=word, context=super, |
| 426 followHierarchy=True)) | 427 followHierarchy=self.__plugin.getPreferences( |
| 428 "AutoCompletionFollowHierarchy"))) | |
| 427 for completion in completions: | 429 for completion in completions: |
| 428 if not completion["context"]: | 430 if not completion["context"]: |
| 429 entry = completion["completion"] | 431 entry = completion["completion"] |
| 430 else: | 432 else: |
| 431 entry = "{0} ({1})".format( | 433 entry = "{0} ({1})".format( |
| 764 if line >= cl.lineno and \ | 766 if line >= cl.lineno and \ |
| 765 (cl.endlineno == -1 or line <= cl.endlineno): | 767 (cl.endlineno == -1 or line <= cl.endlineno): |
| 766 for super in cl.super: | 768 for super in cl.super: |
| 767 calltips.extend(api.getCalltips(word, commas, super, None, | 769 calltips.extend(api.getCalltips(word, commas, super, None, |
| 768 self.__plugin.getPreferences("CallTipsContextShown"), | 770 self.__plugin.getPreferences("CallTipsContextShown"), |
| 769 followHierarchy=True)) | 771 followHierarchy=self.__plugin.getPreferences( |
| 772 "CallTipsFollowHierarchy"))) | |
| 770 break | 773 break |
| 771 else: | 774 else: |
| 772 calltips = api.getCalltips(word, commas, self.__lastContext, | 775 calltips = api.getCalltips(word, commas, self.__lastContext, |
| 773 self.__lastFullContext, | 776 self.__lastFullContext, |
| 774 self.__plugin.getPreferences("CallTipsContextShown")) | 777 self.__plugin.getPreferences("CallTipsContextShown")) |
