Fix parsing of complex json, containing closing array or object in string

Author: nmeylan

Cargo.lock

@@ -17,7 +17,7 @@ egui_extras = { version = "0.29.1", default-features = false, features = ["svg"]
 #egui = { path = "C:\\dev\\egui\\crates\\egui"}
 #eframe = { path = "C:\\dev\\egui\\crates\\eframe"}
 #egui_extras = { path = "C:\\dev\\egui\\crates\\egui_extras"}
-json-flat-parser = {git = "https://github.com/nmeylan/json-parser-flat-format.git", rev = "4604c8e99ed2d11b345e55317d47ff83b1f1fc9e", features = ["indexmap", "simdutf8", "serde"]}
+json-flat-parser = {git = "https://github.com/nmeylan/json-parser-flat-format.git", rev = "c2503441dcd1ee98a9839d30534f151b9948b9b2", features = ["indexmap", "simdutf8", "serde"]}
 rayon = {version = "1.10.0"}
 rfd = {version = "0.14.1"}
 indexmap = "2.2.6"

Cargo.toml

@@ -1,4 +1,4 @@
-use std::time::Instant;
+use std::time::{Duration,Instant};
 #[macro_export]
 macro_rules! log {
     () => {

src/compatibility.rs

@@ -237,11 +237,6 @@ impl MyApp<'_> {
     fn open_json_content(&mut self, max_depth: u8, json: &[u8]) {
         let mut found_array = false;
         let size = json.len() / 1024 / 1024;
-        log!(
-            "open_json_content with size {}mb, found array {}",
-            size,
-            found_array
-        );
         for byte in json {
             if *byte == b'[' {
                 found_array = true;
@@ -251,6 +246,11 @@ impl MyApp<'_> {
                 break;
             }
         }
+        log!(
+            "open_json_content with size {}mb, found array {}",
+            size,
+            found_array
+        );
         if found_array || self.selected_pointer.is_some() {
             let start = crate::compatibility::now();
             let mut options = ParseOptions::default()
@@ -460,7 +460,7 @@ impl eframe::App for MyApp<'_> {
         if let Ok(event) = self.async_events_channel.1.try_recv() {
             self.force_repaint = false;
             match event {
-                AsyncEvent::LoadJson(_json_bytes) => {
+                AsyncEvent::LoadJson(json_bytes) => {
                     #[cfg(target_arch = "wasm32")]
                     {
                         self.web_loaded_json = Some(json_bytes);
@@ -738,7 +738,7 @@ impl eframe::App for MyApp<'_> {
                 let max_rect = ui.max_rect();
                 let mut rect = ui.max_rect();
                 rect.min.y = rect.max.y / 2.0 - 20.0;
-                let already_interact = false;
+                let mut already_interact = false;
 
                 if !already_interact {
                     let response = ui.interact(max_rect, Id::new("select_file"), Sense::click());

src/main.rs

@@ -1649,19 +1649,19 @@ let wasm_bindgen;
             const ret = makeMutClosure(arg0, arg1, 210, __wbg_adapter_32);
             return ret;
         };
-        imports.wbg.__wbindgen_closure_wrapper1516 = function(arg0, arg1, arg2) {
+        imports.wbg.__wbindgen_closure_wrapper1517 = function(arg0, arg1, arg2) {
             const ret = makeMutClosure(arg0, arg1, 393, __wbg_adapter_35);
             return ret;
         };
-        imports.wbg.__wbindgen_closure_wrapper1518 = function(arg0, arg1, arg2) {
+        imports.wbg.__wbindgen_closure_wrapper1519 = function(arg0, arg1, arg2) {
             const ret = makeMutClosure(arg0, arg1, 393, __wbg_adapter_35);
             return ret;
         };
-        imports.wbg.__wbindgen_closure_wrapper1520 = function(arg0, arg1, arg2) {
+        imports.wbg.__wbindgen_closure_wrapper1521 = function(arg0, arg1, arg2) {
             const ret = makeMutClosure(arg0, arg1, 393, __wbg_adapter_40);
             return ret;
         };
-        imports.wbg.__wbindgen_closure_wrapper1932 = function(arg0, arg1, arg2) {
+        imports.wbg.__wbindgen_closure_wrapper1933 = function(arg0, arg1, arg2) {
             const ret = makeMutClosure(arg0, arg1, 441, __wbg_adapter_43);
             return ret;
         };