summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcatatonicprime <catatonicprime@gmail.com>2019-12-19 19:18:00 -0700
committercatatonicprime <catatonicprime@gmail.com>2019-12-19 19:18:00 -0700
commitdf4e03d5f5a7affb4c948c6a7d734838b4332630 (patch)
tree50a9b00c06033b6020aa6f011c28d6c27181a284
parent95cd525bc6a4fdcfaff243f70ee03d07124ed0cb (diff)
downloadpygments-git-df4e03d5f5a7affb4c948c6a7d734838b4332630.tar.gz
Fix directives that have 0 arguments
-rw-r--r--pygments/lexers/configs.py3
-rw-r--r--tests/test_apache_conf.py16
2 files changed, 16 insertions, 3 deletions
diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py
index 0911b6e2..ad724b22 100644
--- a/pygments/lexers/configs.py
+++ b/pygments/lexers/configs.py
@@ -303,8 +303,7 @@ class ApacheConfLexer(RegexLexer):
(r'#(.*\\\n)+.*$|(#.*?)$', Comment),
(r'(<[^\s>]+)(?:(\s+)(.*))?(>)',
bygroups(Name.Tag, Text, String, Name.Tag)),
- (r'([a-z]\w*)(\s+)',
- bygroups(Name.Builtin, Text), 'value'),
+ (r'[a-z]\w*', Name.Builtin, 'value'),
(r'\.+', Text),
],
'value': [
diff --git a/tests/test_apache_conf.py b/tests/test_apache_conf.py
index 1e906c10..bcccf56f 100644
--- a/tests/test_apache_conf.py
+++ b/tests/test_apache_conf.py
@@ -39,4 +39,18 @@ def test_multiline_argument(lexer):
(Token.Text, ''),
(Token.Text, '\n'),
]
- assert list(lexer.get_tokens(fragment)) == tokens \ No newline at end of file
+ assert list(lexer.get_tokens(fragment)) == tokens
+
+def test_directive_no_args(lexer):
+ fragment = 'Example\nServerName localhost'
+ tokens = [
+ (Token.Name.Builtin, 'Example'),
+ (Token.Text, ''),
+ (Token.Text, '\n'),
+ (Token.Name.Builtin, 'ServerName'),
+ (Token.Text, ' '),
+ (Token.Text, 'localhost'),
+ (Token.Text, ''),
+ (Token.Text, '\n'),
+ ]
+ assert list(lexer.get_tokens(fragment)) == tokens