Merge remote-tracking branch 'upstream/master' into language_lua

.gitmodules

@@ -106,6 +106,10 @@
 	path = helix-syntax/languages/tree-sitter-lua
 	url = https://github.com/nvim-treesitter/tree-sitter-lua
 	shallow = true
+[submodule "helix-syntax/languages/tree-sitter-yaml"]
+	path = helix-syntax/languages/tree-sitter-yaml
+	url = https://github.com/ikatyang/tree-sitter-yaml
+	shallow = true
 [submodule "helix-syntax/languages/tree-sitter-zig"]
 	path = helix-syntax/languages/tree-sitter-zig
 	url = https://github.com/maxxnino/tree-sitter-zig

languages.toml

@@ -229,6 +229,15 @@ name = "lua"
 scope = "source.lua"
 file-types = ["lua"]
 roots = []
+comment-token = "--"
+indent = { tab-width = 2, unit = "  " }
+
+[[language]]
+name = "yaml"
+scope = "source.yaml"
+file-types = ["yml", "yaml"]
+roots = []
+comment-token = "#"
 indent = { tab-width = 2, unit = "  " }
 
 # [[language]]