Display multiple misspelled words on same error line

Author: flashcode

ChangeLog.asciidoc

@@ -6,6 +6,7 @@
 
 == Version 2.8 (under dev!)
 
+* display multiple misspelled words on same error line
 * sort and keep unique misspelled words with option -m/--only-misspelled
 
 == Version 2.7 (2014-06-28)

msgcheck/msgcheck.py

@@ -134,8 +134,10 @@ def main():
             total_errors += len(reports)
             if not args.quiet:
                 if args.only_misspelled:
-                    words = [report.message for report in reports
-                             if report.idmsg.startswith('spelling-')]
+                    words = []
+                    for report in reports:
+                        for word in report.get_misspelled_words():
+                            words.append(word)
                     print('\n'.join(sorted(set(words),
                                            key=lambda s: s.lower())))
                 else:

msgcheck/po.py

@@ -71,19 +71,26 @@ def __repr__(self):
             return self.message + '\n---'
         if self.idmsg == 'compile':
             return '{0}\n{1}'.format('=' * 70, self.message)
-        msg = '{0}\n{1}:{2}: [{3}] {4}{5}'.format(
+        is_list = type(self.message) is list
+        count = '(%d)' % len(self.message) if is_list else ''
+        msg = '{0}\n{1}:{2}: [{3}{4}] {5}{6}'.format(
             '=' * 70,
             self.filename,
             self.line,
             self.idmsg,
+            count,
             '(fuzzy) ' if self.fuzzy else '',
-            self.message)
+            ', '.join(self.message) if is_list else self.message)
         if self.mid:
             msg += '\n---\n' + self.mid
         if self.mstr:
             msg += '\n---\n' + self.mstr
         return msg
 
+    def get_misspelled_words(self):
+        """Return list of misspelled words."""
+        return self.message if type(self.message) is list else []
+
 
 class PoMessage(object):
     """
@@ -274,8 +281,8 @@ def check_spelling(self, spelling, checkers):
                         break
                 if misspelled_word:
                     misspelled.append(err.word)
-            for word in misspelled:
-                errors.append(PoReport(word, 'spelling-' + spelling,
+            if misspelled:
+                errors.append(PoReport(misspelled, 'spelling-' + spelling,
                                        self.filename, self.line, mid, mstr))
         return errors
 

tests/test_msgcheck.py

@@ -109,7 +109,9 @@ def test_spelling_id(self):
         self.assertEquals(len(errors), 2)
         for i, word in enumerate(('Thsi', 'errro')):
             self.assertEquals(errors[i].idmsg, 'spelling-id')
-            self.assertEquals(errors[i].message, word)
+            self.assertTrue(type(errors[i].message) is list)
+            self.assertEquals(len(errors[i].message), 1)
+            self.assertEquals(errors[i].message[0], word)
 
     def test_spelling_str(self):
         """Test spelling on translated messages of gettext files."""
@@ -126,7 +128,9 @@ def test_spelling_str(self):
         self.assertEquals(len(errors), 2)
         for i, word in enumerate(('aabbcc', 'xxyyzz')):
             self.assertEquals(errors[i].idmsg, 'spelling-str')
-            self.assertEquals(errors[i].message, word)
+            self.assertTrue(type(errors[i].message) is list)
+            self.assertEquals(len(errors[i].message), 1)
+            self.assertEquals(errors[i].message[0], word)
 
         # second file has 1 error: dict/language "xyz" not found
         errors = result[1][1]