Mercurial Repositories > eric / file comparison
comparison: Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
- changeset 3004
- c4bf32c791d0
- parent 2984
- 031cceaa8b01
- child 3022
- 57179e4cdadd
- child 3057
- 10516539f238
equal
deleted
inserted
replaced
| 3003:cb43c34239b1 | 3004:c4bf32c791d0 |
|---|---|
| 431 ) | 431 ) |
| 432 errors = report.errors[:] | 432 errors = report.errors[:] |
| 433 stats.update(report.counters) | 433 stats.update(report.counters) |
| 434 else: | 434 else: |
| 435 if includeMessages: | 435 if includeMessages: |
| 436 select = [s.strip() for s in includeMessages.split(',') | 436 select = [s.strip() for s in |
| 437 if s.strip()] | 437 includeMessages.split(',') if s.strip()] |
| 438 else: | 438 else: |
| 439 select = [] | 439 select = [] |
| 440 if excludeMessages: | 440 if excludeMessages: |
| 441 ignore = [i.strip() for i in excludeMessages.split(',') | 441 ignore = [i.strip() for i in |
| 442 if i.strip()] | 442 excludeMessages.split(',') if i.strip()] |
| 443 else: | 443 else: |
| 444 ignore = [] | 444 ignore = [] |
| 445 | 445 |
| 446 # check coding style | 446 # check coding style |
| 447 styleGuide = pep8.StyleGuide( | 447 styleGuide = pep8.StyleGuide( |
| 467 deferredFixes = {} | 467 deferredFixes = {} |
| 468 for error in errors: | 468 for error in errors: |
| 469 fname, lineno, position, text = error | 469 fname, lineno, position, text = error |
| 470 if lineno > len(source): | 470 if lineno > len(source): |
| 471 lineno = len(source) | 471 lineno = len(source) |
| 472 if "__IGNORE_WARNING__" not in Utilities.extractLineFlags( | 472 if "__IGNORE_WARNING__" not in \ |
| 473 Utilities.extractLineFlags( | |
| 473 source[lineno - 1].strip()): | 474 source[lineno - 1].strip()): |
| 474 self.noResults = False | 475 self.noResults = False |
| 475 if fixer: | 476 if fixer: |
| 476 res, msg, id_ = fixer.fixIssue(lineno, position, text) | 477 res, msg, id_ = fixer.fixIssue(lineno, |
| 478 position, text) | |
| 477 if res == 1: | 479 if res == 1: |
| 478 text += "\n" + \ | 480 text += "\n" + \ |
| 479 self.trUtf8("Fix: {0}").format(msg) | 481 self.trUtf8("Fix: {0}").format(msg) |
| 480 self.__createResultItem( | 482 self.__createResultItem( |
| 481 fname, lineno, position, text, True, True) | 483 fname, lineno, position, text, True, |
| 484 True) | |
| 482 elif res == 0: | 485 elif res == 0: |
| 483 self.__createResultItem( | 486 self.__createResultItem( |
| 484 fname, lineno, position, text, False, True) | 487 fname, lineno, position, text, False, |
| 488 True) | |
| 485 else: | 489 else: |
| 486 itm = self.__createResultItem( | 490 itm = self.__createResultItem( |
| 487 fname, lineno, position, | 491 fname, lineno, position, |
| 488 text, False, False) | 492 text, False, False) |
| 489 deferredFixes[id_] = itm | 493 deferredFixes[id_] = itm |
| 490 else: | 494 else: |
| 491 self.__createResultItem( | 495 self.__createResultItem( |
| 492 fname, lineno, position, text, False, False) | 496 fname, lineno, position, text, False, |
| 497 False) | |
| 493 if fixer: | 498 if fixer: |
| 494 deferredResults = fixer.finalize() | 499 deferredResults = fixer.finalize() |
| 495 for id_ in deferredResults: | 500 for id_ in deferredResults: |
| 496 fixed, msg = deferredResults[id_] | 501 fixed, msg = deferredResults[id_] |
| 497 itm = deferredFixes[id_] | 502 itm = deferredFixes[id_] |
| 498 if fixed == 1: | 503 if fixed == 1: |
| 499 text = "\n" + self.trUtf8("Fix: {0}").format(msg) | 504 text = "\n" + \ |
| 505 self.trUtf8("Fix: {0}").format(msg) | |
| 500 self.__modifyFixedResultItem(itm, text, True) | 506 self.__modifyFixedResultItem(itm, text, True) |
| 501 else: | 507 else: |
| 502 self.__modifyFixedResultItem(itm, "", False) | 508 self.__modifyFixedResultItem(itm, "", False) |
| 503 fixer.saveFile(encoding) | 509 fixer.saveFile(encoding) |
| 504 self.__updateStatistics(stats, fixer) | 510 self.__updateStatistics(stats, fixer) |
