Myzel394/jsonfly.nvim
1
0
Fork 0
mirror of https://github.com/Myzel394/jsonfly.nvim.git synced 2025-06-18 04:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove wrong bracket expansion

Browse Source
This commit is contained in:
Myzel394 2024-04-27 21:06:03 +02:00
parent ec7326783d
commit a287e403ea
No known key found for this signature in database
GPG Key ID: DEC4AAB876F73185
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lua/jsonfly/insert.lua
View File

@ -19,14 +19,15 @@ function table.slice(tbl, first, last, step)
end end
---@param line string ---@param line string
---@param also_match_end_bracket boolean - Whether to also match only a closing bracket
---@return boolean - Whether the line contains an empty JSON object ---@return boolean - Whether the line contains an empty JSON object
local function line_contains_empty_json(line) local function line_contains_empty_json(line, also_match_end_bracket)
-- Starting and ending on same line -- Starting and ending on same line
return string.match(line, ".*[%{%[]%s*[%]%]]%s*,?*%s*") return string.match(line, ".*[%{%[]%s*[%]%]]%s*,?*%s*")
-- Opening bracket on line -- Opening bracket on line
or string.match(line, ".*[%{%[]%s*") or string.match(line, ".*[%{%[]%s*")
-- Closing bracket on line -- Closing bracket on line
or string.match(line, ".*.*[%]%}]%s*,?%s*") or (also_match_end_bracket and string.match(line, ".*.*[%]%}]%s*,?%s*"))
end end
---@param entry Entry ---@param entry Entry
@ -87,9 +88,9 @@ local function write_keys(keys, index, lines)
return return
end end
if key.type == "object_wrapper" then if key.type == "object_wrapper" and #lines > 0 then
local previous_line = lines[#lines] or "" local previous_line = lines[#lines] or ""
if line_contains_empty_json(previous_line) then if line_contains_empty_json(previous_line, true) then
lines[#lines + 1] = "{" lines[#lines + 1] = "{"
else else
lines[#lines] = previous_line .. " {" lines[#lines] = previous_line .. " {"
@ -105,7 +106,7 @@ local function write_keys(keys, index, lines)
elseif key.type == "array_wrapper" then elseif key.type == "array_wrapper" then
local previous_line = lines[#lines] or "" local previous_line = lines[#lines] or ""
-- Starting and ending on same line -- Starting and ending on same line
if line_contains_empty_json(previous_line) then if line_contains_empty_json(previous_line, true) then
lines[#lines + 1] = "[" lines[#lines + 1] = "["
else else
lines[#lines] = previous_line .. " [" lines[#lines] = previous_line .. " ["
@ -169,7 +170,7 @@ end
local function expand_empty_object(buffer, line_number) local function expand_empty_object(buffer, line_number)
local line = vim.api.nvim_buf_get_lines(buffer, line_number, line_number + 1, false)[1] or "" local line = vim.api.nvim_buf_get_lines(buffer, line_number, line_number + 1, false)[1] or ""
if line_contains_empty_json(line) then if line_contains_empty_json(line, false) then
vim.api.nvim_buf_set_lines( vim.api.nvim_buf_set_lines(
buffer, buffer,
line_number, line_number,