Mercurial Repositories > eric / file comparison
comparison: QScintilla/Editor.py
QScintilla/Editor.py
- changeset 3205
- 157dcfafc5d2
- parent 3204
- c3e5015c15ee
- child 3206
- f516fc427551
equal
deleted
inserted
replaced
| 3204:c3e5015c15ee | 3205:157dcfafc5d2 |
|---|---|
| 4990 int(errorline), int(errorindex), True, _error) | 4990 int(errorline), int(errorindex), True, _error) |
| 4991 else: | 4991 else: |
| 4992 if Preferences.getFlakes("IncludeInSyntaxCheck"): | 4992 if Preferences.getFlakes("IncludeInSyntaxCheck"): |
| 4993 from Utilities.py3flakes.checker import Checker | 4993 from Utilities.py3flakes.checker import Checker |
| 4994 from Utilities.py3flakes.messages import ImportStarUsed | 4994 from Utilities.py3flakes.messages import ImportStarUsed |
| 4995 from Utilities.py3flakes.translations import \ | |
| 4996 getTranslatedFlakesMessage | |
| 4995 | 4997 |
| 4996 ignoreStarImportWarnings = \ | 4998 ignoreStarImportWarnings = \ |
| 4997 Preferences.getFlakes("IgnoreStarImportWarnings") | 4999 Preferences.getFlakes("IgnoreStarImportWarnings") |
| 4998 try: | 5000 try: |
| 4999 txt = self.text()\ | 5001 txt = self.text()\ |
| 5005 for warning in warnings.messages: | 5007 for warning in warnings.messages: |
| 5006 if ignoreStarImportWarnings and \ | 5008 if ignoreStarImportWarnings and \ |
| 5007 isinstance(warning, ImportStarUsed): | 5009 isinstance(warning, ImportStarUsed): |
| 5008 continue | 5010 continue |
| 5009 | 5011 |
| 5010 _fn, lineno, message = warning.getMessageData() | 5012 _fn, lineno, messageID, messageArgs = \ |
| 5013 warning.getMessageData() | |
| 5011 if "__IGNORE_WARNING__" not in \ | 5014 if "__IGNORE_WARNING__" not in \ |
| 5012 Utilities.extractLineFlags( | 5015 Utilities.extractLineFlags( |
| 5013 self.text(lineno - 1).strip()): | 5016 self.text(lineno - 1).strip()): |
| 5014 self.toggleWarning( | 5017 self.toggleWarning( |
| 5015 lineno, True, message) | 5018 lineno, True, |
| 5019 getTranslatedFlakesMessage( | |
| 5020 messageID, messageArgs)) | |
| 5016 except SyntaxError as err: | 5021 except SyntaxError as err: |
| 5017 if err.text.strip(): | 5022 if err.text.strip(): |
| 5018 msg = err.text.strip() | 5023 msg = err.text.strip() |
| 5019 else: | 5024 else: |
| 5020 msg = err.msg | 5025 msg = err.msg |
| 5028 "IncludeInSyntaxCheck")) | 5033 "IncludeInSyntaxCheck")) |
| 5029 if syntaxError: | 5034 if syntaxError: |
| 5030 self.toggleSyntaxError( | 5035 self.toggleSyntaxError( |
| 5031 int(errorline), int(errorindex), True, _error) | 5036 int(errorline), int(errorindex), True, _error) |
| 5032 else: | 5037 else: |
| 5038 from Utilities.py3flakes.translations import \ | |
| 5039 getTranslatedFlakesMessage | |
| 5033 for warning in warnings: | 5040 for warning in warnings: |
| 5034 self.toggleWarning( | 5041 self.toggleWarning( |
| 5035 int(warning[1]), True, warning[2]) | 5042 int(warning[1]), True, getTranslatedFlakesMessage( |
| 5043 warning[2], warning[3])) | |
| 5036 | 5044 |
| 5037 def __initOnlineSyntaxCheck(self): | 5045 def __initOnlineSyntaxCheck(self): |
| 5038 """ | 5046 """ |
| 5039 Private slot to initialize the online syntax check. | 5047 Private slot to initialize the online syntax check. |
| 5040 """ | 5048 """ |
