Add Support for GLSL

Author: Suraj-Yadav

Cargo.lock

@@ -95,6 +95,7 @@ tree-sitter-erlang = "0.16.0"
 tree-sitter-fortran = "0.5.1"
 tree-sitter-fsharp = "0.3.0"
 tree-sitter-gleam = "1.0.0"
+tree-sitter-glsl = "0.2.0"
 tree-sitter-go = "0.25.0"
 tree-sitter-haskell = "0.23.1"
 tree-sitter-hcl = "1.1.0"

Cargo.toml

@@ -28,6 +28,7 @@ with `difft --list-languages`.
 | F#              | [ionide/tree-sitter-fsharp](https://github.com/ionide/tree-sitter-fsharp)                         |
 | Fortran         | [stadelmanma/tree-sitter-fortran](https://github.com/stadelmanma/tree-sitter-fortran)             |
 | Gleam           | [gleam-lang/tree-sitter-gleam](https://github.com/gleam-lang/tree-sitter-gleam)                   |
+| Glsl            | [tree-sitter-grammars/tree-sitter-glsl](https://github.com/tree-sitter-grammars/tree-sitter-glsl) |
 | Go              | [tree-sitter/tree-sitter-go](https://github.com/tree-sitter/tree-sitter-go)                       |
 | Hare            | [ecmma/tree-sitter-hare](https://git.sr.ht/~ecmma/tree-sitter-hare)                               |
 | Haskell         | [tree-sitter/tree-sitter-haskell](https://github.com/tree-sitter/tree-sitter-haskell)             |

manual/src/languages_supported.md

@@ -85,6 +85,12 @@ sample_files/f_sharp_1.fs sample_files/f_sharp_2.fs
 sample_files/fortran_1.f90 sample_files/fortran_2.f90
 b5fae2c0a3e0755ca8182df1f728400b  -
 
+sample_files/glsl_frag_1.frag sample_files/glsl_frag_2.frag
+0f6fe946a3b36534767e9f09ca6a5920  -
+
+sample_files/glsl_vert_1.vert sample_files/glsl_vert_2.vert
+f98b5d9030f67dff492d1d9c8f31b065  -
+
 sample_files/hack_1.php sample_files/hack_2.php
 fd23895fca3cb3e70b5ffd364f8c30fe  -
 

sample_files/compare.expected

@@ -0,0 +1,10 @@
+#version 330 core
+// Basic Fragment Shader 1
+out vec4 FragColor;
+
+in vec4 vertexColor; // the input variable from the vertex shader (same name and same type)
+
+void main()
+{
+    FragColor = vertexColor;
+}

sample_files/glsl_frag_1.frag

@@ -0,0 +1,13 @@
+#version 330 core
+// Basic Fragment Shader 2
+out vec4 FragColor;
+
+in vec3 ourColor;
+in vec2 TexCoord;
+
+uniform sampler2D ourTexture;
+
+void main()
+{
+    FragColor = texture(ourTexture, TexCoord);
+}

sample_files/glsl_frag_2.frag

@@ -0,0 +1,12 @@
+#version 330 core
+// Basic Vertex Shader 1
+layout (location = 0) in vec3 aPos;   // the position variable has attribute position 0
+layout (location = 1) in vec3 aColor; // the color variable has attribute position 1
+
+out vec3 ourColor; // output a color to the fragment shader
+
+void main()
+{
+    gl_Position = vec4(aPos, 1.0);
+    ourColor = aColor; // set ourColor to the input color we got from the vertex data
+}

sample_files/glsl_vert_1.vert

@@ -0,0 +1,15 @@
+#version 330 core
+// Basic Vertex Shader 2
+layout (location = 0) in vec3 aPos;
+layout (location = 1) in vec3 aColor;
+layout (location = 2) in vec2 aTexCoord;
+
+out vec3 ourColor;
+out vec2 TexCoord;
+
+void main()
+{
+    gl_Position = vec4(aPos, 1.0);
+    ourColor = aColor;
+    TexCoord = aTexCoord;
+}

sample_files/glsl_vert_2.vert

@@ -40,6 +40,7 @@ pub(crate) enum Language {
     FSharp,
     Fortran,
     Gleam,
+    Glsl,
     Go,
     Hare,
     Haskell,
@@ -141,6 +142,7 @@ pub(crate) fn language_name(language: Language) -> &'static str {
         FSharp => "F#",
         Fortran => "Fortran",
         Gleam => "Gleam",
+        Glsl => "Glsl",
         Go => "Go",
         Hare => "Hare",
         Haskell => "Haskell",
@@ -284,6 +286,31 @@ pub(crate) fn language_globs(language: Language) -> Vec<glob::Pattern> {
         FSharp => &["*.fs", "*.fsx", "*.fsi"],
         Fortran => &["*.f", "*.for", "*.f90", "*.F", "*.FOR", "*.F90"],
         Gleam => &["*.gleam"],
+        Glsl => &[
+            "*.glsl",
+            "*.fp",
+            "*.frag",
+            "*.frg",
+            "*.fs",
+            "*.fsh",
+            "*.fshader",
+            "*.geo",
+            "*.geom",
+            "*.glslf",
+            "*.glslv",
+            "*.gs",
+            "*.gshader",
+            "*.rchit",
+            "*.rmiss",
+            "*.shader",
+            "*.tesc",
+            "*.tese",
+            "*.vert",
+            "*.vrx",
+            "*.vs",
+            "*.vsh",
+            "*.vshader",
+        ],
         Go => &["*.go"],
         Hare => &["*.ha"],
         Haskell => &["*.hs"],

src/parse/guess_language.rs

@@ -472,6 +472,19 @@ fn build_config(language: guess::Language) -> TreeSitterConfig {
                 sub_languages: vec![],
             }
         }
+        Glsl => {
+            let language_fn = tree_sitter_glsl::LANGUAGE_GLSL;
+            let language = tree_sitter::Language::new(language_fn);
+            TreeSitterConfig {
+                language: language.clone(),
+                atom_nodes: ["string_literal", "char_literal"].into_iter().collect(),
+                delimiter_tokens: vec![("(", ")"), ("{", "}"), ("[", "]")],
+                ignore_trailing_tokens: vec![],
+                highlight_query: ts::Query::new(&language, tree_sitter_glsl::HIGHLIGHTS_QUERY)
+                    .unwrap(),
+                sub_languages: vec![],
+            }
+        }
         Go => {
             let language_fn = tree_sitter_go::LANGUAGE;
             let language = tree_sitter::Language::new(language_fn);