2 files changed, 37 insertions, 0 deletions
diff --git a/runtime/queries/rbs/highlights.scm b/runtime/queries/rbs/highlights.scm
index 9de9c427d..6c4b2434d 100644
--- a/runtime/queries/rbs/highlights.scm
+++ b/runtime/queries/rbs/highlights.scm
@@ -106,10 +106,18 @@
 
 (global_name) @variable
 
+; Generics Keywords
+[
+  (generics_unchecked)
+  (generics_variance)
+] @keyword
+
 ; Standard Arguments
 (parameter
   (var_name) @variable.parameter)
 
+(unnamed_parameter) @variable.parameter
+
 ; Keyword Arguments
 (keyword) @variable.parameter
 
@@ -144,6 +152,10 @@
   "&"
   "|"
   "^"
+  "?"
+  (rest_operator)
+  (block_operator)
+  (optional_block_operator)
 ] @operator
 
 ; Punctuation
@@ -159,4 +171,17 @@
 [
   ","
   "."
+  ":"
 ] @punctuation.delimiter
+
+; RBS Inline syntax
+(inline_class_annotation) @keyword
+
+(inline_doc
+  (var_name) @variable.parameter)
+
+(inline_generic) @keyword
+
+(inline_override) @keyword
+
+(inline_skip) @keyword
diff --git a/runtime/queries/ruby/injections.scm b/runtime/queries/ruby/injections.scm
index e998e2bd7..2f75c846a 100644
--- a/runtime/queries/ruby/injections.scm
+++ b/runtime/queries/ruby/injections.scm
@@ -1,6 +1,18 @@
 ((comment) @injection.content
   (#set! injection.language "comment"))
 
+((comment) @injection.content
+  (#lua-match? @injection.content "^#:")
+  (#set! injection.language "rbs"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^#%s+@rbs")
+  (#set! injection.language "rbs"))
+
+((comment) @injection.content
+  (#lua-match? @injection.content "^#%s+|")
+  (#set! injection.language "rbs"))
+
 (heredoc_body
   (heredoc_content) @injection.content
   (heredoc_end) @injection.language)