Merge branch 'stevearc:master' into master

Author: miduddin

README.md

@@ -204,7 +204,7 @@ require("oil").setup({
     ["-"] = { "actions.parent", mode = "n" },
     ["_"] = { "actions.open_cwd", mode = "n" },
     ["`"] = { "actions.cd", mode = "n" },
-    ["~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" },
+    ["g~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" },
     ["gs"] = { "actions.change_sort", mode = "n" },
     ["gx"] = "actions.open_external",
     ["g."] = { "actions.toggle_hidden", mode = "n" },

doc/oil.txt

@@ -86,7 +86,7 @@ CONFIG                                                                *oil-confi
         ["-"] = { "actions.parent", mode = "n" },
         ["_"] = { "actions.open_cwd", mode = "n" },
         ["`"] = { "actions.cd", mode = "n" },
-        ["~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" },
+        ["g~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" },
         ["gs"] = { "actions.change_sort", mode = "n" },
         ["gx"] = "actions.open_external",
         ["g."] = { "actions.toggle_hidden", mode = "n" },

lua/oil/config.lua

@@ -69,7 +69,7 @@ local default_config = {
     ["-"] = { "actions.parent", mode = "n" },
     ["_"] = { "actions.open_cwd", mode = "n" },
     ["`"] = { "actions.cd", mode = "n" },
-    ["~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" },
+    ["g~"] = { "actions.cd", opts = { scope = "tab" }, mode = "n" },
     ["gs"] = { "actions.change_sort", mode = "n" },
     ["gx"] = "actions.open_external",
     ["g."] = { "actions.toggle_hidden", mode = "n" },

lua/oil/init.lua

@@ -1164,10 +1164,12 @@ M.setup = function(opts)
     end
 
     if not float and (args.smods.vertical or args.smods.horizontal or args.smods.split ~= "") then
+      local range = args.count > 0 and { args.count } or nil
+      local cmdargs = { mods = { split = args.smods.split }, range = range }
       if args.smods.vertical then
-        vim.cmd.vsplit({ mods = { split = args.smods.split }, range = { args.count } })
+        vim.cmd.vsplit(cmdargs)
       else
-        vim.cmd.split({ mods = { split = args.smods.split }, range = { args.count } })
+        vim.cmd.split(cmdargs)
       end
     end
 

lua/oil/mutator/parser.lua

@@ -95,7 +95,7 @@ M.parse_line = function(adapter, line, column_defs)
     local name = util.split_config(def)
     local range = { start }
     local start_len = string.len(rem)
-    value, rem = columns.parse_col(adapter, rem, def)
+    value, rem = columns.parse_col(adapter, assert(rem), def)
     if not rem then
       return nil, string.format("Parsing %s failed", name)
     end

lua/oil/view.lua

@@ -257,6 +257,31 @@ local function get_first_mutable_column_col(adapter, ranges)
   return min_col
 end
 
+--- @param bufnr integer
+--- @param adapter oil.Adapter
+--- @param mode false|"name"|"editable"
+--- @param cur integer[]
+--- @return integer[] | nil
+local function calc_constrained_cursor_pos(bufnr, adapter, mode, cur)
+  local parser = require("oil.mutator.parser")
+  local line = vim.api.nvim_buf_get_lines(bufnr, cur[1] - 1, cur[1], true)[1]
+  local column_defs = columns.get_supported_columns(adapter)
+  local result = parser.parse_line(adapter, line, column_defs)
+  if result and result.ranges then
+    local min_col
+    if mode == "editable" then
+      min_col = get_first_mutable_column_col(adapter, result.ranges)
+    elseif mode == "name" then
+      min_col = result.ranges.name[1]
+    else
+      error(string.format('Unexpected value "%s" for option constrain_cursor', mode))
+    end
+    if cur[2] < min_col then
+      return { cur[1], min_col }
+    end
+  end
+end
+
 ---Force cursor to be after hidden/immutable columns
 ---@param bufnr integer
 ---@param mode false|"name"|"editable"
@@ -267,28 +292,30 @@ local function constrain_cursor(bufnr, mode)
   if bufnr ~= vim.api.nvim_get_current_buf() then
     return
   end
-  local parser = require("oil.mutator.parser")
 
   local adapter = util.get_adapter(bufnr, true)
   if not adapter then
     return
   end
 
-  local cur = vim.api.nvim_win_get_cursor(0)
-  local line = vim.api.nvim_buf_get_lines(bufnr, cur[1] - 1, cur[1], true)[1]
-  local column_defs = columns.get_supported_columns(adapter)
-  local result = parser.parse_line(adapter, line, column_defs)
-  if result and result.ranges then
-    local min_col
-    if mode == "editable" then
-      min_col = get_first_mutable_column_col(adapter, result.ranges)
-    elseif mode == "name" then
-      min_col = result.ranges.name[1]
-    else
-      error(string.format('Unexpected value "%s" for option constrain_cursor', mode))
-    end
-    if cur[2] < min_col then
-      vim.api.nvim_win_set_cursor(0, { cur[1], min_col })
+  local mc = package.loaded["multicursor-nvim"]
+  if mc then
+    mc.onSafeState(function()
+      mc.action(function(ctx)
+        ctx:forEachCursor(function(cursor)
+          local new_cur =
+            calc_constrained_cursor_pos(bufnr, adapter, mode, { cursor:line(), cursor:col() - 1 })
+          if new_cur then
+            cursor:setPos({ new_cur[1], new_cur[2] + 1 })
+          end
+        end)
+      end)
+    end, { once = true })
+  else
+    local cur = vim.api.nvim_win_get_cursor(0)
+    local new_cur = calc_constrained_cursor_pos(bufnr, adapter, mode, cur)
+    if new_cur then
+      vim.api.nvim_win_set_cursor(0, new_cur)
     end
   end
 end