Mercurial Repositories > eric / file comparison
comparison: Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
- changeset 4217
- 38e8903f9c2f
- parent 4021
- 195a471c327b
- child 4218
- f542ad1f76c5
equal
deleted
inserted
replaced
| 4216:bca19a75be32 | 4217:38e8903f9c2f |
|---|---|
| 392 return | 392 return |
| 393 | 393 |
| 394 self.__lastFileItem = None | 394 self.__lastFileItem = None |
| 395 | 395 |
| 396 if codestring: | 396 if codestring: |
| 397 self.source = codestring | 397 source = codestring |
| 398 encoding = Utilities.get_coding(source) | |
| 398 else: | 399 else: |
| 399 try: | 400 try: |
| 400 self.source, encoding = Utilities.readEncodedFile( | 401 source, encoding = Utilities.readEncodedFile( |
| 401 self.filename) | 402 self.filename) |
| 402 if encoding.endswith( | 403 source = source.splitlines(True) |
| 403 ('-selected', '-default', '-guessed', '-ignore')): | |
| 404 encoding = encoding.rsplit('-', 1)[0] | |
| 405 | |
| 406 self.source = self.source.splitlines(True) | |
| 407 except (UnicodeError, IOError) as msg: | 404 except (UnicodeError, IOError) as msg: |
| 408 self.noResults = False | 405 self.noResults = False |
| 409 self.__createResultItem( | 406 self.__createResultItem( |
| 410 self.filename, 1, 1, | 407 self.filename, 1, 1, |
| 411 self.tr("Error: {0}").format(str(msg)) | 408 self.tr("Error: {0}").format(str(msg)) |
| 412 .rstrip(), False, False, False) | 409 .rstrip(), False, False, False) |
| 413 self.progress += 1 | 410 self.progress += 1 |
| 414 # Continue with next file | 411 # Continue with next file |
| 415 self.check() | 412 self.check() |
| 416 return | 413 return |
| 414 if encoding.endswith( | |
| 415 ('-selected', '-default', '-guessed', '-ignore')): | |
| 416 encoding = encoding.rsplit('-', 1)[0] | |
| 417 | 417 |
| 418 errors = [] | 418 errors = [] |
| 419 self.__itms = [] | 419 self.__itms = [] |
| 420 for error, itm in self.__onlyFixes.pop(self.filename, []): | 420 for error, itm in self.__onlyFixes.pop(self.filename, []): |
| 421 errors.append(error) | 421 errors.append(error) |
| 424 eol = self.__getEol(self.filename) | 424 eol = self.__getEol(self.filename) |
| 425 args = self.__options + [ | 425 args = self.__options + [ |
| 426 errors, eol, encoding, Preferences.getEditor("CreateBackupFile") | 426 errors, eol, encoding, Preferences.getEditor("CreateBackupFile") |
| 427 ] | 427 ] |
| 428 self.styleCheckService.styleCheck( | 428 self.styleCheckService.styleCheck( |
| 429 None, self.filename, self.source, args) | 429 None, self.filename, source, args) |
| 430 | 430 |
| 431 def __processResult(self, fn, codeStyleCheckerStats, fixes, results): | 431 def __processResult(self, fn, codeStyleCheckerStats, fixes, results): |
| 432 """ | 432 """ |
| 433 Private slot called after perfoming a style check on one file. | 433 Private slot called after perfoming a style check on one file. |
| 434 | 434 |
