From 981f3f17a03dd27544a9c62349451b5c54e65882 Mon Sep 17 00:00:00 2001
From: kiyan42 <yazdani.kiyan@protonmail.com>
Date: Sat, 5 Sep 2020 21:43:40 +0200
Subject: [PATCH 1/2] treesitter: check hl group exists before passing it in
 nvim_get_hl_id_by_name

---
 runtime/lua/vim/treesitter/highlighter.lua | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index bb78b5654c..7e1ca7d3f4 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -98,7 +98,12 @@ function TSHighlighter:get_hl_from_capture(capture)
     return vim.split(name, '.', true)[1]
   else
     -- Default to false to avoid recomputing
-    return a.nvim_get_hl_id_by_name(TSHighlighter.hl_map[name])
+    local hl = TSHighlighter.hl_map[name]
+    if hl then
+      return a.nvim_get_hl_id_by_name(hl)
+    else
+      return 0
+    end
   end
 end
 

From 7e0c4e532935dc03857f9470f4229e95a1cbdeb3 Mon Sep 17 00:00:00 2001
From: kiyan42 <yazdani.kiyan@protonmail.com>
Date: Sun, 6 Sep 2020 15:32:24 +0200
Subject: [PATCH 2/2] apply bfredl suggestion

---
 runtime/lua/vim/treesitter/highlighter.lua | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/runtime/lua/vim/treesitter/highlighter.lua b/runtime/lua/vim/treesitter/highlighter.lua
index 7e1ca7d3f4..1acf888821 100644
--- a/runtime/lua/vim/treesitter/highlighter.lua
+++ b/runtime/lua/vim/treesitter/highlighter.lua
@@ -99,11 +99,7 @@ function TSHighlighter:get_hl_from_capture(capture)
   else
     -- Default to false to avoid recomputing
     local hl = TSHighlighter.hl_map[name]
-    if hl then
-      return a.nvim_get_hl_id_by_name(hl)
-    else
-      return 0
-    end
+    return hl and a.nvim_get_hl_id_by_name(hl) or 0
   end
 end