fix: pass bufnr through to all usages of should_decorate and transfor…

…m_text
code-biscuits · Nov 6, 2022 · 256d021 · 256d021
1 parent 5257ea2
commit 256d021
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/lua/nvim-biscuits/init.lua b/lua/nvim-biscuits/init.lua
@@ -145,7 +145,7 @@ nvim_biscuits.setup = function(user_config)
     if user_config == nil then
         user_config = {}
     end
-    
+
     final_config = utils.merge_tables(final_config, user_config)
 
     if user_config.default_config then

diff --git a/lua/nvim-biscuits/languages.lua b/lua/nvim-biscuits/languages.lua
@@ -13,19 +13,19 @@ local handled_languages = {
     python = python
 }
 
-languages.should_decorate = function(language_name, ts_node, text)
+languages.should_decorate = function(language_name, ts_node, text, bufnr)
     local language = handled_languages[language_name]
 
     if language == nil then return true end
 
-    return language.should_decorate(ts_node, text)
+    return language.should_decorate(ts_node, text, bufnr)
 end
 
-languages.transform_text = function(language_name, ts_node, text)
+languages.transform_text = function(language_name, ts_node, text, bufnr)
     local language = handled_languages[language_name]
     if language == nil then return text end
 
-    return language.transform_text(ts_node, text)
+    return language.transform_text(ts_node, text, bufnr)
 end
 
 return languages
diff --git a/lua/nvim-biscuits/languages/javascript.lua b/lua/nvim-biscuits/languages/javascript.lua
@@ -10,7 +10,7 @@ language.should_decorate = function(ts_node, text, bufnr)
 
     local should_decorate = true
     if utils.list_contains(elements, type) then
-        should_decorate = html.should_decorate(ts_node, text)
+        should_decorate = html.should_decorate(ts_node, text, bufnr)
     end
 
     local ignored_element_types = {
@@ -26,7 +26,7 @@ language.should_decorate = function(ts_node, text, bufnr)
 end
 
 language.transform_text = function(ts_node, text, bufnr)
-    text = html.transform_text(ts_node, text)
+    text = html.transform_text(ts_node, text, bufnr)
     return utils.trim(text)
 end
 

diff --git a/lua/nvim-biscuits/languages/python.lua b/lua/nvim-biscuits/languages/python.lua
@@ -9,10 +9,6 @@ language.should_decorate = function(ts_node, text, bufnr)
 end
 
 language.transform_text = function(ts_node, text, bufnr)
-
-    -- Dev.console_log("Node")
-    -- Dev.console_log(ts_node)
-
     local start_line, start_col, end_line, end_col =
         ts_utils.get_node_range(ts_node)
     local parent_start_line, parent_start_col, parent_end_line, parent_end_col =
@@ -28,7 +24,7 @@ language.transform_text = function(ts_node, text, bufnr)
                                              false)
     local text = lines[1]
 
-    -- text = html.transform_text(ts_node, text)
+    -- text = html.transform_text(ts_node, text, bufnr)
     return utils.trim(text)
 end
 

diff --git a/lua/nvim-biscuits/languages/vue.lua b/lua/nvim-biscuits/languages/vue.lua
@@ -5,12 +5,12 @@ local html = require("nvim-biscuits.languages.html")
 local language = {}
 
 language.should_decorate = function(ts_node, text, bufnr)
-    local should_decorate = html.should_decorate(ts_node, text)
+    local should_decorate = html.should_decorate(ts_node, text, bufnr)
     return should_decorate
 end
 
 language.transform_text = function(ts_node, text, bufnr)
-    text = html.transform_text(ts_node, text)
+    text = html.transform_text(ts_node, text, bufnr)
     return utils.trim(text)
 end