Mercurial Repositories > eric / file comparison
comparison: QScintilla/Editor.py
QScintilla/Editor.py
- branch
- maintenance
- changeset 6518
- 926d65bd23b8
- parent 6487
- d3ca83d691e7
- parent 6498
- 674ac2051e8a
- child 6602
- 331ac8f99cf8
equal
deleted
inserted
replaced
| 6492:8214753ae98b | 6518:926d65bd23b8 |
|---|---|
| 2624 lineIndex = -1 | 2624 lineIndex = -1 |
| 2625 for line in txtList: | 2625 for line in txtList: |
| 2626 lineIndex += 1 | 2626 lineIndex += 1 |
| 2627 shouldBreak = False | 2627 shouldBreak = False |
| 2628 | 2628 |
| 2629 if line.endswith("__NO-TASK__"): | |
| 2630 # ignore potential task marker | |
| 2631 continue | |
| 2632 | |
| 2629 for taskType, taskMarkers in markers.items(): | 2633 for taskType, taskMarkers in markers.items(): |
| 2630 for taskMarker in taskMarkers: | 2634 for taskMarker in taskMarkers: |
| 2631 index = line.find(taskMarker) | 2635 index = line.find(taskMarker) |
| 2632 if index > -1: | 2636 if index > -1: |
| 2633 task = line[index:] | 2637 task = line[index:] |
| 4749 | 4753 |
| 4750 self.__acCompletions.update(set(completions)) | 4754 self.__acCompletions.update(set(completions)) |
| 4751 | 4755 |
| 4752 self.__acCompletionsFinished += 1 | 4756 self.__acCompletionsFinished += 1 |
| 4753 # Got all results from auto completer? | 4757 # Got all results from auto completer? |
| 4754 if self.__acCompletionsFinished >= len( | 4758 if self.__acCompletionsFinished >= ( |
| 4755 self.__completionListAsyncHookFunctions): | 4759 len(self.__completionListAsyncHookFunctions) + |
| 4760 len(self.__completionListHookFunctions) | |
| 4761 ): | |
| 4756 self.__acWatchdog.stop() | 4762 self.__acWatchdog.stop() |
| 4757 | 4763 |
| 4758 # Autocomplete with QScintilla if no results present | 4764 # Autocomplete with QScintilla if no results present |
| 4759 if Preferences.getEditor("AutoCompletionScintillaOnFail") and \ | 4765 if Preferences.getEditor("AutoCompletionScintillaOnFail") and \ |
| 4760 not self.__acCompletions: | 4766 not self.__acCompletions: |
