fix: Mapping TS lang → filetype - closes #93

Author: andrewferrier

lua/debugprint/init.lua

@@ -72,18 +72,19 @@ local debuginfo = function(opts)
     return line
 end
 
-local filetype_configured = function()
-    local effective_filetype = utils.get_effective_filetype()
+local get_filetype_config = function()
+    local effective_filetypes = utils.get_effective_filetypes()
 
-    return vim.tbl_contains(
-        vim.tbl_keys(global_opts.filetypes),
-        effective_filetype
-    )
-end
+    for _, effective_filetype in ipairs(effective_filetypes) do
+        if global_opts.filetypes[effective_filetype] ~= nil then
+            return global_opts.filetypes[effective_filetype]
+        end
+    end
 
-local construct_debugprint_line = function(opts, effective_filetype)
-    local fileconfig = global_opts.filetypes[effective_filetype]
+    return nil
+end
 
+local construct_debugprint_line = function(opts, fileconfig)
     local line_to_insert
 
     if opts.variable_name then
@@ -120,16 +121,16 @@ local construct_error_line = function(errormsg)
 end
 
 local addline = function(opts)
-    local effective_filetype = utils.get_effective_filetype()
-
     local line_to_insert
 
-    if filetype_configured() then
-        line_to_insert = construct_debugprint_line(opts, effective_filetype)
+    local fileconfig = get_filetype_config()
+
+    if fileconfig ~= nil then
+        line_to_insert = construct_debugprint_line(opts, fileconfig)
     else
         line_to_insert = construct_error_line(
             "No debugprint configuration for filetype "
-                .. effective_filetype
+                .. utils.get_effective_filetypes()[1]
                 .. "; see https://github.com/andrewferrier/debugprint.nvim?tab=readme-ov-file#add-custom-filetypes"
         )
     end
@@ -163,7 +164,7 @@ local cache_request = nil
 
 M.debugprint_cache = function(opts)
     if opts and opts.prerepeat == true then
-        if filetype_configured() and opts.variable == true then
+        if get_filetype_config() and opts.variable == true then
             opts.variable_name = utils.get_variable_name(
                 global_opts.ignore_treesitter,
                 opts.ignore_treesitter

lua/debugprint/utils.lua

@@ -94,7 +94,7 @@ M.set_callback = function(func_name)
     vim.go.operatorfunc = func_name
 end
 
-M.get_effective_filetype = function()
+M.get_effective_filetypes = function()
     local current_line_nr = vim.api.nvim_win_get_cursor(0)[1] - 1
     -- Looking at the last column is more accurate because there are some
     -- embeddings (e.g. JS in HTML) where the Treesitter embedding doesn't begin
@@ -108,16 +108,20 @@ M.get_effective_filetype = function()
         -- make embedded languages work
         parser:parse(true)
 
-        return parser
+        local treesitter_lang = parser
             :language_for_range({
                 current_line_nr,
                 current_line_col,
                 current_line_nr,
                 current_line_col,
             })
             :lang()
+
+        local filetypes = vim.treesitter.language.get_filetypes(treesitter_lang)
+        assert(vim.tbl_count(filetypes) > 0)
+        return filetypes
     else
-        return vim.api.nvim_get_option_value("filetype", { scope = "local" })
+        return { vim.api.nvim_get_option_value("filetype", { scope = "local" }) }
     end
 end
 

tests/debugprint.lua

@@ -454,6 +454,26 @@ describe("can do various file types", function()
         })
     end)
 
+    it("can handle a file where ext != filetype", function()
+        local filename = init_file({
+            "const Foo: FunctionalComponent = () => {",
+            "    return <div>Hello World!</div>;",
+            "};",
+        }, "tsx", 1, 0)
+
+        vim.api.nvim_set_option_value("shiftwidth", 4, {})
+        feedkeys("g?p")
+
+        check_lines({
+            "const Foo: FunctionalComponent = () => {",
+            '    console.warn("DEBUGPRINT[1]: '
+                .. filename
+                .. ':1 (after const Foo: FunctionalComponent = () => )")',
+            "    return <div>Hello World!</div>;",
+            "};",
+        })
+    end)
+
     it("can gracefully handle unknown filetypes", function()
         init_file({
             "foo",