473 deferredFixes = {} |
473 deferredFixes = {} |
474 for error in errors: |
474 for error in errors: |
475 fname, lineno, position, text = error |
475 fname, lineno, position, text = error |
476 if lineno > len(source): |
476 if lineno > len(source): |
477 lineno = len(source) |
477 lineno = len(source) |
478 if source and \ |
478 if source: |
479 "__IGNORE_WARNING__" not in \ |
479 if "__IGNORE_WARNING__" not in \ |
480 Utilities.extractLineFlags( |
480 Utilities.extractLineFlags( |
481 source[lineno - 1].strip()): |
481 source[lineno - 1].strip()): |
482 self.noResults = False |
482 self.noResults = False |
483 if fixer: |
483 if fixer: |
484 res, msg, id_ = fixer.fixIssue(lineno, |
484 res, msg, id_ = fixer.fixIssue( |
485 position, text) |
485 lineno, position, text) |
486 if res == 1: |
486 if res == 1: |
487 text += "\n" + \ |
487 text += "\n" + \ |
488 self.trUtf8("Fix: {0}").format(msg) |
488 self.trUtf8("Fix: {0}").format(msg) |
489 self.__createResultItem( |
489 self.__createResultItem( |
490 fname, lineno, position, text, True, |
490 fname, lineno, position, text, |
491 True) |
491 True, True) |
492 elif res == 0: |
492 elif res == 0: |
|
493 self.__createResultItem( |
|
494 fname, lineno, position, text, |
|
495 False, True) |
|
496 else: |
|
497 itm = self.__createResultItem( |
|
498 fname, lineno, position, |
|
499 text, False, False) |
|
500 deferredFixes[id_] = itm |
|
501 else: |
493 self.__createResultItem( |
502 self.__createResultItem( |
494 fname, lineno, position, text, False, |
503 fname, lineno, position, text, False, |
495 True) |
504 False) |
496 else: |
505 else: |
497 itm = self.__createResultItem( |
506 self.noResults = False |
498 fname, lineno, position, |
507 self.__createResultItem( |
499 text, False, False) |
508 fname, lineno, position, text, False, |
500 deferredFixes[id_] = itm |
509 False) |
501 else: |
|
502 self.__createResultItem( |
|
503 fname, lineno, position, text, False, |
|
504 False) |
|
505 if fixer: |
510 if fixer: |
506 deferredResults = fixer.finalize() |
511 deferredResults = fixer.finalize() |
507 for id_ in deferredResults: |
512 for id_ in deferredResults: |
508 fixed, msg = deferredResults[id_] |
513 fixed, msg = deferredResults[id_] |
509 itm = deferredFixes[id_] |
514 itm = deferredFixes[id_] |