Improve Clay, Autohotkey lexers. (#2248)

Merge consecutive tokens together where possible.
pygments · Sep 25, 2022 · fafb6d7 · fafb6d7
1 parent f4a5d40
commit fafb6d7
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 106 deletions.
diff --git a/CHANGES b/CHANGES
@@ -37,6 +37,7 @@ Version 2.14.0
   (#2223)
 
 - Support more filetypes and compression types in `autopygmentize` (#2219)
+- Merge consecutive tokens in Autohotkey, Clay
 
 Version 2.13.0
 --------------

diff --git a/pygments/lexers/automation.py b/pygments/lexers/automation.py
@@ -50,8 +50,8 @@ class AutohotkeyLexer(RegexLexer):
         ],
         'incomment': [
             (r'^\s*\*/', Comment.Multiline, '#pop'),
-            (r'[^*/]', Comment.Multiline),
-            (r'[*/]', Comment.Multiline)
+            (r'[^*]+', Comment.Multiline),
+            (r'\*', Comment.Multiline)
         ],
         'incontinuation': [
             (r'^\s*\)', Generic, '#pop'),

diff --git a/pygments/lexers/c_like.py b/pygments/lexers/c_like.py
@@ -126,7 +126,7 @@ class ClayLexer(RegexLexer):
         ],
         'strings': [
             (r'(?i)\\(x[0-9a-f]{2}|.)', String.Escape),
-            (r'.', String),
+            (r'[^\\"]+', String),
         ],
         'nl': [
             (r'\n', String),

diff --git a/tests/examplefiles/ahk/demo.ahk.output b/tests/examplefiles/ahk/demo.ahk.output
diff --git a/tests/examplefiles/clay/example.clay.output b/tests/examplefiles/clay/example.clay.output