Unnamed repository; edit this file 'description' to name the repository.
-rw-r--r--book/src/generated/lang-support.md2
-rw-r--r--languages.toml2
-rw-r--r--runtime/queries/glsl/highlights.scm4
-rw-r--r--runtime/queries/glsl/indents.scm20
-rw-r--r--runtime/queries/glsl/rainbows.scm3
-rw-r--r--runtime/queries/glsl/tags.scm1
6 files changed, 11 insertions, 21 deletions
diff --git a/book/src/generated/lang-support.md b/book/src/generated/lang-support.md
index 5740d683..e35a388d 100644
--- a/book/src/generated/lang-support.md
+++ b/book/src/generated/lang-support.md
@@ -98,7 +98,7 @@
| gjs | ✓ | ✓ | ✓ | ✓ | | `typescript-language-server`, `vscode-eslint-language-server`, `ember-language-server` |
| gleam | ✓ | ✓ | | | ✓ | `gleam` |
| glimmer | ✓ | | | | | `ember-language-server` |
-| glsl | ✓ | ✓ | ✓ | | | `glsl_analyzer`, `glsld` |
+| glsl | ✓ | ✓ | ✓ | ✓ | ✓ | `glsl_analyzer`, `glsld` |
| gn | ✓ | | | | | |
| gnuplot | ✓ | | | | | |
| go | ✓ | ✓ | ✓ | ✓ | ✓ | `gopls`, `golangci-lint-langserver` |
diff --git a/languages.toml b/languages.toml
index 72073123..fe056794 100644
--- a/languages.toml
+++ b/languages.toml
@@ -1882,7 +1882,7 @@ injection-regex = "glsl"
[[grammar]]
name = "glsl"
-source = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "88408ffc5e27abcffced7010fc77396ae3636d7e" }
+source = { git = "https://github.com/theHamsta/tree-sitter-glsl", rev = "24a6c8ef698e4480fecf8340d771fbcb5de8fbb4" }
[[language]]
name = "penrose"
diff --git a/runtime/queries/glsl/highlights.scm b/runtime/queries/glsl/highlights.scm
index af2a049f..5feced62 100644
--- a/runtime/queries/glsl/highlights.scm
+++ b/runtime/queries/glsl/highlights.scm
@@ -25,6 +25,10 @@
"noperspective"
"invariant"
"precise"
+ "require"
+ "enable"
+ "warn"
+ "disable"
] @keyword
"subroutine" @keyword.function
diff --git a/runtime/queries/glsl/indents.scm b/runtime/queries/glsl/indents.scm
index a8b55a42..a5a5208c 100644
--- a/runtime/queries/glsl/indents.scm
+++ b/runtime/queries/glsl/indents.scm
@@ -1,19 +1 @@
-[
- (init_declarator)
- (compound_statement)
- (preproc_arg)
- (field_declaration_list)
- (case_statement)
- (conditional_expression)
- (enumerator_list)
- (struct_specifier)
- (compound_literal_expression)
-] @indent
-
-[
- "#define"
- "#ifdef"
- "#endif"
- "{"
- "}"
-] @outdent
+; inherits: c
diff --git a/runtime/queries/glsl/rainbows.scm b/runtime/queries/glsl/rainbows.scm
new file mode 100644
index 00000000..74ca60ed
--- /dev/null
+++ b/runtime/queries/glsl/rainbows.scm
@@ -0,0 +1,3 @@
+; inherits: c
+
+(layout_qualifiers) @rainbow.scope
diff --git a/runtime/queries/glsl/tags.scm b/runtime/queries/glsl/tags.scm
new file mode 100644
index 00000000..a5a5208c
--- /dev/null
+++ b/runtime/queries/glsl/tags.scm
@@ -0,0 +1 @@
+; inherits: c