feat: MoltenEvaluateRange non-strict indexing (#81)

benlubas · Dec 14, 2023 · 955b0e8 · 955b0e8
1 parent 900441a
commit 955b0e8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/docs/Not-So-Quick-Start-Guide.md b/docs/Not-So-Quick-Start-Guide.md
@@ -113,7 +113,6 @@ return {
             -- these are examples, not defaults. Please see the readme
             vim.g.molten_image_provider = "image.nvim"
             vim.g.molten_output_win_max_height = 20
-            vim.g.molten_auto_open_output = false
         end,
     },
     {

diff --git a/rplugin/python3/molten/__init__.py b/rplugin/python3/molten/__init__.py
@@ -282,7 +282,7 @@ def _do_evaluate_expr(self, kernel_name: str, expr):
         cell = CodeCell(
             self.nvim,
             DynamicPosition(self.nvim, self.extmark_namespace, bufno, 0, 0),
-            DynamicPosition(self.nvim, self.extmark_namespace, bufno, 0, 0),
+            DynamicPosition(self.nvim, self.extmark_namespace, bufno, 0, 0, right_gravity=True),
         )
 
         kernel.run_code(expr, cell)
@@ -325,7 +325,7 @@ def _do_evaluate(self, kernel_name: str, pos: Tuple[Tuple[int, int], Tuple[int,
         span = CodeCell(
             self.nvim,
             DynamicPosition(self.nvim, self.extmark_namespace, bufno, *pos[0]),
-            DynamicPosition(self.nvim, self.extmark_namespace, bufno, *pos[1]),
+            DynamicPosition(self.nvim, self.extmark_namespace, bufno, *pos[1], right_gravity=True),
         )
 
         code = span.get_text(self.nvim)
@@ -902,7 +902,9 @@ def function_molten_define_cell(self, args: List[int]) -> None:
         span = CodeCell(
             self.nvim,
             DynamicPosition(self.nvim, self.extmark_namespace, bufno, start - 1, 0),
-            DynamicPosition(self.nvim, self.extmark_namespace, bufno, end - 1, -1),
+            DynamicPosition(
+                self.nvim, self.extmark_namespace, bufno, end - 1, -1, right_gravity=True
+            ),
         )
 
         for molten in molten_kernels:

diff --git a/rplugin/python3/molten/code_cell.py b/rplugin/python3/molten/code_cell.py
@@ -55,7 +55,7 @@ def get_text(self, nvim: Nvim) -> str:
         assert self.begin.bufno == self.end.bufno
 
         lines: List[str] = nvim.funcs.nvim_buf_get_lines(
-            self.bufno, self.begin.lineno, self.end.lineno + 1, True
+            self.bufno, self.begin.lineno, self.end.lineno + 1, False
         )
 
         if len(lines) == 1:

diff --git a/rplugin/python3/molten/outputbuffer.py b/rplugin/python3/molten/outputbuffer.py
@@ -188,6 +188,9 @@ def show_virtual_output(self, anchor: Position) -> None:
         if self.options.virt_lines_off_by_1:
             win_row += 1
 
+        if win_row > (last := self.nvim.funcs.line("$")):
+            win_row = last
+
         shape = (
             win_col,
             win_row,

diff --git a/rplugin/python3/molten/position.py b/rplugin/python3/molten/position.py
@@ -33,13 +33,18 @@ def __init__(
         bufno: int,
         lineno: int,
         colno: int,
+        right_gravity: bool = False,
     ):
         self.nvim = nvim
         self.extmark_namespace = extmark_namespace
 
         self.bufno = bufno
         self.extmark_id = self.nvim.funcs.nvim_buf_set_extmark(
-            self.bufno, extmark_namespace, lineno, colno, {}
+            self.bufno,
+            extmark_namespace,
+            lineno,
+            colno,
+            {"right_gravity": right_gravity, "strict": False},
         )
 
     def set_height(self, height: int) -> None:

diff --git a/rplugin/python3/molten/save_load.py b/rplugin/python3/molten/save_load.py
@@ -67,6 +67,7 @@ def load(nvim: Nvim, moltenbuffer: MoltenKernel, nvim_buffer: Buffer, data: Dict
             nvim_buffer.number,
             cell["span"]["end"]["lineno"],
             cell["span"]["end"]["colno"],
+            right_gravity=True,
         )
         span = CodeCell(nvim, begin_position, end_position)