fix: update jsonc-parser to 0.26 (#128)

denoland · Oct 21, 2024 · ca59535 · ca59535
1 parent 3593ec7
commit ca59535
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,7 @@ workspace = ["deno_json", "deno_semver", "package_json"]
 [dependencies]
 anyhow = "1.0.57"
 indexmap = { version = "2", features = ["serde"] }
-jsonc-parser = { version = "0.23.0", features = ["serde"], optional = true }
+jsonc-parser = { version = "0.26.0", features = ["serde"], optional = true }
 log = "0.4.20"
 glob = { version = "0.3.1", optional = true }
 ignore = { version = "0.4", optional = true }

diff --git a/src/deno_json/mod.rs b/src/deno_json/mod.rs
@@ -10,6 +10,7 @@ use import_map::ImportMapWithDiagnostics;
 use indexmap::IndexMap;
 use jsonc_parser::common::Ranged;
 use jsonc_parser::CollectOptions;
+use jsonc_parser::CommentCollectionStrategy;
 use jsonc_parser::ParseResult;
 use serde::de;
 use serde::de::Unexpected;
@@ -837,7 +838,11 @@ impl ConfigFile {
     let jsonc = match jsonc_parser::parse_to_ast(
       text,
       &CollectOptions {
-        comments: need_comments_tokens,
+        comments: if need_comments_tokens {
+          CommentCollectionStrategy::Separate
+        } else {
+          CommentCollectionStrategy::Off
+        },
         tokens: need_comments_tokens,
       },
       &Default::default(),