te32
/
SublimePrettyJson
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue with replacing more than wanted 

When finding array matches only the content of the array is replaced. This content can potentially be present in multiple places and will then break later array replacements. The below example can reproduce the issue:
{
  "test": [3, 4],
  "test2": [1, 2, 3, 4],
  "test3": [3, 4]
}

With setting "keep_arrays_single_line": true

Basically the issue occurs for two arrays A, B where A is a suffix of B and A occurs earlier in the JSON document than B.
The fix is to match the whole array, not just the content. Then remove the brackets to split and join and re-add the brackets afterwards.
If the same array occurs multiple times then this will replace all instances during the first replace, however that should not cause any issues.
The fix prevents issues with replacing arrays that are subsets of other arrays.
This commit is contained in:
Randi Katrine Hillerøe 2017-11-15 12:46:02 +01:00 committed by GitHub
parent 77a8fbab60
commit 742b26b920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PrettyJson.py
View File

@ -89,11 +89,12 @@ class PrettyJsonBaseCommand:
if post_process: if post_process:
# find all array matches # find all array matches
matches = re.findall(r"\[([^\[\]]+?)\]", output_json) matches = re.findall(r"(\[[^\[\]]+?\])", output_json)
join_separator = line_separator.ljust(2) join_separator = line_separator.ljust(2)
for m in matches: for m in matches:
items = [a.strip() for a in m.split(line_separator.strip())] content = m[1:-1]
replacement = join_separator.join(items) items = [a.strip() for a in content.split(line_separator.strip())]
replacement = "[" + join_separator.join(items) + "]"
# if line not gets too long, replace with single line # if line not gets too long, replace with single line
if len(replacement) <= s.get("max_arrays_line_length", 120): if len(replacement) <= s.get("max_arrays_line_length", 120):
output_json = output_json.replace(m, replacement) output_json = output_json.replace(m, replacement)