Merge pull request #2357 from bitsawer/shader_lang_preprocessor_changes

Fix GLSL and HLSL preprocessor directive start
pygments · Feb 26, 2023 · 875b858 · 875b858
2 parents f589ac6 + 61219ae
commit 875b858
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 2 deletions.
diff --git a/pygments/lexers/graphics.py b/pygments/lexers/graphics.py
@@ -30,7 +30,7 @@ class GLShaderLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'^#(?:.*\\\n)*.*$', Comment.Preproc),
+            (r'#(?:.*\\\n)*.*$', Comment.Preproc),
             (r'//.*$', Comment.Single),
             (r'/(\\\n)?[*](.|\n)*?[*](\\\n)?/', Comment.Multiline),
             (r'\+|-|~|!=?|\*|/|%|<<|>>|<=?|>=?|==?|&&?|\^|\|\|?',
@@ -161,7 +161,7 @@ class HLSLShaderLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'^#(?:.*\\\n)*.*$', Comment.Preproc),
+            (r'#(?:.*\\\n)*.*$', Comment.Preproc),
             (r'//.*$', Comment.Single),
             (r'/(\\\n)?[*](.|\n)*?[*](\\\n)?/', Comment.Multiline),
             (r'\+|-|~|!=?|\*|/|%|<<|>>|<=?|>=?|==?|&&?|\^|\|\|?',

diff --git a/tests/examplefiles/glsl/glsl.frag b/tests/examplefiles/glsl/glsl.frag
@@ -1,5 +1,11 @@
 /* Fragment shader */
 
+// Macro inside a single-line comment: #define COMMENT_MACRO 1
+
+/* Macro inside a block comment: #define COMMENT_MACRO 2 */
+
+    # define INDENTED_MACRO 5.0
+
 #define SINGLELINE_MACRO 10.0
 
 #define MULTILINE_MACRO(a, b) vec2( \

diff --git a/tests/examplefiles/glsl/glsl.frag.output b/tests/examplefiles/glsl/glsl.frag.output
diff --git a/tests/examplefiles/glsl/glsl.vert b/tests/examplefiles/glsl/glsl.vert
@@ -1,5 +1,11 @@
 /* Vertex shader */
 
+// Macro inside a single-line comment: #define COMMENT_MACRO 1
+
+/* Macro inside a block comment: #define COMMENT_MACRO 2 */
+
+    # define INDENTED_MACRO 5.0
+
 #define SINGLELINE_MACRO 10.0
 
 #define MULTILINE_MACRO(a, b) vec2( \

diff --git a/tests/examplefiles/glsl/glsl.vert.output b/tests/examplefiles/glsl/glsl.vert.output
diff --git a/tests/examplefiles/hlsl/example.hlsl b/tests/examplefiles/hlsl/example.hlsl
@@ -1,5 +1,11 @@
 // A few random snippets of HLSL shader code I gathered...
 
+// Macro inside a single-line comment: #define COMMENT_MACRO 1
+
+/* Macro inside a block comment: #define COMMENT_MACRO 2 */
+
+	# define INDENTED_MACRO 5.0
+
 #define SINGLELINE_MACRO 10.0
 
 #define MULTILINE_MACRO(a, b) float2( \

diff --git a/tests/examplefiles/hlsl/example.hlsl.output b/tests/examplefiles/hlsl/example.hlsl.output