Fix a regression where messages with dash are not fully parsed

Close #3604

Author: PCManticore

ChangeLog

@@ -15,6 +15,10 @@ Release date: TBA
 
   Close #3612
 
+* Fix a regression where messages with dash are not fully parsed
+
+  Close #3604
+
 
 What's New in Pylint 2.5.2?
 ===========================

pylint/utils/pragma_parser.py

@@ -17,7 +17,7 @@
     .*?                # Anything (as little as possible)
     \bpylint:          # pylint word and column
     \s*                # Any number of whitespaces
-    ([^;#\n]+))        # Anything except semicolon or hash or newline (it is the second matched group) 
+    ([^;#\n]+))        # Anything except semicolon or hash or newline (it is the second matched group)
                        # and end of the first matched group
     [;#]{0,1}"""  # From 0 to 1 repetition of semicolon or hash
 OPTION_PO = re.compile(OPTION_RGX, re.VERBOSE)
@@ -39,7 +39,7 @@
 
 TOKEN_SPECIFICATION = [
     ("KEYWORD", r"\b({:s})\b".format(ALL_KEYWORDS)),
-    ("MESSAGE_STRING", r"[A-Za-z\-]{2,}"),  #  Identifiers
+    ("MESSAGE_STRING", r"[A-Za-z\-\_]{2,}"),  #  Identifiers
     ("ASSIGN", r"="),  #  Assignment operator
     ("MESSAGE_NUMBER", r"[CREIWF]{1}\d*"),
 ]

tests/test_pragma_parser.py

@@ -82,3 +82,11 @@ def test_missing_message():
     match = OPTION_PO.search(comment)
     with pytest.raises(InvalidPragmaError):
         list(parse_pragma(match.group(2)))
+
+
+def test_parse_message_with_dash():
+    comment = "#pylint: disable = raw_input-builtin"
+    match = OPTION_PO.search(comment)
+    res = list(parse_pragma(match.group(2)))
+    assert res[0].action == "disable"
+    assert res[0].messages == ["raw_input-builtin"]