diff --git a/TODO.rst b/TODO.rst
index f14e096..3fba3a7 100644
--- a/TODO.rst
+++ b/TODO.rst
@@ -22,7 +22,6 @@ queries.  Contributions are welcome.
 
 - devicetree
 - elm
-- fish
 - gdscript
 - graphql
 - kotlin
diff --git a/queries/fish/rainbow-delimiters.scm b/queries/fish/rainbow-delimiters.scm
new file mode 100644
index 0000000..2e54a8c
--- /dev/null
+++ b/queries/fish/rainbow-delimiters.scm
@@ -0,0 +1,15 @@
+(command_substitution
+  "(" @opening
+  ")" @closing) @container
+
+(concatenation
+  "[" @opening
+  "]" @closing) @container
+
+(list_element_access
+  "[" @opening
+  "]" @closing) @container
+
+(brace_expansion
+  "{" @opening
+  "}" @closing) @container
diff --git a/test/highlight/fish/regular.fish b/test/highlight/fish/regular.fish
new file mode 100644
index 0000000..d439c24
--- /dev/null
+++ b/test/highlight/fish/regular.fish
@@ -0,0 +1,7 @@
+set -l shells "$SHELL" /bin/{zsh,bash,sh} (which nu) /usr/bin/xonsh
+
+echo "Your first few shells is $shells[1..3]"
+
+if set -q shells[10]
+    echo "You defined at least 10 shells"
+end