fix: Accuracy finding embedded langs - closes #84

andrewferrier · andrewferrier · commit b813797c8a78 · 2024-03-25T17:34:36.000Z
diff --git a/lua/debugprint/utils.lua b/lua/debugprint/utils.lua
@@ -29,15 +29,18 @@ local get_node_at_cursor = function()
 end
 
 M.get_effective_filetype = function()
-    local current_line_nr = vim.api.nvim_win_get_cursor(0)[1]
-    local current_line_col = vim.api.nvim_win_get_cursor(0)[2]
+    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
+    -- until the first non-whitespace column
+    local current_line_col = vim.fn.col('$')
 
     local success, parser = pcall(vim.treesitter.get_parser, 0)
 
     if success then
         -- For some reason I don't understand, this parse line is necessary to
         -- make embedded languages work
-        parser:parse({ 0, current_line_nr })
+        parser:parse(true)
 
         return parser
             :language_for_range({
diff --git a/tests/debugprint.lua b/tests/debugprint.lua
@@ -1481,5 +1481,55 @@ if vim.fn.has("nvim-0.9.0") == 1 then
                 "bar",
             })
         end)
+
+        it("lua in markdown above", function()
+            local filename = init_file({
+                "foo",
+                "```lua",
+                "x = 1",
+                "```",
+                "bar",
+            }, "markdown", 3, 0)
+
+            feedkeys("g?P")
+
+            check_lines({
+                "foo",
+                "```lua",
+                "print('DEBUGPRINT[1]: " .. filename .. ":3 (before x = 1)')",
+                "x = 1",
+                "```",
+                "bar",
+            })
+        end)
+
+        it("javascript in html", function()
+            local filename = init_file({
+                "<html>",
+                "<body>",
+                "<script>",
+                "    let x = 3;",
+                "",
+                "    console.log(x);",
+                "</script>",
+                "</body>",
+                "</html>",
+            }, "html", 6, 0)
+
+            feedkeys("g?p")
+
+            check_lines({
+                "<html>",
+                "<body>",
+                "<script>",
+                "    let x = 3;",
+                "",
+                "    console.log(x);",
+                "    console.warn(\"DEBUGPRINT[1]: " .. filename .. ":6 (after console.log(x);)\")",
+                "</script>",
+                "</body>",
+                "</html>",
+            })
+        end)
     end)
 end
