Update pygments to 2.15.1 and restore fixed shader syntax highlighting

godotengine · May 29, 2023 · b3db4c1 · b3db4c1
1 parent d72080c
commit b3db4c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@
 # https://github.com/readthedocs/readthedocs.org/blob/master/requirements/docs.txt
 
 # Base dependencies
-pygments==2.14.0
+pygments==2.15.1
 
 # Sphinx base and RTD theme.
 sphinx==4.4.0

diff --git a/tutorials/shaders/shader_reference/shader_preprocessor.rst b/tutorials/shaders/shader_reference/shader_preprocessor.rst
@@ -61,8 +61,7 @@ anywhere within the shader (including in uniform hints).
 ``#define`` can also be used to insert arbitrary shader code at any location,
 while constants can't do that.
 
-.. FIXME: An upstream bug (https://github.com/pygments/pygments/pull/2350), fixed but not published yet.
-.. code-block:: none
+.. code-block:: glsl
 
     shader_type spatial;
 

diff --git a/tutorials/shaders/shaders_style_guide.rst b/tutorials/shaders/shaders_style_guide.rst
@@ -346,8 +346,7 @@ the console, extra indentation should **not** be added within ``#if``,
 
 **Bad**:
 
-.. FIXME: An upstream bug in Pygment related to #ifdef.
-.. code-block:: none
+.. code-block:: glsl
 
     #define heightmap_enabled