starred/yaak
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-24 01:38:26 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix formatter < 0 error

Browse Source
This commit is contained in:
Gregory Schier
2024-10-22 14:26:45 -07:00
parent 44fc3c8d2d
commit 94f8949ca2
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src-tauri/yaak_templates/src/format.rs
View File

@@ -71,6 +71,7 @@ pub fn format_json(text: &str, tab: &str) -> String {
Some('}') => { Some('}') => {
new_json.push(current_char); new_json.push(current_char);
new_json.push('}'); new_json.push('}');
chars.next(); // Skip }
} }
_ => { _ => {
depth += 1; depth += 1;
@@ -83,6 +84,7 @@ pub fn format_json(text: &str, tab: &str) -> String {
Some(']') => { Some(']') => {
new_json.push(current_char); new_json.push(current_char);
new_json.push(']'); new_json.push(']');
chars.next(); // Skip ]
} }
_ => { _ => {
depth += 1; depth += 1;
@@ -92,13 +94,19 @@ pub fn format_json(text: &str, tab: &str) -> String {
} }
}, },
'}' => { '}' => {
depth -= 1; // Guard just in case invalid JSON has more closes than opens
if depth > 0 {
depth -= 1;
}
new_json.push('\n'); new_json.push('\n');
new_json.push_str(tab.to_string().repeat(depth).as_str()); new_json.push_str(tab.to_string().repeat(depth).as_str());
new_json.push(current_char); new_json.push(current_char);
} }
']' => { ']' => {
depth -= 1; // Guard just in case invalid JSON has more closes than opens
if depth > 0 {
depth -= 1;
}
new_json.push('\n'); new_json.push('\n');
new_json.push_str(tab.to_string().repeat(depth).as_str()); new_json.push_str(tab.to_string().repeat(depth).as_str());
new_json.push(current_char); new_json.push(current_char);
@@ -160,7 +168,7 @@ mod test {
"foo": "Hi \"world!\"" "foo": "Hi \"world!\""
} }
"# "#
.trim() .trim()
); );
} }
@@ -236,7 +244,10 @@ mod test {
#[test] #[test]
fn test_graphql_response() { fn test_graphql_response() {
assert_eq!( assert_eq!(
format_json(r#"{"data":{"capsules":[{"landings":null,"original_launch":null,"reuse_count":0,"status":"retired","type":"Dragon 1.0","missions":null},{"id":"5e9e2c5bf3591882af3b2665","landings":null,"original_launch":null,"reuse_count":0,"status":"retired","type":"Dragon 1.0","missions":null}]}}"#, " "), format_json(
r#"{"data":{"capsules":[{"landings":null,"original_launch":null,"reuse_count":0,"status":"retired","type":"Dragon 1.0","missions":null},{"id":"5e9e2c5bf3591882af3b2665","landings":null,"original_launch":null,"reuse_count":0,"status":"retired","type":"Dragon 1.0","missions":null}]}}"#,
" "
),
r#" r#"
{ {
"data": { "data": {
@@ -262,7 +273,32 @@ mod test {
} }
} }
"# "#
.trim() .trim()
);
}
#[test]
fn test_immediate_close() {
assert_eq!(
format_json(r#"{"bar":[]}"#, " "),
r#"
{
"bar": []
}
"#
.trim()
);
}
#[test]
fn test_more_closes() {
assert_eq!(
format_json(r#"{}}"#, " "),
r#"
{}
}
"#
.trim()
); );
} }
} }