Fix GLSL and HLSL preprocessor line continuation

pygments · Feb 22, 2023 · ce88071 · ce88071
1 parent b4e9027
commit ce88071
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 4 deletions.
diff --git a/pygments/lexers/graphics.py b/pygments/lexers/graphics.py
@@ -30,7 +30,7 @@ class GLShaderLexer(RegexLexer):
 
     tokens = {
         'root': [
-            (r'^#.*$', 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'^#.*$', 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,4 +1,12 @@
 /* Fragment shader */
+
+#define SINGLELINE_MACRO 10.0
+
+#define MULTILINE_MACRO(a, b) vec2( \
+    a, \
+    b \
+)
+
 void main()
 {
     gl_FragColor[0] = gl_FragCoord[0] / 400.0;

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,4 +1,12 @@
 /* Vertex shader */
+
+#define SINGLELINE_MACRO 10.0
+
+#define MULTILINE_MACRO(a, b) vec2( \
+    a, \
+    b \
+)
+
 uniform float waveTime;
 uniform float waveWidth;
 uniform float waveHeight;

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,12 @@
 // A few random snippets of HLSL shader code I gathered...
 
+#define SINGLELINE_MACRO 10.0
+
+#define MULTILINE_MACRO(a, b) float2( \
+	a, \
+	b \
+)
+
 [numthreads(256, 1, 1)]
 void cs_main(uint3 threadId : SV_DispatchThreadID)
 {

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