fix: various issues with node ranges

doc/otter.nvim.txt

@@ -1,4 +1,4 @@
-*otter.nvim.txt*       For Neovim >= 0.9.0       Last change: 2024 February 11
+*otter.nvim.txt*       For Neovim >= 0.9.0       Last change: 2024 February 12
 
 ==============================================================================
 Table of Contents                               *otter.nvim-table-of-contents*

lua/otter/keeper.lua

@@ -139,17 +139,23 @@ M.get_current_language_context = function(main_nr)
     local name = query.captures[id]
 
     lang_capture = determine_language(main_nr, name, node, metadata, lang_capture)
+    local start_row, start_col, end_row, end_col = node:range()
+    end_row = end_row - 1
+    local last_line = vim.api.nvim_buf_get_lines(main_nr, end_row, end_row+1, true)
+    if last_line ~= nil and last_line[1] ~= nil then
+      end_col = last_line[1]:len()
+    end
 
     if lang_capture and (name == "content" or name == "injection.content") then
       -- chunks where the name of the injected language is dynamic
       -- e.g. markdown code chunks
       if ts.is_in_node_range(node, row, col) then
-        return lang_capture, node:range()
+        return lang_capture, start_row, start_col, end_row, end_col
       end
       -- chunks where the name of the language is the name of the capture
     elseif fn.contains(injectable_languages, name) then
       if ts.is_in_node_range(node, row, col) then
-        return name, node:range()
+        return name, start_row, start_col, end_row, end_col
       end
     end
   end

lua/otter/tools/functions.lua

@@ -93,6 +93,9 @@ M.is_otter_language_context = function(lang)
   local current = require("otter.keeper").get_current_language_context()
   if current == lang then
     vim.b["quarto_is_" .. lang .. "_chunk"] = true
+    return true
+  else
+    return false
   end
 end
 

tests/debug-example.sh

@@ -0,0 +1,16 @@
+#! /bin/env bash
+# usage: ./tests/debug-example.sh $1
+
+echo "choose an example file based on number of extension."
+echo "e.g. ./tests/debug-example.sh 01"
+echo "e.g. ./tests/debug-example.sh qmd"
+echo "Options"
+ls ./tests/examples/
+
+if [ -z "$1" ]; then
+  echo "Please provide a file extension or a number"
+  echo "And call this from the project root directory"
+  exit 1
+fi
+
+nvim ./tests/examples/*$1* -c ":lua require'otter'.dev_setup()"

tests/examples/01.qmd

@@ -6,6 +6,13 @@ engine: markdown
 
 # Hello
 
+```{r}
+print('hello world')
+
+plot(1:10)
+```
+
+
 ```{python}
 print('hello world')
 ```

tests/examples/03.md

@@ -6,6 +6,14 @@ engine: markdown
 
 # Hello
 
+```lua
+print( "this should be formatted")
+```
+
+```lua
+print( "this should be formatted")
+```
+
 ```{python}
 print('hello world')
 ```
@@ -43,3 +51,12 @@ def hello():
 ```{python}
 hello()
 ```
+
+
+```{python}
+import numpy as np
+
+np.zeros(10)
+```
+
+

tests/examples/05.norg

@@ -0,0 +1,26 @@
+@document.meta
+title: Norg Example
+description: This is an example of Norg document.
+@end
+
+* Norg Example
+
+** Code
+  @code lua
+  print("Hello, Norg!")
+  @end
+
+
+  @code python
+  print("Hello world!")
+  import numpy as np
+  x = np.zeros(10)
+  @end
+
+** Other things
+  This is a paragraph.
+
+  - This is a list.
+  - This is another list.
+
+  This is another paragraph.

tests/examples/06.ts

@@ -0,0 +1,16 @@
+const foo = html`
+  <div>
+    <p>hello</p>
+  </div>
+`;
+
+const bar = css`
+  .foo {
+    color: rgb(0, 0, 0);
+  }
+`;
+
+const lua = lua`
+  local foo = "bar"
+  print(foo)
+`;

tests/examples/07-just-r.qmd

@@ -0,0 +1,17 @@
+---
+title: Hello World
+format: html
+engine: markdown
+---
+
+# Formatting
+
+```{r}
+print('hello world')
+x = "Hello"
+```
+
+```{r}
+print("hello world")
+x <- "Hello"
+```