3 files changed, 8 insertions, 7 deletions
diff --git a/runtime/lua/vim/treesitter/health.lua b/runtime/lua/vim/treesitter/health.lua
index aa9db6b71b..3bd59ca282 100644
--- a/runtime/lua/vim/treesitter/health.lua
+++ b/runtime/lua/vim/treesitter/health.lua
@@ -26,7 +26,9 @@ function M.check()
       report_error(string.format('Impossible to load parser for %s: %s', parsername, ret))
     elseif ret then
       local lang = ts.language.inspect_language(parsername)
-      report_ok(string.format('Loaded parser for %s: ABI version %d', parsername, lang._abi_version))
+      report_ok(
+        string.format('Loaded parser for %s: ABI version %d', parsername, lang._abi_version)
+      )
     else
       report_error(string.format('Unable to load parser for %s', parsername))
     end
diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index d3da300e96..e27a5fa9c3 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -16,7 +16,7 @@ local _default_highlights = {}
 local _link_default_highlight_once = function(from, to)
   if not _default_highlights[from] then
     _default_highlights[from] = true
-    vim.cmd(string.format('highlight default link %s %s', from, to))
+    a.nvim_set_hl(0, from, { link = to, default = true })
   end
 
   return from
@@ -280,7 +280,8 @@ local function on_line_impl(self, buf, line)
     end
 
     if state.iter == nil or state.next_row < line then
-      state.iter = highlighter_query:query():iter_captures(root_node, self.bufnr, line, root_end_row + 1)
+      state.iter =
+        highlighter_query:query():iter_captures(root_node, self.bufnr, line, root_end_row + 1)
     end
 
     while line >= state.next_row do
diff --git a/runtime/lua/vim/treesitter/languagetree.lua b/runtime/lua/vim/treesitter/languagetree.lua
index 767573e345..4d3b0631a2 100644
--- a/runtime/lua/vim/treesitter/languagetree.lua
+++ b/runtime/lua/vim/treesitter/languagetree.lua
@@ -32,10 +32,8 @@ function LanguageTree.new(source, lang, opts)
     _regions = {},
     _trees = {},
     _opts = opts,
-    _injection_query = injections[lang] and query.parse_query(lang, injections[lang]) or query.get_query(
-      lang,
-      'injections'
-    ),
+    _injection_query = injections[lang] and query.parse_query(lang, injections[lang])
+      or query.get_query(lang, 'injections'),
     _valid = false,
     _parser = vim._create_ts_parser(lang),
     _callbacks = {