Merge pull request #2670 from Kodiologist/hylex

Improve Hy support
pygments · May 4, 2024 · 338d366 · 338d366
2 parents 4d1371b + a737674
commit 338d366
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/pygments/lexers/_mapping.py b/pygments/lexers/_mapping.py
@@ -216,8 +216,8 @@
     'HtmlSmartyLexer': ('pygments.lexers.templates', 'HTML+Smarty', ('html+smarty',), (), ('text/html+smarty',)),
     'HttpLexer': ('pygments.lexers.textfmts', 'HTTP', ('http',), (), ()),
     'HxmlLexer': ('pygments.lexers.haxe', 'Hxml', ('haxeml', 'hxml'), ('*.hxml',), ()),
-    'HyLexer': ('pygments.lexers.lisp', 'Hy', ('hylang',), ('*.hy',), ('text/x-hy', 'application/x-hy')),
-    'HybrisLexer': ('pygments.lexers.scripting', 'Hybris', ('hybris', 'hy'), ('*.hy', '*.hyb'), ('text/x-hybris', 'application/x-hybris')),
+    'HyLexer': ('pygments.lexers.lisp', 'Hy', ('hylang', 'hy'), ('*.hy',), ('text/x-hy', 'application/x-hy')),
+    'HybrisLexer': ('pygments.lexers.scripting', 'Hybris', ('hybris',), ('*.hyb',), ('text/x-hybris', 'application/x-hybris')),
     'IDLLexer': ('pygments.lexers.idl', 'IDL', ('idl',), ('*.pro',), ('text/idl',)),
     'IconLexer': ('pygments.lexers.unicon', 'Icon', ('icon',), ('*.icon', '*.ICON'), ()),
     'IdrisLexer': ('pygments.lexers.haskell', 'Idris', ('idris', 'idr'), ('*.idr',), ('text/x-idris',)),

diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
@@ -486,7 +486,7 @@ class HyLexer(RegexLexer):
     """
     name = 'Hy'
     url = 'http://hylang.org/'
-    aliases = ['hylang']
+    aliases = ['hylang', 'hy']
     filenames = ['*.hy']
     mimetypes = ['text/x-hy', 'application/x-hy']
     version_added = '2.0'
@@ -519,7 +519,7 @@ class HyLexer(RegexLexer):
     # valid names for identifiers
     # well, names can only not consist fully of numbers
     # but this should be good enough for now
-    valid_name = r'(?!#)[\w!$%*+<=>?/.#:-]+'
+    valid_name = r"[^ \t\n\r\f\v()[\]{};\"'`~]+"
 
     def _multi_escape(entries):
         return words(entries, suffix=' ')
@@ -531,8 +531,7 @@ def _multi_escape(entries):
             (r';.*$', Comment.Single),
 
             # whitespaces - usually not relevant
-            (r',+', Text),
-            (r'\s+', Whitespace),
+            (r'[ \t\n\r\f\v]+', Whitespace),
 
             # numbers
             (r'-?\d+\.\d+', Number.Float),

diff --git a/pygments/lexers/scripting.py b/pygments/lexers/scripting.py
@@ -1179,8 +1179,8 @@ class HybrisLexer(RegexLexer):
     """
 
     name = 'Hybris'
-    aliases = ['hybris', 'hy']
-    filenames = ['*.hy', '*.hyb']
+    aliases = ['hybris']
+    filenames = ['*.hyb']
     mimetypes = ['text/x-hybris', 'application/x-hybris']
     url = 'https://github.com/evilsocket/hybris'
     version_added = '1.4'

diff --git a/tests/examplefiles/hylang/language.hy b/tests/examplefiles/hylang/language.hy
@@ -3,9 +3,9 @@
 ;;;;
 
 
-(defn _numeric-check [x]
-  (if (not (numeric? x))
-    (raise (TypeError (.format "{0!r} is not a number" x)))))
+(defn _numeric-check [↻]
+  (if (not (numeric? ↻))
+    (raise (TypeError (.format "{0!r} (↻) is not a number" ↻)))))
 
 (defn cycle [coll]
   "Yield an infinite repetition of the items in coll"

diff --git a/tests/examplefiles/hylang/language.hy.output b/tests/examplefiles/hylang/language.hy.output