Cleanup implementation

Author: julienvincent

lua/nvim-paredit/api/barfing.lua

@@ -81,7 +81,7 @@ function M.barf_forwards(opts)
     end
   end
 
-  indentation.handle_indentation({
+  local event = {
     type = "barf-forwards",
     -- stylua: ignore
     parent_range = {
@@ -91,7 +91,8 @@ function M.barf_forwards(opts)
     reversed = false,
     indent_behaviour = opts.indent_behaviour or config.config.indent_behaviour,
     lang = lang,
-  })
+  }
+  indentation.handle_indentation(event, opts)
 end
 
 function M.barf_backwards(opts)
@@ -161,17 +162,15 @@ function M.barf_backwards(opts)
     end
   end
 
-  indentation.handle_indentation({
+  local event = {
     type = "barf-backwards",
     -- stylua: ignore
     parent_range = {
       end_pos[1], end_pos[2],
       edges.right.range[1], edges.right.range[2],
     },
-    reversed = true,
-    indent_behaviour = opts.indent_behaviour or config.config.indent_behaviour,
-    lang = lang,
-  })
+  }
+  indentation.handle_indentation(event, opts)
 end
 
 return M

lua/nvim-paredit/api/slurping.lua

@@ -97,29 +97,25 @@ local function slurp(opts)
   local new_range
   if not opts.reversed then
     operation_type = "slurp-forwards"
+    -- stylua: ignore
     new_range = {
-      form_edges.left.range[1],
-      form_edges.left.range[2],
-      row,
-      col,
+      form_edges.left.range[1], form_edges.left.range[2],
+      row, col,
     }
   else
     operation_type = "slurp-backwards"
+    -- stylua: ignore
     new_range = {
-      row,
-      col,
-      form_edges.right.range[1],
-      form_edges.right.range[2],
+      row, col,
+      form_edges.right.range[1], form_edges.right.range[2],
     }
   end
 
-  indentation.handle_indentation({
+  local event = {
     type = operation_type,
     parent_range = new_range,
-    reversed = opts.reversed,
-    indent_behaviour = opts.indent_behaviour or config.config.indent_behaviour,
-    lang = lang,
-  })
+  }
+  indentation.handle_indentation(event, opts)
 end
 
 function M.slurp_forwards(opts)

lua/nvim-paredit/defaults.lua

@@ -61,7 +61,7 @@ M.default_keys = {
 M.defaults = {
   use_default_keys = true,
   cursor_behaviour = "auto", -- remain, follow, auto
-  indent_behaviour = "native", -- native, lsp, none
+  auto_indent = true,
   keys = {},
 }
 

lua/nvim-paredit/indentation/init.lua

@@ -1,24 +1,15 @@
 local native = require("nvim-paredit.indentation.native")
-local lsp = require("nvim-paredit.indentation.lsp")
+local config = require("nvim-paredit.config")
 
 local M = {}
 
-function M.handle_indentation(operation)
-  local behaviour = operation.indent_behaviour
-  if not behaviour or behaviour == "none" then
+function M.handle_indentation(event, opts)
+  local auto_indent = opts.auto_indent or config.config.auto_indent
+  if not auto_indent then
     return
   end
 
-  local indent_fn
-
-  if type(behaviour) == "function" then
-    indent_fn = behaviour
-  elseif behaviour == "lsp" then
-    indent_fn = lsp.indent
-  elseif behaviour == "native" then
-    indent_fn = native.indent
-  end
-
+  local indent_fn = opts.indent_fn or config.config.indent_fn or native.indent
   if not indent_fn then
     return
   end
@@ -27,11 +18,14 @@ function M.handle_indentation(operation)
 
   tree:parse()
 
-  local parent = tree:named_node_for_range(operation.parent_range)
-  indent_fn(vim.tbl_deep_extend("force", operation, {
-    tree = tree,
-    parent = parent,
-  }))
+  local parent = tree:named_node_for_range(event.parent_range)
+  indent_fn(
+    vim.tbl_deep_extend("force", event, {
+      tree = tree,
+      parent = parent,
+    }),
+    opts
+  )
 end
 
 return M