Merge pull request #2835 from kartben/fix_ini_double_quotes

Anteru · web-flow · commit a9858663ed85 · 2025-01-06T08:52:18.000+01:00
Fix quoted string handling
diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py
@@ -44,21 +44,21 @@ class IniLexer(RegexLexer):
             (r'\s+', Whitespace),
             (r'[;#].*', Comment.Single),
             (r'(\[.*?\])([ \t]*)$', bygroups(Keyword, Whitespace)),
-            (r'''(.*?)([  \t]*)([=:])([ \t]*)(["'])''',
+            (r'''(.*?)([ \t]*)([=:])([ \t]*)(["'])''',
              bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String),
              "quoted_value"),
-            (r'(.*?)([  \t]*)([=:])([ \t]*)([^;#\n]*)(\\)(\s+)',
+            (r'(.*?)([ \t]*)([=:])([ \t]*)([^;#\n]*)(\\)(\s+)',
              bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String,
                       Text, Whitespace),
              "value"),
-            (r'(.*?)([ \t]*)([=:])([  \t]*)([^ ;#\n]*(?: +[^ ;#\n]+)*)',
+            (r'(.*?)([ \t]*)([=:])([ \t]*)([^ ;#\n]*(?: +[^ ;#\n]+)*)',
              bygroups(Name.Attribute, Whitespace, Operator, Whitespace, String)),
             # standalone option, supported by some INI parsers
             (r'(.+?)$', Name.Attribute),
         ],
         'quoted_value': [
             (r'''([^"'\n]*)(["'])(\s*)''',
-             bygroups(String, String, Whitespace)),
+             bygroups(String, String, Whitespace), "#pop"),
             (r'[;#].*', Comment.Single),
             (r'$', String, "#pop"),
         ],
diff --git a/tests/snippets/ini/test_quoted_entries.txt b/tests/snippets/ini/test_quoted_entries.txt
@@ -15,13 +15,15 @@
 'value1'      Literal.String
 '"'           Literal.String
 '\n    '      Text.Whitespace
-'key 2 = '    Literal.String
+'key 2'       Name.Attribute
+' '           Text.Whitespace
+'='           Operator
+' '           Text.Whitespace
 '"'           Literal.String
 'value2'      Literal.String
 '"'           Literal.String
 ' '           Text.Whitespace
 '# comment'   Comment.Single
-''            Literal.String
 '\n    '      Text.Whitespace
 'key 3'       Name.Attribute
 ' '           Text.Whitespace
@@ -32,5 +34,4 @@
 '"'           Literal.String
 ' '           Text.Whitespace
 '; comment'   Comment.Single
-''            Literal.String
 '\n'          Text.Whitespace
