diff --git a/lua/octo/gh/init.lua b/lua/octo/gh/init.lua index ced39d7a..fe485690 100644 --- a/lua/octo/gh/init.lua +++ b/lua/octo/gh/init.lua @@ -58,9 +58,9 @@ function M.get_user_name(remote_hostname) local stdout = table.concat(job:result(), "\n") -- Newer versions of the gh cli have a different message. See #467 local name_err = string.match(stderr, "Logged in to [^%s]+ as ([^%s]+)") - or string.match(stderr, "Logged in to [^%s]+ account ([^%s]+)") + or string.match(stderr, "Logged in to [^%s]+ account ([^%s]+)") local name_out = string.match(stdout, "Logged in to [^%s]+ as ([^%s]+)") - or string.match(stdout, "Logged in to [^%s]+ account ([^%s]+)") + or string.match(stdout, "Logged in to [^%s]+ account ([^%s]+)") if name_err then return name_err diff --git a/lua/octo/utils.lua b/lua/octo/utils.lua index 389bfe31..0b7c836c 100644 --- a/lua/octo/utils.lua +++ b/lua/octo/utils.lua @@ -980,7 +980,7 @@ function M.process_patch(patch) for _, hunk in ipairs(hunk_strings) do local header = vim.split(hunk, "\n")[1] local found, _, left_start, left_length, right_start, right_length = - string.find(header, "^%s*%-(%d+),(%d+)%s+%+(%d+),(%d+)%s*@@") + string.find(header, "^%s*%-(%d+),(%d+)%s+%+(%d+),(%d+)%s*@@") if found then table.insert(hunks, hunk) table.insert(left_ranges, { tonumber(left_start), math.max(left_start + left_length - 1, 0) }) @@ -1274,10 +1274,10 @@ function M.apply_mappings(kind, bufnr) local conf = config.values for action, value in pairs(conf.mappings[kind]) do if - not M.is_blank(value) - and not M.is_blank(action) - and not M.is_blank(value.lhs) - and not M.is_blank(mappings[action]) + not M.is_blank(value) + and not M.is_blank(action) + and not M.is_blank(value.lhs) + and not M.is_blank(mappings[action]) then if M.is_blank(value.desc) then value.desc = ""